Merge revisions 37047:37074 from trunk.

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

33 files changed, 5639 insertions, 5618 deletions

diff --git a/ChangeLog b/ChangeLog
index 29b07c40b6..f871642b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-12  Philip Van hoof  <philip@codeminded.be>
+
+	* e-util/e-plugin.c
+	* e-util/e-plugin.h
+	* shell/main.c: EPlugins must be loaded after Bonobo init, else variables
+	like `session` are not available for plugin's initialization functions.
+	(Fixes Bug #565681)
+
 2009-01-08  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #565376
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1771cc246a..da6ee9b473 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,72 @@
+2009-01-14  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #554454
+
+	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
+	Do not crash when received 'modified' event for something
+	not in a model. And a leak fix.
+
+2009-01-13  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #489437
+
+	* gui/dialogs/recurrence-page.c: (fill_component): Check whether
+	the 'until' date is in the future, and report error if not.
+
+2009-01-13  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #567045
+
+	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct),
+	(e_meeting_time_selector_on_canvas_scroll_event): Escalate scroll
+	event's to a scrolled window, to let mouse wheel work over data too.
+
+2009-01-12  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #563364
+
+	* gui/e-day-view-time-item.h: (EDayViewTimeItem):
+	* gui/e-day-view-time-item.c: (e_day_view_time_item_class_init),
+	(e_day_view_time_item_init), (e_day_view_time_item_finalize),
+	(e_day_view_time_item_get_column_width), (edvti_draw_zone),
+	(e_day_view_time_item_draw), (edvti_second_zone_changed_cb),
+	(edvti_on_select_zone), (edvti_on_set_zone),
+	(e_day_view_time_item_show_popup_menu):
+	Show two timezones in the day view's time column.
+
+	* gui/apps_evolution_calendar.schemas.in:
+	* gui/calendar-config-keys.h:
+	* gui/calendar-config.h:
+	* gui/calendar-config.c: (calendar_config_get_day_second_zones),
+	(calendar_config_free_day_second_zones),
+	(calendar_config_set_day_second_zone),
+	(calendar_config_get_day_second_zone),
+	(calendar_config_select_day_second_zone),
+	(calendar_config_add_notification_day_second_zone):
+	Access configuration for the second day time zone.
+
+	* gui/dialogs/cal-prefs-dialog.glade:
+	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
+	* gui/dialogs/cal-prefs-dialog.c: (update_day_second_zone_caption),
+	(on_set_day_second_zone), (on_select_day_second_zone),
+	(day_second_zone_clicked), (setup_changes), (show_config),
+	(calendar_prefs_dialog_construct):
+	Manage the second day zone in a Preferences dialog.
+
+2009-01-12  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #555310
+
+	* importers/icalendar-importer.c: (ivcal_getwidget):
+	Localize strings properly.
+
+2009-01-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #567148
+
+	* gui/e-timezone-entry.c (e_timezone_entry_init): Use a labelled button
+	to bring up the timezone selector widget. 
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/e-cal-component-preview (on_link_clicked):
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index bae4b65ba4..41bdca1b0e 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -16,6 +16,43 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zone</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zone</applyto>
+      <owner>evolution-calendar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>The second timezone for a Day View</short>
+        <long>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zones</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zones</applyto>
+      <owner>evolution-calendar</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[]</default>
+      <locale name="C">
+        <short>Recently used second time zones in a Day View</short>
+        <long>List of recently used second time zones in a Day View.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_second_zones_max</key>
+      <applyto>/apps/evolution/calendar/display/day_second_zones_max</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>5</default>
+      <locale name="C">
+        <short>Maximum number of recently used timezones to remember.</short>
+        <long>Maximum number of recently used timezones to remember in a 'day_second_zones' list.</long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/evolution/calendar/display/use_daylight_saving</key>
       <applyto>/apps/evolution/calendar/display/use_daylight_saving</applyto>
       <owner>evolution-calendar</owner>
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 12b294b7a5..9d50d21c86 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -61,6 +61,9 @@ 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_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"
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 1816f50dcc..60df6a9285 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -1567,3 +1567,132 @@ calendar_config_get_dir_path (void)
 
 	return path;
 }
+
+/* contains list of strings, locations, recently used as the second timezone in a day view.
+   Free with calendar_config_free_day_second_zones. */
+GSList *
+calendar_config_get_day_second_zones (void)
+{
+	GSList *res;
+
+	calendar_config_init ();
+
+	res = gconf_client_get_list (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST, GCONF_VALUE_STRING, NULL);
+
+	return res;
+}
+
+/* frees list from calendar_config_get_day_second_zones */
+void
+calendar_config_free_day_second_zones (GSList *zones)
+{
+	if (zones) {
+		g_slist_foreach (zones, (GFunc)g_free, NULL);
+		g_slist_free (zones);
+	}
+}
+
+/* keeps max 'day_second_zones_max' zones, if 'location' is already in a list, then it'll became first there */
+void
+calendar_config_set_day_second_zone (const char *location)
+{
+	calendar_config_init ();
+
+	if (location && *location) {
+		GSList *lst, *l;
+		GError *error = NULL;
+		int max_zones;
+
+		/* configurable max number of timezones to remember */
+		max_zones = gconf_client_get_int (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX, &error);
+
+		if (error) {
+			g_error_free (error);
+			max_zones = -1;
+		}
+
+		if (max_zones <= 0)
+			max_zones = 5;
+
+		lst = calendar_config_get_day_second_zones ();
+		for (l = lst; l; l = l->next) {
+			if (l->data && g_str_equal (l->data, location)) {
+				if (l != lst) {
+					/* isn't first in the list */
+					char *val = l->data;
+
+					lst = g_slist_remove (lst, val);
+					lst = g_slist_prepend (lst, val);
+				}
+				break;
+			}
+		}
+
+		if (!l) {
+			/* not in the list yet */
+			lst = g_slist_prepend (lst, g_strdup (location));
+		}
+
+		while (g_slist_length (lst) > max_zones) {
+			l = g_slist_last (lst);
+			g_free (l->data);
+			lst = g_slist_delete_link (lst, l);
+		}
+
+		gconf_client_set_list (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST, GCONF_VALUE_STRING, lst, NULL);
+
+		calendar_config_free_day_second_zones (lst);
+	}
+
+	gconf_client_set_string (config, CALENDAR_CONFIG_DAY_SECOND_ZONE, location ? location : "", NULL);
+}
+
+/* location of the second time zone user has selected. Free with g_free. */
+char *
+calendar_config_get_day_second_zone (void)
+{
+	calendar_config_init ();
+
+	return gconf_client_get_string (config, CALENDAR_CONFIG_DAY_SECOND_ZONE, NULL);
+}
+
+void
+calendar_config_select_day_second_zone (void)
+{
+	icaltimezone *zone = NULL;
+	ETimezoneDialog *tzdlg;
+	GtkWidget *dialog;
+	char *second_location;
+
+	second_location = calendar_config_get_day_second_zone ();
+	if (second_location && *second_location)
+		zone = icaltimezone_get_builtin_timezone (second_location);
+	g_free (second_location);
+
+	if (!zone)
+		zone = calendar_config_get_icaltimezone ();
+
+	tzdlg = e_timezone_dialog_new ();
+	e_timezone_dialog_set_timezone (tzdlg, zone);
+
+	dialog = e_timezone_dialog_get_toplevel (tzdlg);
+
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+		zone = e_timezone_dialog_get_timezone (tzdlg);
+		calendar_config_set_day_second_zone (zone ? icaltimezone_get_location (zone) : NULL);
+	}
+
+	g_object_unref (tzdlg);
+}
+
+guint
+calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data)
+{
+	guint id;
+
+	calendar_config_init ();
+
+	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DAY_SECOND_ZONE, func, data, NULL, NULL);
+
+	return id;
+}
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 72a5560dd5..495b5c591b 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -258,4 +258,11 @@ gboolean calendar_config_get_daylight_saving (void);
 void calendar_config_set_daylight_saving (gboolean daylight_saving);
 guint calendar_config_add_notification_daylight_saving (GConfClientNotifyFunc func, gpointer data);
 
+GSList *calendar_config_get_day_second_zones (void);
+void    calendar_config_free_day_second_zones (GSList *zones);
+void    calendar_config_set_day_second_zone (const char *location);
+char *  calendar_config_get_day_second_zone (void);
+void    calendar_config_select_day_second_zone (void);
+guint   calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data);
+
 #endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 8ba51259e5..38871c2f89 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -132,6 +132,101 @@ timezone_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 }
 
 static void
+update_day_second_zone_caption (CalendarPrefsDialog *prefs)
+{
+	char *location;
+	const char *caption;
+	icaltimezone *zone;
+
+	g_return_if_fail (prefs != NULL);
+
+	caption = _("None");
+
+	location = calendar_config_get_day_second_zone ();
+	if (location && *location) {
+		zone = icaltimezone_get_builtin_timezone (location);
+		if (zone && icaltimezone_get_display_name (zone)) {
+			caption = icaltimezone_get_display_name (zone);
+		}
+	}
+	g_free (location);
+
+	gtk_button_set_label (GTK_BUTTON (prefs->day_second_zone), caption);
+}
+
+static void
+on_set_day_second_zone (GtkWidget *item, CalendarPrefsDialog *prefs)
+{
+	if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
+		return;
+
+	calendar_config_set_day_second_zone (g_object_get_data (G_OBJECT (item), "timezone"));
+	update_day_second_zone_caption (prefs);
+}
+
+static void
+on_select_day_second_zone (GtkWidget *item, CalendarPrefsDialog *prefs)
+{
+	g_return_if_fail (prefs != NULL);
+
+	calendar_config_select_day_second_zone ();
+	update_day_second_zone_caption (prefs);
+}
+
+static void
+day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs)
+{
+	GtkWidget *menu, *item;
+	GSList *group = NULL, *recent_zones, *s;
+	char *location;
+	icaltimezone *zone, *second_zone = NULL;
+
+	menu = gtk_menu_new ();
+
+	location = calendar_config_get_day_second_zone ();
+	if (location && *location)
+		second_zone = icaltimezone_get_builtin_timezone (location);
+	g_free (location);
+
+	group = NULL;
+	item = gtk_radio_menu_item_new_with_label (group, _("None"));
+	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+	if (!second_zone)
+		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	g_signal_connect (item, "toggled", G_CALLBACK (on_set_day_second_zone), prefs);
+
+	recent_zones = calendar_config_get_day_second_zones ();
+	for (s = recent_zones; s != NULL; s = s->next) {
+		zone = icaltimezone_get_builtin_timezone (s->data);
+		if (!zone)
+			continue;
+
+		item = gtk_radio_menu_item_new_with_label (group, icaltimezone_get_display_name (zone));
+		group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+		/* both comes from builtin, thus no problem to compare pointers */
+		if (zone == second_zone)
+			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+		g_object_set_data_full (G_OBJECT (item), "timezone", g_strdup (s->data), g_free);
+		g_signal_connect (item, "toggled", G_CALLBACK (on_set_day_second_zone), prefs);
+	}
+	calendar_config_free_day_second_zones (recent_zones);
+
+	item = gtk_separator_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	item = gtk_menu_item_new_with_label (_("Select..."));
+	g_signal_connect (item, "activate", G_CALLBACK (on_select_day_second_zone), prefs);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	gtk_widget_show_all (menu);
+
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+			0, gtk_get_current_event_time ());
+}
+
+static void
 daylight_saving_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
 	gboolean set = gtk_toggle_button_get_active ((GtkToggleButton *) prefs->daylight_saving);
@@ -373,6 +468,7 @@ setup_changes (CalendarPrefsDialog *prefs)
 		g_signal_connect (G_OBJECT (prefs->working_days[i]), "toggled", G_CALLBACK (working_days_changed), prefs);
 
 	g_signal_connect (G_OBJECT (prefs->timezone), "changed", G_CALLBACK (timezone_changed), prefs);
+	g_signal_connect (G_OBJECT (prefs->day_second_zone), "clicked", G_CALLBACK (day_second_zone_clicked), prefs);
 	g_signal_connect (G_OBJECT (prefs->daylight_saving), "toggled", G_CALLBACK (daylight_saving_changed), prefs);
 
 	g_signal_connect (G_OBJECT (prefs->start_of_day), "changed", G_CALLBACK (start_of_day_changed), prefs);
@@ -513,6 +609,9 @@ show_config (CalendarPrefsDialog *prefs)
 	set = calendar_config_get_daylight_saving ();
 	gtk_toggle_button_set_active ((GtkToggleButton *) prefs->daylight_saving, set);
 
+	/* Day's second zone */
+	update_day_second_zone_caption (prefs);
+
 	/* Working Days. */
 	working_days = calendar_config_get_working_days ();
 	mask = 1 << 0;
@@ -637,6 +736,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 
 	/* General tab */
 	prefs->timezone = glade_xml_get_widget (gui, "timezone");
+	prefs->day_second_zone = glade_xml_get_widget (gui, "day_second_zone");
 	prefs->daylight_saving = glade_xml_get_widget (gui, "daylight_cb");
 	for (i = 0; i < 7; i++)
 		prefs->working_days[i] = glade_xml_get_widget (gui, working_day_names[i]);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index d3003bdb6f..0282d17d4d 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -6,7 +6,7 @@
 
 <widget class="GtkWindow" id="window1">
   <property name="visible">True</property>
-  <property name="title" translatable="no">window1</property>
+  <property name="title">window1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -96,46 +96,37 @@
 	      <child>
 		<widget class="GtkTable" id="time">
 		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
+		  <property name="n_rows">4</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
 		  <property name="column_spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="timezone_label">
+		    <widget class="Custom" id="timezone">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Time _zone:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-      		      <property name="mnemonic_widget">timezone</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
+		      <property name="creation_function">make_timezone_entry</property>
+		      <property name="int1">0</property>
+		      <property name="int2">0</property>
+		      <property name="last_modification_time">Thu, 13 Jan 2005 04:18:03 GMT</property>
+		      <accessibility>
+			<atkrelation target="timezone_label" type="labelled-by"/>
+		      </accessibility>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label11">
+		    <widget class="GtkLabel" id="timezone_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Time format:</property>
-		      <property name="use_underline">False</property>
+		      <property name="label" translatable="yes">Time _zone:</property>
+		      <property name="use_underline">True</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
@@ -144,6 +135,7 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="mnemonic_widget">timezone</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
 		      <property name="single_line_mode">False</property>
@@ -152,30 +144,32 @@
 		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">1</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="Custom" id="timezone">
+		    <widget class="GtkCheckButton" id="daylight_cb">
 		      <property name="visible">True</property>
-		      <property name="creation_function">make_timezone_entry</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Thu, 13 Jan 2005 04:18:03 GMT</property>
-		      <accessibility>
-			<atkrelation target="timezone_label" type="labelled-by"/>
-		      </accessibility>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Adjust for daylight sa_ving time</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options">fill</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 
@@ -235,24 +229,116 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="daylight_cb">
+		    <widget class="GtkLabel" id="label11">
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Adjust for daylight sa_ving time</property>
+		      <property name="label" translatable="yes">Time format:</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label63">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Se_cond zone:</property>
 		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="mnemonic_widget">day_second_zone</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">3</property>
+		      <property name="bottom_attach">4</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox25">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkButton" id="day_second_zone">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">None</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label64">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">(Shown in a Day View)</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">6</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
+		      <property name="top_attach">3</property>
+		      <property name="bottom_attach">4</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -348,7 +434,7 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-      		      <property name="mnemonic_widget">week_start_day</property>
+		      <property name="mnemonic_widget">week_start_day</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
 		      <property name="single_line_mode">False</property>
@@ -405,7 +491,7 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-      		      <property name="mnemonic_widget">start_of_day</property>
+		      <property name="mnemonic_widget">start_of_day</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
 		      <property name="single_line_mode">False</property>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 49d4c56482..bb51d9d50d 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -43,6 +43,7 @@ struct _CalendarPrefsDialog {
 
 	/* General tab */
 	GtkWidget *timezone;
+	GtkWidget *day_second_zone;
 	GtkWidget *daylight_saving;
 	GtkWidget *working_days[7];
 	GtkWidget *week_start_day;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 8a93c4dfee..15171d52ed 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -903,6 +903,37 @@ fill_component (RecurrencePage *rpage, ECalComponent *comp)
 	e_cal_component_set_exdate_list (comp, list);
 	e_cal_component_free_exdate_list (list);
 
+	if (GTK_WIDGET_VISIBLE (priv->ending_menu) && GTK_WIDGET_IS_SENSITIVE (priv->ending_menu) &&
+	    e_dialog_option_menu_get (priv->ending_menu, ending_types_map) == ENDING_UNTIL) {
+		/* check whether the "until" date is in the future */
+		struct icaltimetype tt;
+		gboolean ok = TRUE;
+
+		if (e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit), &tt.year, &tt.month, &tt.day)) {
+			ECalComponentDateTime dtstart;
+
+			/* the dtstart should be set already */
+			e_cal_component_get_dtstart (comp, &dtstart);
+
+			tt.is_date = 1;
+			tt.zone = NULL;
+
+			if (dtstart.value && icaltime_is_valid_time (*dtstart.value)) {
+				ok = icaltime_compare_date_only (*dtstart.value, tt) <= 0;
+
+				if (!ok)
+					e_date_edit_set_date (E_DATE_EDIT (priv->ending_date_edit), dtstart.value->year, dtstart.value->month, dtstart.value->day);
+			}
+
+			e_cal_component_free_datetime (&dtstart);
+		}
+
+		if (!ok) {
+			comp_editor_page_display_validation_error (COMP_EDITOR_PAGE (rpage), _("End time of the recurrence was before event's start"), priv->ending_date_edit);
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 9fd6acb54a..acbee0cd26 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1518,6 +1518,15 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 			id = e_cal_component_get_id (comp);
 
 			comp_data = search_by_id_and_client (priv, client, id);
+
+			e_cal_component_free_id (id);
+			g_object_unref (comp);
+
+			if (!comp_data) {
+				/* the modified component is not in the model yet, just skip it */
+				continue;
+			}
+
 			if (comp_data->icalcomp)
 				icalcomponent_free (comp_data->icalcomp);
 			if (comp_data->dtstart) {
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 6a31855262..dc3c2deba5 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -32,6 +32,8 @@
 #include "e-day-view-time-item.h"
 #include "calendar-config.h"
 #include <libecal/e-cal-time-util.h>
+#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
+#include <libedataserver/e-data-server-util.h>
 
 
 /* The spacing between items in the time column. GRID_X_PAD is the space down
@@ -59,6 +61,8 @@ static void e_day_view_time_item_set_property (GObject *object,
                                                const GValue *value,
                                                GParamSpec *pspec);
 
+static void e_day_view_time_item_finalize (GObject *object);
+
 static void e_day_view_time_item_update (GnomeCanvasItem *item,
 					 double *affine,
 					 ArtSVP *clip_path, int flags);
@@ -88,7 +92,7 @@ static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
 static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
 							  gint y);
 
-
+static void  edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data);
 /* The arguments we take */
 enum {
 	PROP_0,
@@ -105,6 +109,7 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
 
 	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = e_day_view_time_item_set_property;
+	object_class->finalize = e_day_view_time_item_finalize;
 
 	item_class = GNOME_CANVAS_ITEM_CLASS (class);
 	item_class->update = e_day_view_time_item_update;
@@ -126,9 +131,21 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
 static void
 e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
 {
+	char *last;
+
 	dvtmitem->dragging_selection = FALSE;
-}
+	dvtmitem->second_zone = NULL;
+
+	last = calendar_config_get_day_second_zone();
+
+	if (last) {
+		if (*last)
+			dvtmitem->second_zone = icaltimezone_get_builtin_timezone (last);
+		g_free (last);
+	}
 
+	dvtmitem->second_zone_changed_id = calendar_config_add_notification_day_second_zone (edvti_second_zone_changed_cb, dvtmitem);
+}
 
 static void
 e_day_view_time_item_set_property (GObject *object,
@@ -149,6 +166,20 @@ e_day_view_time_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
+static void
+e_day_view_time_item_finalize (GObject *object)
+{
+	EDayViewTimeItem *dvtmitem;
+
+	dvtmitem = E_DAY_VIEW_TIME_ITEM (object);
+
+	if (dvtmitem->second_zone_changed_id)
+		calendar_config_remove_notification (dvtmitem->second_zone_changed_id);
+	dvtmitem->second_zone_changed_id = 0;
+
+	if (G_OBJECT_CLASS (e_day_view_time_item_parent_class)->finalize)
+		G_OBJECT_CLASS (e_day_view_time_item_parent_class)->finalize (object);
+}
 
 static void
 e_day_view_time_item_update (GnomeCanvasItem *item,
@@ -229,6 +260,10 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
 
 	dvtmitem->column_width = MAX (column_width_default,
 				      column_width_60_min_rows);
+
+	if (dvtmitem->second_zone)
+		return (2 * dvtmitem->column_width) - E_DVTMI_TIME_GRID_X_PAD;
+
 	return dvtmitem->column_width;
 }
 
@@ -237,17 +272,19 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
 static void
-e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
-			   GdkDrawable	   *drawable,
-			   int		    x,
-			   int		    y,
-			   int		    width,
-			   int		    height)
+edvti_draw_zone (GnomeCanvasItem   *canvas_item,
+		GdkDrawable	   *drawable,
+		int		    x,
+		int		    y,
+		int		    width,
+		int		    height,
+		int		    x_offset,
+		icaltimezone       *use_zone)
 {
 	EDayView *day_view;
 	EDayViewTimeItem *dvtmitem;
 	GtkStyle *style;
-	gchar buffer[64], *suffix;
+	gchar buffer[64], *suffix, *midnight_day = NULL, *midnight_month = NULL;
 	gint hour, display_hour, minute, row;
 	gint row_y, start_y, large_hour_y_offset, small_font_y_offset;
 	gint long_line_x1, long_line_x2, short_line_x1;
@@ -260,6 +297,7 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	PangoFontMetrics *large_font_metrics, *small_font_metrics;
 	cairo_t *cr;
 	GdkColor fg, dark;
+	GdkColor mb_color;
 
 	cr = gdk_cairo_create (drawable);
 
@@ -280,8 +318,8 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	dark = style->dark[GTK_STATE_NORMAL];
 
 	/* The start and end of the long horizontal line between hours. */
-	long_line_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
-	long_line_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x;
+	long_line_x1 = (use_zone ? 0 : E_DVTMI_TIME_GRID_X_PAD) - x + x_offset;
+	long_line_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x - (use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0) + x_offset;
 
 	if (day_view->mins_per_row == 60) {
 		/* The right edge of the complete time string in 60-min
@@ -315,6 +353,51 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	hour = day_view->first_hour_shown;
 	minute = day_view->first_minute_shown;
 
+	if (use_zone) {
+		/* shift time with a difference between local time and the other timezone */
+		icaltimezone *cal_zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
+		struct icaltimetype tt;
+		int diff;
+		struct tm mn;
+
+		tt = icaltime_today ();
+
+		/* diff is number of minutes */
+		diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) -
+		        icaltimezone_get_utc_offset (cal_zone, &tt, NULL)
+		       ) / 60;
+
+		tt = icaltime_today ();
+		tt.is_date = FALSE;
+		icaltime_set_timezone (&tt, cal_zone);
+		tt = icaltime_convert_to_zone (tt, use_zone);
+
+		if (diff != 0) {
+			/* shows the next midnight */
+			icaltime_adjust (&tt, 1, 0, 0, 0);
+		}
+
+		mn = icaltimetype_to_tm (&tt);
+
+		/* up to two characters/numbers */
+		e_utf8_strftime (buffer, sizeof (buffer), "%d", &mn);
+		midnight_day = g_strdup (buffer);
+		/* up to three characters, abbreviated month name */
+		e_utf8_strftime (buffer, sizeof (buffer), "%b", &mn);
+		midnight_month = g_strdup (buffer);
+
+		minute += (diff % 60);
+		hour += (diff / 60) + (minute / 60);
+
+		minute = minute % 60;
+		if (minute < 0) {
+			hour--;
+			minute += 60;
+		}
+
+		hour = (hour + 48) % 24;
+	}
+
 	/* The offset of the large hour string from the top of the row. */
 	large_hour_y_offset = E_DVTMI_LARGE_HOUR_Y_PAD;
 
@@ -333,7 +416,6 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	if (e_day_view_get_show_marcus_bains (day_view)) {
 		struct icaltimetype time_now;
 		int marcus_bains_y;
-		GdkColor mb_color;
 
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE]);
@@ -345,15 +427,27 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 			if (gdk_colormap_alloc_color (colormap, &mb_color, TRUE, TRUE)) {
 				gdk_cairo_set_source_color (cr, &mb_color);
 			}
-		}
+		} else
+			mb_color = day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE];
 
 		time_now = icaltime_current_time_with_zone (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 		marcus_bains_y = (time_now.hour * 60 + time_now.minute) * day_view->row_height / day_view->mins_per_row - y;
 		cairo_set_line_width (cr, 1.5);
-		cairo_move_to (cr, long_line_x1, marcus_bains_y);
+		cairo_move_to (cr, long_line_x1 - (use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0), marcus_bains_y);
 		cairo_line_to (cr, long_line_x2, marcus_bains_y);
 		cairo_stroke (cr);
 		cairo_restore (cr);
+	} else {
+		mb_color = day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE];
+
+		if (day_view->marcus_bains_time_bar_color && gdk_color_parse (day_view->marcus_bains_time_bar_color, &mb_color)) {
+			GdkColormap *colormap;
+
+			colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
+			if (gdk_colormap_alloc_color (colormap, &mb_color, TRUE, TRUE)) {
+				gdk_cairo_set_source_color (cr, &mb_color);
+			}
+		}
 	}
 
 	/* Step through each row, drawing the times and the horizontal lines
@@ -361,6 +455,7 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	for (row = 0, row_y = 0 - y;
 	     row < day_view->rows && row_y < height;
 	     row++, row_y += day_view->row_height) {
+		gboolean show_midnight_date = use_zone && hour == 0 && (minute == 0 || day_view->mins_per_row == 60) && midnight_day && midnight_month;
 
 		/* If the row is above the first row we want to draw just
 		   increment the time and skip to the next row. */
@@ -389,7 +484,11 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 			cairo_stroke (cr);
 			cairo_restore (cr);
 
-			if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
+			if (show_midnight_date) {
+				strcpy (buffer, midnight_day);
+				strcat (buffer, " ");
+				strcat (buffer, midnight_month);
+			} else if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
 				g_snprintf (buffer, sizeof (buffer), "%i:%02i",
 					    display_hour, minute);
 			} else {
@@ -398,7 +497,10 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 			}
 
 			cairo_save (cr);
-			gdk_cairo_set_source_color (cr, &fg);
+			if (show_midnight_date)
+				gdk_cairo_set_source_color (cr, &mb_color);
+			else
+				gdk_cairo_set_source_color (cr, &fg);
 			layout = pango_cairo_create_layout (cr);
 			pango_layout_set_text (layout, buffer, -1);
 			pango_layout_get_pixel_size (layout, &minute_width, NULL);
@@ -418,8 +520,11 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 
 				cairo_save (cr);
 				gdk_cairo_set_source_color (cr, &dark);
-				g_snprintf (buffer, sizeof (buffer), "%i",
-					    display_hour);
+				if (show_midnight_date)
+					strcpy (buffer, midnight_day);
+				else
+					g_snprintf (buffer, sizeof (buffer), "%i",
+						    display_hour);
 
 				cairo_set_line_width (cr, 0.7);
 				cairo_move_to (cr, long_line_x1, row_y);
@@ -428,7 +533,10 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 				cairo_restore (cr);
 
 				cairo_save (cr);
-				gdk_cairo_set_source_color (cr, &fg);
+				if (show_midnight_date)
+					gdk_cairo_set_source_color (cr, &mb_color);
+				else
+					gdk_cairo_set_source_color (cr, &fg);
 				layout = pango_cairo_create_layout (cr);
 				pango_layout_set_text (layout, buffer, -1);
 				pango_layout_set_font_description (layout, day_view->large_font_desc);
@@ -457,7 +565,9 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 			if (day_view->mins_per_row != 30 || minute != 30) {
 				/* In 12-hour format we display 'am' or 'pm'
 				   instead of '00'. */
-				if (minute == 0
+				if (show_midnight_date)
+					strcpy (buffer, midnight_month);
+				else if (minute == 0
 				    && !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
 					strcpy (buffer, suffix);
 				} else {
@@ -466,7 +576,10 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 				}
 
 				cairo_save (cr);
-				gdk_cairo_set_source_color (cr, &fg);
+				if (show_midnight_date)
+					gdk_cairo_set_source_color (cr, &mb_color);
+				else
+					gdk_cairo_set_source_color (cr, &fg);
 				layout = pango_cairo_create_layout (cr);
 				pango_layout_set_text (layout, buffer, -1);
 				pango_layout_set_font_description (layout, day_view->small_font_desc);
@@ -487,6 +600,28 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	pango_font_metrics_unref (large_font_metrics);
 	pango_font_metrics_unref (small_font_metrics);
 	cairo_destroy (cr);
+
+	g_free (midnight_day);
+	g_free (midnight_month);
+}
+
+static void
+e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
+			   GdkDrawable	   *drawable,
+			   int		    x,
+			   int		    y,
+			   int		    width,
+			   int		    height)
+{
+	EDayViewTimeItem *dvtmitem;
+
+	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);
+	g_return_if_fail (dvtmitem != NULL);
+
+	edvti_draw_zone (canvas_item, drawable, x, y, width, height, 0, NULL);
+
+	if (dvtmitem->second_zone)
+		edvti_draw_zone (canvas_item, drawable, x, y, width, height, dvtmitem->column_width, dvtmitem->second_zone);
 }
 
 /* Increment the time by the 5/10/15/30/60 minute interval.
@@ -551,6 +686,37 @@ e_day_view_time_item_event (GnomeCanvasItem *item,
 	return FALSE;
 }
 
+static void
+edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+{
+	EDayViewTimeItem *dvtmitem = user_data;
+	char *location;
+
+	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (E_IS_DAY_VIEW_TIME_ITEM (dvtmitem));
+
+	location = calendar_config_get_day_second_zone ();
+	dvtmitem->second_zone = location ? icaltimezone_get_builtin_timezone (location) : NULL;
+	g_free (location);
+
+	gtk_widget_set_size_request (dvtmitem->day_view->time_canvas, e_day_view_time_item_get_column_width (dvtmitem), -1);
+	gtk_widget_queue_draw (dvtmitem->day_view->time_canvas);
+}
+
+static void
+edvti_on_select_zone (GtkWidget *item, EDayViewTimeItem *dvtmitem)
+{
+	calendar_config_select_day_second_zone ();
+}
+
+static void
+edvti_on_set_zone (GtkWidget *item, EDayViewTimeItem *dvtmitem)
+{
+	if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
+		return;
+
+	calendar_config_set_day_second_zone (g_object_get_data (G_OBJECT (item), "timezone"));
+}
 
 static void
 e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
@@ -559,10 +725,11 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 	static gint divisions[] = { 60, 30, 15, 10, 5 };
 	EDayView *day_view;
 	gint num_divisions = sizeof (divisions) / sizeof (divisions[0]);
-	GtkWidget *menu, *item;
+	GtkWidget *menu, *item, *submenu;
 	gchar buffer[256];
-	GSList *group = NULL;
+	GSList *group = NULL, *recent_zones, *s;
 	gint current_divisions, i;
+	icaltimezone *zone;
 
 	day_view = dvtmitem->day_view;
 	g_return_if_fail (day_view != NULL);
@@ -596,6 +763,61 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 				  G_CALLBACK (e_day_view_time_item_on_set_divisions), dvtmitem);
 	}
 
+	item = gtk_separator_menu_item_new ();
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	submenu = gtk_menu_new ();
+	item = gtk_menu_item_new_with_label (_("Show the second time zone"));
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
+
+	zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
+	if (zone)
+		item = gtk_menu_item_new_with_label (icaltimezone_get_display_name (zone));
+	else
+		item = gtk_menu_item_new_with_label ("---");
+	gtk_widget_set_sensitive (item, FALSE);
+	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+	
+	item = gtk_separator_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+	group = NULL;
+	item = gtk_radio_menu_item_new_with_label (group, _("None"));
+	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+	if (!dvtmitem->second_zone)
+		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+	g_signal_connect (item, "toggled", G_CALLBACK (edvti_on_set_zone), dvtmitem);
+
+	recent_zones = calendar_config_get_day_second_zones ();
+	for (s = recent_zones; s != NULL; s = s->next) {
+		zone = icaltimezone_get_builtin_timezone (s->data);
+		if (!zone)
+			continue;
+
+		item = gtk_radio_menu_item_new_with_label (group, icaltimezone_get_display_name (zone));
+		group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+		/* both comes from builtin, thus no problem to compare pointers */
+		if (zone == dvtmitem->second_zone)
+			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+		gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+		g_object_set_data_full (G_OBJECT (item), "timezone", g_strdup (s->data), g_free);
+		g_signal_connect (item, "toggled", G_CALLBACK (edvti_on_set_zone), dvtmitem);
+	}
+	calendar_config_free_day_second_zones (recent_zones);
+
+	item = gtk_separator_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+	item = gtk_menu_item_new_with_label (_("Select..."));
+	g_signal_connect (item, "activate", G_CALLBACK (edvti_on_select_zone), dvtmitem);
+	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+	gtk_widget_show_all (submenu);
+
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
 			event->button.button, event->button.time);
 }
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index 67d1213c7a..f3f2f64118 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -53,6 +53,10 @@ typedef struct {
 
 	/* TRUE if we are currently dragging the selection times. */
 	gboolean dragging_selection;
+
+	/* the second timezone shown here; NULL if none; do not free it, it's from the builtin zones */
+	guint second_zone_changed_id;
+	icaltimezone *second_zone;
 } EDayViewTimeItem;
 
 typedef struct {
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 9871e15ea9..22b310b534 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -185,6 +185,7 @@ static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector
 static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts);
+static gboolean e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, GdkEventScroll *event, EMeetingTimeSelector *mts);
 
 static void row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
 static void row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
@@ -358,6 +359,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 			  G_CALLBACK (e_meeting_time_selector_on_canvas_realized), mts);
 	g_signal_connect (mts->display_main, "size_allocate",
 			  G_CALLBACK (e_meeting_time_selector_on_canvas_size_allocate), mts);
+	g_signal_connect (mts->display_main, "scroll-event",
+			  G_CALLBACK (e_meeting_time_selector_on_canvas_scroll_event), mts);
 
 	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), GTK_LAYOUT (mts->display_main)->vadjustment);
 
@@ -2308,6 +2311,17 @@ e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
+static gboolean
+e_meeting_time_selector_on_canvas_scroll_event (GtkWidget *widget, GdkEventScroll *event, EMeetingTimeSelector *mts)
+{
+	gboolean return_val = FALSE;
+
+	/* escalate to the list view's parent, which is a scrolled window */
+	g_signal_emit_by_name (gtk_widget_get_parent (GTK_WIDGET (mts->list_view)), "scroll-event", event, &return_val);
+
+	return return_val;
+}
+
 /* This updates the canvas scroll regions according to the number of attendees.
    If the total height needed is less than the height of the canvas, we must
    use the height of the canvas, or it causes problems. */
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 3b11e27d46..391079a084 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -104,7 +104,6 @@ static void
 e_timezone_entry_init		(ETimezoneEntry	*tentry)
 {
 	ETimezoneEntryPrivate *priv;
-	GtkWidget *image;
 	AtkObject *a11y;
 
 	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
@@ -119,7 +118,7 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	gtk_widget_show (priv->entry);
 	g_signal_connect (priv->entry, "changed", G_CALLBACK (on_entry_changed), tentry);
 
-	priv->button = gtk_button_new ();
+	priv->button = gtk_button_new_with_label (_("Select..."));
 	g_signal_connect (priv->button, "clicked", G_CALLBACK (on_button_clicked), tentry);
 	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 6);
 	gtk_widget_show (priv->button);
@@ -127,11 +126,6 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	if (a11y != NULL) {
 		atk_object_set_name (a11y, _("Select Timezone"));
 	}
-
-	image = gtk_image_new_from_icon_name (
-		"stock_timezone", GTK_ICON_SIZE_BUTTON);
-	gtk_container_add (GTK_CONTAINER (priv->button), image);
-	gtk_widget_show (image);
 }
 
 
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index eb751d07a3..05e7a4ee04 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -247,7 +247,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 		g_signal_connect (selector, "primary_selection_changed", G_CALLBACK (primary_selection_changed_cb), target);
 
-		rb = gtk_radio_button_new_with_label (group, import_type_strings[i]);
+		rb = gtk_radio_button_new_with_label (group, _(import_type_strings[i]));
 		gtk_box_pack_start (GTK_BOX (hbox), rb, FALSE, FALSE, 6);
 
 		sd = g_malloc0(sizeof(*sd));
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 93ec47f3b6..7d778b59e0 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -608,8 +608,7 @@ e_plugin_load_plugins(void)
 			}
 
 			while ( (d = g_dir_read_name(dir)) ) {
-				if (strlen(d) > 6
-						&& !strcmp(d + strlen(d) - 6, ".eplug")) {
+				if (g_str_has_suffix  (d, ".eplug")) {
 					char * name = g_build_filename(path, d, NULL);
 
 					ep_load(name, i);
@@ -987,8 +986,10 @@ static gpointer epl_parent_class;
    pages.
 */
 
+static GList *missing_symbols = NULL;
+
 static int
-epl_loadmodule(EPlugin *ep)
+epl_loadmodule(EPlugin *ep, gboolean fatal)
 {
 	EPluginLib *epl = E_PLUGIN_LIB (ep);
 	EPluginLibEnableFunc enable;
@@ -997,7 +998,10 @@ epl_loadmodule(EPlugin *ep)
 		return 0;
 
 	if ((epl->module = g_module_open(epl->location, 0)) == NULL) {
-		g_warning("can't load plugin '%s': %s", epl->location, g_module_error());
+		if (fatal)
+			g_warning("can't load plugin '%s': %s", epl->location, g_module_error());
+		else
+			missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep));
 		return -1;
 	}
 
@@ -1013,6 +1017,22 @@ epl_loadmodule(EPlugin *ep)
 	return 0;
 }
 
+void
+e_plugin_load_plugins_with_missing_symbols (void)
+{
+	GList *list = missing_symbols;
+
+	while (list) {
+		EPlugin *ep = list->data;
+		epl_loadmodule (ep, TRUE);
+		g_object_unref (ep);
+		list = g_list_next (list);
+	}
+
+	g_list_free (missing_symbols);
+	missing_symbols = NULL;
+}
+
 static void *
 epl_invoke(EPlugin *ep, const char *name, void *data)
 {
@@ -1024,7 +1044,7 @@ epl_invoke(EPlugin *ep, const char *name, void *data)
 		return NULL;
 	}
 
-	if (epl_loadmodule(ep) != 0)
+	if (epl_loadmodule(ep, FALSE) != 0)
 		return NULL;
 
 	if (!g_module_symbol(epl->module, name, (void *)&cb)) {
@@ -1041,7 +1061,7 @@ epl_get_symbol(EPlugin *ep, const gchar *name)
 	EPluginLib *epl = E_PLUGIN_LIB (ep);
 	gpointer symbol;
 
-	if (epl_loadmodule (ep) != 0)
+	if (epl_loadmodule (ep, FALSE) != 0)
 		return NULL;
 
 	if (!g_module_symbol (epl->module, name, &symbol))
@@ -1080,9 +1100,15 @@ epl_construct(EPlugin *ep, xmlNodePtr root)
 
 		tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup");
 		if (tmp) {
+			if (strcmp (tmp, "after-ui") == 0) {
+				missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep));
+			} else {
+				if (epl_loadmodule(ep, FALSE) != 0) {
+					xmlFree(tmp);
+					return -1;
+				}
+			}
 			xmlFree(tmp);
-			if (epl_loadmodule(ep) != 0)
-				return -1;
 		}
 	}
 
@@ -1097,7 +1123,7 @@ epl_get_configure_widget (EPlugin *ep)
 
 	pd (printf ("\n epl_get_configure_widget \n"));
 
-	if (epl_loadmodule (ep) != 0) {
+	if (epl_loadmodule (ep, FALSE) != 0) {
 		pd (printf ("\n epl_loadmodule  \n"));
 		return NULL;
 	}
@@ -1122,7 +1148,7 @@ epl_enable(EPlugin *ep, int state)
 		return;
 
 	/* this will noop if we're disabling since we tested it above */
-	if (epl_loadmodule(ep) != 0)
+	if (epl_loadmodule(ep, FALSE) != 0)
 		return;
 
 	if (g_module_symbol(epl->module, "e_plugin_lib_enable", (void *)&enable)) {
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 4994861d6f..0b31409c96 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -134,6 +134,7 @@ GType e_plugin_get_type(void);
 int e_plugin_construct(EPlugin *ep, xmlNodePtr root);
 void e_plugin_add_load_path(const char *);
 int e_plugin_load_plugins(void);
+void e_plugin_load_plugins_with_missing_symbols(void);
 GSList * e_plugin_list_plugins(void);
 
 void e_plugin_register_type(GType type);
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 915369221f..ea7e85313f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,19 @@
+2009-01-13  Felix Riemann  <friemann@svn.gnome.org>
+
+	** Fix for bug #563867
+
+	* em-folder-view.c (emp_uri_popup_link_copy):
+	* em-popup.c (emp_uri_popup_link_open):
+	* em-utils.c (em_utils_url_unescape_amp):
+	* em-utils.h:
+	Unescape "&amp;" when passing the link to browsers. 
+
+2009-01-12  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #566653
+
+	* mail-folder-cache.c: (folder_changed): Fix a leaked info
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* em-config.c:
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 6cf21f3a94..30309df598 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1675,37 +1675,6 @@ emfv_popup_menu (GtkWidget *widget)
 //	}
 //}
 
-static gchar *
-url_unescape_amp (const gchar *url)
-{
-	gchar *buff;
-	int i, j, amps;
-
-	if (!url)
-		return NULL;
-
-	amps = 0;
-	for (i = 0; url [i]; i++) {
-		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
-			amps++;
-	}
-
-	buff = g_strdup (url);
-
-	if (!amps)
-		return buff;
-
-	for (i = 0, j = 0; url [i]; i++, j++) {
-		buff [j] = url [i];
-
-		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
-			i += 4;
-	}
-	buff [j] = 0;
-
-	return buff;
-}
-
 static void
 emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
 {
@@ -1713,7 +1682,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
 	struct _EMFolderViewPrivate *p = emfv->priv;
 
 	g_free(p->selection_uri);
-	p->selection_uri = url_unescape_amp(pitem->user_data);
+	p->selection_uri = em_utils_url_unescape_amp(pitem->user_data);
 
 	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
 	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 18d4875a8d..38f3b1426b 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -585,9 +585,11 @@ static void
 emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
 {
 	EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target;
+	gchar *unescaped_uri = em_utils_url_unescape_amp (t->uri);
 
 	/* FIXME Pass a parent window. */
-	e_show_uri (NULL, t->uri);
+	e_show_uri (NULL, unescaped_uri);
+	g_free (unescaped_uri);
 }
 
 static void
diff --git a/mail/em-utils.c b/mail/em-utils.c
index e31bab0d22..8dbadea15b 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2473,3 +2473,34 @@ em_utils_show_info_silent (GtkWidget *widget)
 			widget, "response",
 			G_CALLBACK (gtk_widget_destroy), NULL);
 }
+
+gchar *
+em_utils_url_unescape_amp (const gchar *url)
+{
+	gchar *buff;
+	int i, j, amps;
+
+	if (!url)
+		return NULL;
+
+	amps = 0;
+	for (i = 0; url [i]; i++) {
+		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
+			amps++;
+	}
+
+	buff = g_strdup (url);
+
+	if (!amps)
+		return buff;
+
+	for (i = 0, j = 0; url [i]; i++, j++) {
+		buff [j] = url [i];
+
+		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
+			i += 4;
+	}
+	buff [j] = 0;
+
+	return buff;
+}
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 56dd4c6713..adc22d23b6 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -109,6 +109,9 @@ const char *em_utils_snoop_type(CamelMimePart *part);
 /* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */
 void em_utils_clear_get_password_canceled_accounts_flag (void);
 
+/* Unescapes &amp; back to a real & in URIs */
+gchar *em_utils_url_unescape_amp (const gchar *url);
+
 G_END_DECLS
 
 #endif /* __EM_UTILS_H__ */
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index f46b22850c..06335a515b 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -462,6 +462,7 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 				    ((flags & CAMEL_MESSAGE_DELETED) == 0) &&
 				    (camel_message_info_date_received (info) > last_newmail))
 					new++;
+				camel_message_info_free (info);
 			}
 		}
 	}
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index aeb89aecb5..9db857dbcc 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #567744
+
+	* proxy-login-dialog.glade:
+	* proxy-listing.glade:
+	Comment attribute in property tag should be plural.
+	e.g. <property comments="...">
+
 2008-12-29  Bharath Acharya  <abharath@novell.com>
 
 	** Fix for bug bnc #435694
diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade
index 984227c558..5f33da23ad 100644
--- a/plugins/groupwise-features/proxy-listing.glade
+++ b/plugins/groupwise-features/proxy-listing.glade
@@ -169,7 +169,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property>
+	      <property name="label" translatable="yes" comments="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/plugins/groupwise-features/proxy-login-dialog.glade b/plugins/groupwise-features/proxy-login-dialog.glade
index d2e0bc8fb0..d774555659 100644
--- a/plugins/groupwise-features/proxy-login-dialog.glade
+++ b/plugins/groupwise-features/proxy-login-dialog.glade
@@ -7,7 +7,7 @@
 <widget class="GtkDialog" id="proxy_login_dialog">
   <property name="visible">True</property>
   <property name="height_request">325</property>
-  <property name="title" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property>
+  <property name="title" translatable="yes" comments="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index 9fbb00082b..18e1b74300 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-14  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #567687
+
+	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
+	Force text/html part only when choosing between text/plain and it.
+
 2008-09-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #551492
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 45cafa562a..ed4b6dc363 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -119,9 +119,7 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 		/* Try to find text/html part even when not as last and force to show it.
 		   Old handler will show the last part of multipart/alternate, but if we
 		   can offer HTML, then offer it, regardless of position in multipart.
-		   But do this only when have text/plain in a list, because otherwise it
-		   can be something else (like outlooks meeting invites with only text/html
-		   part and calendar part).
+		   But do this when have only text/plain and text/html parts, not more.
 		*/
 		nparts = camel_multipart_get_number (mp);
 		for (i = 0; i < nparts; i++) {
@@ -148,7 +146,7 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 			}
 		}
 
-		if (display_part && have_plain) {
+		if (display_part && have_plain && nparts == 2) {
 			g_string_append_printf (t->format->part_id, ".alternative.%d", displayid);
 			em_format_part_as (t->format, t->stream, display_part, "text/html");
 			g_string_truncate (t->format->part_id, partidlen);
diff --git a/po/ChangeLog b/po/ChangeLog
index 0b156e1aef..90319f9cb4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-14  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
 2009-01-12  Andre Klapper  <a9016009@gmx.de>
 
 	* de.po: Updated German translation.
diff --git a/po/es.po b/po/es.po
index 229fa118bb..e1dd515d08 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,14 +10,14 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 200, 2009.
-#: ../shell/main.c:595
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-01-11 13:55+0000\n"
-"PO-Revision-Date: 2009-01-11 23:39+0100\n"
+"POT-Creation-Date: 2009-01-13 12:25+0000\n"
+"PO-Revision-Date: 2009-01-14 20:10+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -740,7 +740,7 @@ msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
@@ -975,7 +975,7 @@ msgstr ""
 "nombres."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Posición del panel vertical"
 
@@ -2848,6 +2848,9 @@ msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Seleccionar…"
 
@@ -3408,16 +3411,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2783
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
 
@@ -3475,7 +3478,7 @@ msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Disponibilidad"
@@ -5011,50 +5014,67 @@ msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+"Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URL del servidor para publicación de disponibilidad."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Línea de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la línea de Marcus Bains de la vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la línea de Marcus Bains de la barra de tiempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Máximo número de zonas horarias usadas recientemente para recordar en la "
+"lista «day_second_zones»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Máximo número de zonas horarias usadas recientemente para recordar."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Posición del panel horizontal de la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Posición del panel vertical en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cuándo ocultar tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5062,7 +5082,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no está en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5070,7 +5090,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5078,7 +5098,7 @@ msgstr ""
 "Posición del panel vertical, entre las listas del calendario el calendario "
 "del navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5086,7 +5106,7 @@ msgstr ""
 "Posición del la hoja vertical, entre la lista de tareas y el la hoja de "
 "vista previa de tareas, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5094,7 +5114,7 @@ msgstr ""
 "Posición de la hoja vertical, entre la vista y el navegador del calendario y "
 "la lista de tareas en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5103,77 +5123,89 @@ msgstr ""
 "calendario y la lista de tareas cuando no está en la vista mensual, en "
 "píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sean ejecutados por las alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Directorio donde guardar los sonidos de las alertas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar las horas de finalización de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Mostrar el campo de categorías en el editor de acontecimientos/reuniones/"
 "tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar el visor de la alerta en una bandeja de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Muestra la segunda zona horaria en la Vista diaria, si está establecido. El "
+"valor es similar al usado en la clave «timezone»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Posición del panel vertical de tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5183,7 +5215,7 @@ msgstr ""
 "reemplaza por la parte del usuario de la dirección de correo y %d se "
 "reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5192,7 +5224,11 @@ msgstr ""
 "calendario, como una localización sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"América/Nueva York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
+msgstr "La segunda zona horaria para una Vista diaria"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5200,20 +5236,20 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
 "para mensajes de depuración."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alerta sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Zona horaria "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5221,46 +5257,46 @@ msgstr ""
 "Transparencia de los acontecimientos en las vistas del calendario, un valor "
 "entre 0 (transparente) y 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5268,102 +5304,102 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
 "al domingo en el mismo espacio que un día laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Zona horaria» en el editor de "
 "acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indica si debe mostrar los números de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr ""
 "Indica si se deben usar la hora del horario de verano al mostrar eventos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "Hora de verano"
 
@@ -5820,7 +5856,7 @@ msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alertas"
@@ -5834,11 +5870,39 @@ msgstr "_Sugerir mostrar automáticamente el adjunto"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ninguno"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#| msgid "Show _field in View"
+msgid "(Shown in a Day View)"
+msgstr "(Mostrado en la Vista diaria)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5852,7 +5916,7 @@ msgstr ""
 "10 minutos\n"
 "5 minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
@@ -5860,52 +5924,52 @@ msgstr ""
 "<i>%u y %d se reemplazarán por el usuario y el dominio de la dirección de "
 "correo-e.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Servidor de disponibilidad predeterminado</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Lista de tareas</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Tiempo</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Semana laboral</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Ajustar a la hora de _verano"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "viernes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5915,13 +5979,13 @@ msgstr ""
 "horas\n"
 "días"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "lunes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5939,152 +6003,157 @@ msgstr ""
 "sábado\n"
 "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Elija un color"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#| msgid "Send To:"
+msgid "Se_cond zone:"
+msgstr "Zona se_cundaria:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione los calendarios para las alertas de notificación"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "miércoles"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "La _semana empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "_Vie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "M_ié"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -6726,25 +6795,6 @@ msgstr[1] "%d minutos antes de la cita"
 msgid "Customize"
 msgstr "Personalizar"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2954
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:370
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:74
-msgid "None"
-msgstr "Ninguno"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 día antes de la cita"
@@ -6896,9 +6946,15 @@ msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+"La fecha de finalización de la repetición es anterior al inicio del "
+"acontecimiento"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "en"
 
@@ -6906,7 +6962,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "primer"
 
@@ -6915,7 +6971,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "segundo"
 
@@ -6923,7 +6979,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "tercer"
 
@@ -6931,7 +6987,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1010
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6939,13 +6995,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -6953,7 +7009,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -6961,7 +7017,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -6969,45 +7025,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1061
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -7284,7 +7340,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3299
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -7352,7 +7408,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -7434,7 +7490,7 @@ msgstr "Establecer como _fondo"
 msgid "_Save Selected"
 msgstr "_Guardar seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:826
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
@@ -7725,7 +7781,7 @@ msgstr "Rehusado"
 #: ../calendar/gui/e-calendar-view.c:2225
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:395
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisional"
 
@@ -7775,11 +7831,16 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the second time zone"
+msgstr "Muestra la segunda zona horaria"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
@@ -8306,7 +8367,7 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2121
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -8315,7 +8376,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2152
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8325,67 +8386,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -8460,7 +8521,7 @@ msgstr "Terminando tareas…"
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Seleccione la zona horaria"
 
@@ -11328,7 +11389,6 @@ msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
 #: ../e-util/e-util.c:127
-#| msgid "Could not open autosave file"
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
@@ -12580,33 +12640,33 @@ msgstr "No se pudo obtener el mensaje"
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2782
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "Ll_amar a…"
 
-#: ../mail/em-folder-view.c:2785
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2786
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2787
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3280
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3292
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3297
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
@@ -13141,7 +13201,7 @@ msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:847
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
@@ -15093,7 +15153,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -16736,7 +16796,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:591
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -20314,7 +20374,7 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diálogo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:475
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -20741,39 +20801,39 @@ msgstr ""
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depuración de todos los componentes a un archivo."
 
-#: ../shell/main.c:489
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:491
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:578
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:606
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
diff --git a/po/pl.po b/po/pl.po
index d5210d4414..8a4272424a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,20 +6,18 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres:
 # translators@gnomepl.org
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 20:03+0000\n"
-"PO-Revision-Date: 2008-09-21 16:07+0100\n"
+"POT-Creation-Date: 2009-01-13 23:16+0100\n"
+"PO-Revision-Date: 2009-01-14 00:29+0100\n"
 "Last-Translator: wadim dziedzic <wdziedzic@aviary,pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Bookmarks: -1,-1,2323,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
@@ -119,7 +117,8 @@ msgstr "tabela z widokiem i wyborem bieżącego zakresu czasu"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -129,7 +128,8 @@ msgstr[2] "Zawiera %d zdarzeń."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
+#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Nie zawiera zdarzeń."
 
@@ -158,7 +158,7 @@ msgid "calendar view for one or more days"
 msgstr "widok kalendarza dla jednego lub więcej dni"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -169,8 +169,9 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-day-view.c:1578
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -178,9 +179,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -188,10 +189,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:827
+#: ../calendar/gui/calendar-component.c:834
+#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:842
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -201,15 +202,16 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-day-view.c:1594
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Kalendarz GNOME"
 
@@ -273,21 +275,21 @@ msgstr "przełącz"
 msgid "toggle the cell"
 msgstr "przełącz komórkę"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "rozwiń"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
-msgstr "rozwija wiersz w ETree zawierającym tą komórkę"
+msgstr "rozwija wiersz w ETree zawierającym tę komórkę"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "zwiń"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
-msgstr "zwija  wiersz w ETree zawierającym tą komórkę"
+msgstr "zwija  wiersz w ETree zawierającym tę komórkę"
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
@@ -343,20 +345,12 @@ msgstr "aktywuj"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"\"{0}\" jest książką adresową tylko do odczytu. Proszę zaznaczyć w widoku "
-"kontaktów książkę adresową, do której można wpisywać nowe kontakty."
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "\"{0}\" jest książką adresową tylko do odczytu. Proszę zaznaczyć w widoku kontaktów książkę adresową, do której można wpisywać nowe kontakty."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Istnieje już kontakt z tym adresem. Czy mimo tego dodać nową kartę z takim "
-"samym adresem?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Istnieje już kontakt z tym adresem. Czy mimo tego dodać nową kartę z takim samym adresem?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -375,14 +369,8 @@ msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dostępny."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Sprawdź czy hasło zostało prawidłowo napisane oraz używana jest obsługiwana "
-"metoda logowania. Wiele haseł jest wrażliwych na wielkość liter; może być "
-"włączony klawisz 'caps lock'."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Sprawdź czy hasło zostało prawidłowo napisane oraz używana jest obsługiwana metoda logowania. Wiele haseł jest wrażliwych na wielkość liter; może być włączony klawisz 'caps lock'."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -393,15 +381,8 @@ msgid "Could not remove address book."
 msgstr "Nie można usunąć książki adresowej."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
-msgstr ""
-"W chwili obecnej z Evolution dostępna jest tylko systemowa książka adresowa "
-"GroupWise. Aby pobrać katalogi GroupWise Frequent Contacts oraz GroupWise "
-"Personal Contacts, należy przynajmniej raz użyć innego klienta poczty "
-"GroupWise."
+msgid "Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr "W chwili obecnej z Evolution dostępna jest tylko systemowa książka adresowa GroupWise. Aby pobrać katalogi GroupWise Frequent Contacts oraz GroupWise Personal Contacts, należy przynajmniej raz użyć innego klienta poczty GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -421,7 +402,7 @@ msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Nie można usunąć kontaktu"
 
@@ -434,6 +415,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "Serwer LDAP nie odpowiedział z poprawną informacją schematu."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Wersja serwera"
 
@@ -446,19 +428,12 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Książka adresowa Evolution niespodziewanie zakończyła pracę."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Wybrany obraz jest duży. Czy zmniejszyć i zapisać go?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Serwer LDAP może używać starszej wersji LDAP, która nie obsługuje tej "
-"funkcjonalności lub może nie być skonfigurowany. Proszę zapytać "
-"administratora o obsługę baz wyszukiwania."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Serwer LDAP może używać starszej wersji LDAP, która nie obsługuje tej funkcjonalności lub może nie być skonfigurowany. Proszę zapytać administratora o obsługę baz wyszukiwania."
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book could not be opened."
@@ -466,17 +441,11 @@ msgstr "Nie można otworzyć tej książki adresowej."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book server does not have any suggested search bases."
-msgstr ""
-"Serwer książki adresowej nie posiada żadnych sugerowanych podstaw "
-"wyszukiwania."
+msgstr "Serwer książki adresowej nie posiada żadnych sugerowanych podstaw wyszukiwania."
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Serwer książki adresowej może być niedostępny, nazwa serwera może być "
-"niepoprawna albo połączenie sieciowe nie jest aktywne."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Serwer książki adresowej może być niedostępny, nazwa serwera może być niepoprawna albo połączenie sieciowe nie jest aktywne."
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
@@ -503,41 +472,27 @@ msgid "Would you like to save your changes?"
 msgstr "Czy zapisać zmiany?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Kontakt jest przenoszony z jednej do drugiej książki adresowej, ale nie "
-"można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "Kontakt jest przenoszony z jednej do drugiej książki adresowej, ale nie można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"Łączenie z nieobsługiwanym serwerem GroupWise za pomocą Evolution może "
-"spowodować problemy. Proszę rozważyć uaktualnienie serwera do obsługiwanej "
-"wersji."
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "Łączenie z nieobsługiwanym serwerem GroupWise za pomocą Evolution może spowodować problemy. Proszę rozważyć uaktualnienie serwera do obsługiwanej wersji."
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Brak uprawnień do usuwania kontaktów z tej książki adresowej."
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "W obecnym kontakcie dokonano zmian. Czy zapisać te modyfikacje?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Kontakty dla {0} nie będą dostępne do czasu następnego uruchomienia programu "
-"Evolution."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Kontakty dla {0} nie będą dostępne do czasu następnego uruchomienia programu Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -561,8 +516,9 @@ msgid "_Use as it is"
 msgstr "_Użyj takie jak jest"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -571,21 +527,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Domyślny adres do synchronizacji:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "Nie można wczytać książki adresowej"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Autouzupełnianie"
 
@@ -603,9 +560,10 @@ msgstr "Konfiguracja automatycznego uzupełniania"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:307
+#: ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakty"
@@ -646,13 +604,18 @@ msgstr "Zarządzanie certyfikatami S/Mime"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:143
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../calendar/gui/calendar-component.c:244
+#: ../calendar/gui/memos-component.c:199
+#: ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195
+#: ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202
+#: ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316
+#: ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
@@ -663,13 +626,15 @@ msgstr "Na tym komputerze"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208
+#: ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204
+#: ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Osobiste"
 
@@ -679,34 +644,19 @@ msgstr "Osobiste"
 msgid "On LDAP Servers"
 msgstr "Na serwerze LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Kontakt"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgctxt "New"
-msgid "Contact _List"
-msgstr "_Listę kontaktów"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Tworzy nową listę kontaktów"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Książkę _adresową"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Tworzy nową książkę adresową"
@@ -715,72 +665,75 @@ msgstr "Tworzy nową książkę adresową"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Nie można zaktualizować ustawień książki adresowej lub katalogów."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Baza"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Lokalne _kopiowanie zawartości książki dla operacji bez podłączenia"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283
+#: ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2466
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Ogólne"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Informacje o serwerze"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Szczegóły"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Pobieranie"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Właściwości książki adresowej"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migracja..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrowanie \"%s\":"
@@ -795,13 +748,11 @@ msgstr "Ustawienia autouzupełniania"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Położenie i hierarchia katalogów kontaktów Evolution uległy zmianie od "
-"wersji 1.x.\n"
+"Położenie i hierarchia katalogów kontaktów Evolution uległy zmianie od wersji 1.x.\n"
 "\n"
 "Proszę czekać. Trwa migracja katalogów..."
 
@@ -835,53 +786,70 @@ msgstr ""
 "\n"
 "Proszę czekać. Trwa migracja danych Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmień nazwę katalogu \"%s\" na:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Zmień nazwę katalogu"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Nazwa katalogu nie może zawierać znaku '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Nowa książka adresowa"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Zapisz jako vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501
+#: ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132
+#: ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Zmień nazwę..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504
+#: ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129
+#: ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35
+#: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/memos-component.c:509
+#: ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040
+#: ../mail/em-folder-tree.c:2138
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Wybór źródła kontaktu"
 
@@ -902,8 +870,8 @@ msgstr "Hasło dla %s (użytkownik %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Hasło"
@@ -921,42 +889,51 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "XML EFolderList dla listy uzupełniania adresów URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Położenie panelu pionowego, pomiędzy widokami kart, list oraz panelem "
-"podglądu, w pikselach."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Położenie panelu pionowego, pomiędzy widokami kart, list oraz panelem podglądu, w pikselach."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show preview pane"
-msgstr "Wyświetlanie panelu podglądu"
+msgid "Show autocompleted name with an address"
+msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Liczba znaków wpisanych, zanim Evolution podejmie próbę automatycznego "
-"uzupełniania."
+msgid "Show preview pane"
+msgstr "Wyświetlanie panelu podglądu"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Liczba znaków wpisanych, zanim Evolution podejmie próbę automatycznego uzupełniania."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adres URI katalogu ostatnio używanego w oknie wyboru nazw"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adres URI katalogu ostatnio używanego w oknie wyboru nazw."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Pozycja panelu pionowego"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Określa, czy wyświetlać panel podglądu."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+#, fuzzy
+msgid "Look up in address books"
+msgstr "_Szukanie tylko w lokalnej książce adresowej"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -1024,10 +1001,8 @@ msgid "Email address"
 msgstr "Adres e-mail"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution wykorzysta podany adres e-mail przy uwierzytelnianiu na serwerze."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution wykorzysta podany adres e-mail przy uwierzytelnianiu na serwerze."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1078,39 +1053,20 @@ msgid "Search filter"
 msgstr "Filtr wyszukiwania"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"Filtr wyszukiwania określa typ szukanego obiektu. Domyślnie wyszukiwanie "
-"przeprowadzane będzie na obiektach typu \"osoba\"."
+msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by  default search will be performed on objectclass of the type \"person\"."
+msgstr "Filtr wyszukiwania określa typ szukanego obiektu. Domyślnie wyszukiwanie przeprowadzane będzie na obiektach typu \"osoba\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Wybranie tej opcji powoduje, że Evolution nawiąże połączenie z serwerem "
-"LDAP, tylko jeśli obsługuje on protokół SSL."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Wybranie tej opcji powoduje, że Evolution nawiąże połączenie z serwerem LDAP, tylko jeśli obsługuje on protokół SSL."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Wybranie tej opcji powoduje, że Evolution nawiąże połączenie z serwerem "
-"LDAP, tylko jeśli obsługuje on protokół TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Wybranie tej opcji powoduje, że Evolution nawiąże połączenie z serwerem LDAP, tylko jeśli obsługuje on protokół TLS."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Wybranie tej opcji oznacza, że używany serwer nie obsługuje ani protokołu "
-"SSL ani TLS. Połączenia z nim nie będą zabezpieczone, a przesyłane dane będą "
-"podatne na ewentualne ataki z zewnątrz."
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "Wybranie tej opcji oznacza, że używany serwer nie obsługuje ani protokołu SSL ani TLS. Połączenia z nim nie będą zabezpieczone, a przesyłane dane będą podatne na ewentualne ataki z zewnątrz."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1129,68 +1085,32 @@ msgid "TLS encryption"
 msgstr "Szyfrowanie TLS"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-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 ""
-"Podstawą wyszukiwania jest wyróżniona nazwa (DN) pozycji gdzie rozpocznie "
-"się wyszukiwanie. Po pozostawieniu tego pola pustym, wyszukiwanie rozpocznie "
-"się od głównego katalogu drzewa."
+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 "Podstawą wyszukiwania jest wyróżniona nazwa (DN) pozycji gdzie rozpocznie się wyszukiwanie. Po pozostawieniu tego pola pustym, wyszukiwanie rozpocznie się od głównego katalogu drzewa."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
-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 ""
-"Zakres wyszukiwania określa głębokość wyszukiwania wgłąb drzewa katalogów. "
-"Zakres wyszukiwania \"sub\" dołączy wszystkie poniższe wpisy do podstawy "
-"wyszukiwania. Zakres wyszukiwania \"one\" (jeden) dołączy tylko wpisy leżące "
-"poziom ponad podstawą wyszukiwania."
+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 "Zakres wyszukiwania określa głębokość wyszukiwania wgłąb drzewa katalogów. Zakres wyszukiwania \"sub\" dołączy wszystkie poniższe wpisy do podstawy wyszukiwania. Zakres wyszukiwania \"one\" (jeden) dołączy tylko wpisy leżące poziom ponad podstawą wyszukiwania."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
 msgstr "Jest to pełna nazwa serwera LDAP. Na przykład: \"ldap.mojafirma.com\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Jest to maksymalna liczba pobieranych pozycji. Zbytnie zwiększenie tej "
-"liczby spowoduje spowolnienie działania książki adresowej."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "Jest to maksymalna liczba pobieranych pozycji. Zbytnie zwiększenie tej liczby spowoduje spowolnienie działania książki adresowej."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Jest to metoda, która zostanie użyta przez Evolution przy uwierzytelnianiu. "
-"Zwróć uwagę na fakt, że ustawienie jej na \"Adres e-mail\" wymaga "
-"anonimowego dostępu do serwera LDAP."
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "Jest to metoda, która zostanie użyta przez program Evolution przy uwierzytelnianiu. Uwaga: ustawienie jej na \"Adres e-mail\" wymaga anonimowego dostępu do serwera LDAP."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Jest to nazwa serwera, która będzie widoczna na liście katalogów Evolution. "
-"Nazwa ta przeznaczona jest tylko do wyświetlania."
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "Jest to nazwa serwera, która będzie widoczna na liście katalogów Evolution. Nazwa ta przeznaczona jest tylko do wyświetlania."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Jest to port na serwerze LDAP, z którym Evolution nawiąże połączenie. Podano "
-"listę standardowych portów. Informacje na temat numeru portu można uzyskać u "
-"administratora systemu."
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "Jest to port na serwerze LDAP, z którym Evolution nawiąże połączenie. Podano listę standardowych portów. Informacje na temat numeru portu można uzyskać u administratora systemu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1222,7 +1142,7 @@ msgstr "Metoda _logowania:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1237,7 +1157,7 @@ msgid "_Search scope:"
 msgstr "Z_akres wyszukiwania:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Serwer:"
@@ -1255,13 +1175,15 @@ msgid "cards"
 msgstr "karty"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "minut"
 
@@ -1302,8 +1224,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Praca</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1314,16 +1236,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorie..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
@@ -1332,11 +1254,12 @@ msgid "Full _Name..."
 msgstr "Imię i _nazwisko..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Obraz"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "Komunikator MSN"
 
@@ -1349,1130 +1272,1135 @@ msgid "Nic_kname:"
 msgstr "Pseu_donim:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Praca"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "Rocznic_a:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Asystent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Kalendarz:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Kraj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Wydział:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "W_idoczny jako:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Sygnalizacja zajętości:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "Strona _domowa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Menedżer:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notatki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "Sk_rzynka pocztowa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Zawód:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Małż_onek:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tytuł:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Rozmowa wideo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Chce otrzymywać wiadomości w formacie _HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "Dziennik _WWW:"
 
 # FIXME - jak zobaczę to w akcji to będę wiedział czy nie zmienić
 # tego na położenie czy coś innego
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Gdzie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Kod pocztowy:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Adres"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1822
 #: ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Modyfikowalny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algieria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Samoa Amerykańskie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktyka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentyna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbejdżan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Białoruś"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Boliwia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bośnia i Hercegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Wyspa Bouveta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Brytyjskie Terytorium Oceanu Spokojnego"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bułgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodża"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Zielony Przylądek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Wyspy Kajmany"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Republika Środkowoafrykańska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Czad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Chiny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Wyspa Bożego Narodzenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Wyspy Kokosowe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komory"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Demokratyczna Republika Konga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Cypr"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Czechy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Dżibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Republika Dominikańska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ekwador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egipt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "Salwador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Gwinea Równikowa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandy (Malwiny)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Wyspy Owcze"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidżi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Francja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Gujana Francuska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Południowe Terytoria Francuskie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Gruzja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Niemcy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grecja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Gwinea Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Gujana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Wyspy Headra i McDonalda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Watykan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Węgry"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Indie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Włochy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Koreańska Republika Ludowo Demokratyczna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Republika Korei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Łotwa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Liban"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litwa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Makao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Malediwy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martynika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Majotta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Mołdowa, Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monako"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Birma (Myanmar)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Antyle Holenderskie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Wyspa Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Wyspy Północne Mariany"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Autonomia Palestyńska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Nowa Gwinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paragwaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Rumunia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Federacja Rosyjska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Christopher i Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent i Grenadyny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Wyspy Świętego Tomasza i Książęca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbia i Czarnogóra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seszele"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Słowenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Republika Południowej Afryki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Wyspy Południowa Georgia i Południowy Sandwich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Święta Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Saint Pierre i Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Wyspy Svalbard i Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Suazi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadżykistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Zjednoczona Republika Tanzanii"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor wschodni"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trynidad i Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turcja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Wyspy Turks i Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Wielka Brytania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Odległe Mniejsze Wyspy Stanów Zjednoczonych"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Wietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Brytyjskie Wyspy Dziewicze"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Wyspy Dziewicze Stanów zjednoczonych"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wyspy Wallis i Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Sahara Zachodnia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
@@ -2484,119 +2412,127 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "Komunikator internetowy AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Komunikator Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Komunikator Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Usługa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Położenie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Dom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2228
 msgid "Other"
 msgstr "Inne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Książka docelowa"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Wymagane pola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Zmienione"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Edytor kontaktów - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Proszę wybrać obraz dla tego kontaktu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Brak obrazu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,43 +2540,43 @@ msgstr ""
 "Dane kontaktu są niepoprawne:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Format '%s' jest nieprawidłowy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "Format %s'%s' jest nieprawidłowy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' jest pusty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Nieprawidłowy kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaktu"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Pełna edycja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "I_mię i nazwisko:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "_E-mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Wybierz książkę adresową"
 
@@ -2778,9 +2714,9 @@ msgstr "_Usługa IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Położenie:"
 
@@ -2794,6 +2730,9 @@ msgid "Contact List Editor"
 msgstr "Edytor listy kontaktów"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Wybierz..."
 
@@ -2819,9 +2758,9 @@ msgid "_Members"
 msgstr "_Członkowie"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2845,9 +2784,7 @@ msgid "Duplicate Contact Detected"
 msgstr "Wykryto powtórzony kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 "Katalog zawiera już kontakt o tym samym nazwisku lub adresie e-mail.\n"
 "Czy pomimo tego dodać go?"
@@ -2879,23 +2816,26 @@ msgstr "Połącz kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-mail rozpoczyna się od"
 
@@ -2903,11 +2843,11 @@ msgstr "E-mail rozpoczyna się od"
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Brak kontaktów"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2915,24 +2855,25 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakty"
 msgstr[2] "%d kontaktów"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Zapytanie"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Błąd przy pobieraniu widoku książki adresowej"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820
 #: ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
 
@@ -2940,31 +2881,32 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Błąd przy modyfikacji karty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Nazwa rozpoczyna się od"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Źródło"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Rodzaj"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Zapisz jako vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1746
+#: ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otwórz"
@@ -3018,13 +2960,18 @@ msgid "Cu_t"
 msgstr "_Wytnij"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1753
+#: ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051
+#: ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322
+#: ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "S_kopiuj"
@@ -3034,14 +2981,22 @@ msgid "P_aste"
 msgstr "_Wklej"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628
+#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632
+#: ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Nie pasujące"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Asystent"
 
@@ -3071,7 +3026,7 @@ msgstr "Telefon samochodowy"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3079,7 +3034,7 @@ msgid "Categories"
 msgstr "Kategorie"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Firma"
 
@@ -3128,22 +3083,22 @@ msgid "Journal"
 msgstr "Dziennik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Menedżer"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Telefon komórkowy"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Notatka"
 
@@ -3172,14 +3127,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Rola"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Małżonek"
 
@@ -3210,38 +3165,46 @@ msgid "Web Site"
 msgstr "Witryna internetowa"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85
+#: ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424
+#: ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077
+#: ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Szerokość"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432
+#: ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Wysokość"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Posiada skupienie"
 
@@ -3327,85 +3290,87 @@ msgstr ""
 msgid "Adapter"
 msgstr "Łącznik"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-mail służbowy"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-mail domowy"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Inny e-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Wybrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Posiada kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "Otwórz odnośnik w p_rzeglądarce"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Wyślij nową wiadomość do..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Kopiuj adres _e-mail"
 
 # FIXME - dobrze czy nie?
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(mapa)"
 
 # FIXME - dobrze czy nie?
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Członkowie listy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Wydział"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Zawód"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Pozycja"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Rozmowa wideo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2496
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3416,207 +3381,179 @@ msgstr "Rozmowa wideo"
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Sygnalizacja zajętości"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Witryna domowa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Dziennik WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2507
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2508
 msgid "Anniversary"
 msgstr "Rocznica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Witryna domowa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Sukces"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Mechanizm przetwarzania zajęty"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Repozytorium rozłączone"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Książka adresowa nie istnieje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Nie zdefiniowano własnego kontaktu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Nie odnaleziono kontaktu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontakt z tym ID już istnieje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokół nie jest obsługiwany"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:653
+#: ../calendar/gui/print.c:2554
 msgid "Canceled"
 msgstr "Anulowano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Nie można anulować"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Brak takiego źródła"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Niedostępne w trybie offline"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Inny błąd"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Niewłaściwa wersja serwera"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Nieobsługiwana metoda uwierzytelniania"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this address book. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
-msgstr ""
-"Nie można otworzyć tej książki adresowej. Oznacza to, że książka nie jest "
-"przeznaczona do użycia bez połączenia lub nie została jeszcze pobrana. "
-"Proszę wczytać książkę w trybie połączenia aby pobrać jej zawartość"
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
-msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
-msgstr ""
-"Nie można otworzyć tej książki adresowej. Proszę sprawdzić czy ścieżka %s "
-"istnieje oraz, czy ma ustawione odpowiednie uprawnienia dostępu."
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "Nie można otworzyć tej książki adresowej. Proszę sprawdzić czy ścieżka %s istnieje oraz czy ma ustawione odpowiednie uprawnienia dostępu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
-"niepoprawnego adresu URI lub niedostępnością serwera LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Używana kopia Evolution została skompilowana bez obsługi LDAP. Aby móc "
-"wykorzystać LDAP, należy pobrać Evolution z obsługą LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "Używana wersja Evolution została skompilowana bez obsługi LDAP. Aby móc wykorzystać LDAP, należy zainstalować program Evolution z obsługą LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
-"niepoprawnego adresu URI lub niedostępnością serwera."
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+msgstr "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem niepoprawnego adresu URI lub niedostępnością serwera."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
-msgid "Detailed error:"
-msgstr "Szczegóły błędu:"
+msgid "Detailed error message:"
+msgstr "Szczegółowy komunikat błędu:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
@@ -3634,11 +3571,11 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
-"Czas wykonania tego zapytania przekroczył limit serwera lub\n"
+"Czas wykonania tego zapytania przekroczył limit czasu serwera lub\n"
 "limit skonfigurowany dla tej książki adresowej. Proszę doprecyzować\n"
 "zapytanie lub zwiększyć limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tę książkę adresową."
@@ -3761,23 +3698,23 @@ msgstr "Przeniesienie kontaktów do"
 msgid "Copy contacts to"
 msgstr "Skopiowanie kontaktów do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Wiele wpisów vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard dla %s"
 
 # wd ??
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Informacje kontaktowe"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informacje kontaktowe dla %s"
@@ -3786,7 +3723,7 @@ msgstr "Informacje kontaktowe dla %s"
 msgid "Querying Address Book..."
 msgstr "Odpytywanie książki adresowej..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3794,16 +3731,16 @@ msgstr[0] "Jest jeszcze jeden inny kontakt."
 msgstr[1] "Są jeszcze %d inne kontakty."
 msgstr[2] "Jest jeszcze %d innych kontaktów."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Wyświetl pełną wizytówkę vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Wyświetl skróconą wizytówkę vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Zapisz w książce adresowej"
 
@@ -3812,10 +3749,11 @@ msgid "Card View"
 msgstr "Widok karty"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685
+#: ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importowanie..."
 
@@ -3843,19 +3781,19 @@ msgstr "Plik CSV lub Tab Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importer CVS i Tab z Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format wymiany danych LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Importer LDIF Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Importer vCard Evolution"
 
@@ -3900,11 +3838,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
+#: ../mail/em-mailer-prefs.c:433
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:647
 #: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Nagłówek"
@@ -4007,9 +3946,9 @@ msgstr "Cieniowanie"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Rozmiar:"
 
@@ -4038,29 +3977,8 @@ msgstr "Szerokość:"
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Test edytora stylu drukowania kontaktu"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Powinno to przetestować widget edytora stylu drukowania kontaktu"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Test drukowania kontaktów"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Powinno to przetestować kod drukowania kontaktu"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Nie można otworzyć pliku"
@@ -4098,23 +4016,16 @@ msgid "Export in asynchronous mode"
 msgstr "Eksport w trybie asynchronicznym "
 
 #: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Liczba wizytówek w jednym pliku wyjściowym w trybie asynchronicznym, "
-"domyślnie 100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Liczba wizytówek w jednym pliku wyjściowym w trybie asynchronicznym, domyślnie 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "LICZBA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Błąd argumentów wiersza poleceń, użyj opcji --help aby zobaczyć informacje "
-"na temat użycia."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Błąd argumentów wiersza poleceń, użyj opcji --help aby zobaczyć informacje na temat użycia."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
@@ -4134,49 +4045,32 @@ msgstr "Nieobsłużony błąd"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"{0} to kalendarz tylko do odczytu, który nie może być modyfikowany. Proszę "
-"wybrać inny kalendarz w pasku bocznym widoku kalendarzy."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "{0} to kalendarz tylko do odczytu, który nie może być modyfikowany. Proszę wybrać inny kalendarz w pasku bocznym widoku kalendarzy."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"\"{0}\" jest kalendarzem tylko do odczytu. Proszę wybrać inny kalendarz, do "
-"którego można wpisywać nowe spotkania."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "\"{0}\" jest kalendarzem tylko do odczytu. Proszę wybrać inny kalendarz, do którego można wpisywać nowe spotkania."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Podanie treściwego opisu, ułatwi odbiorcom przyswojenie tematu spotkania."
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Podanie treściwego opisu, ułatwi odbiorcom przyswojenie tematu spotkania."
 
 #: ../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."
+msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
 msgstr "Podanie treściwego opisu, ułatwi odbiorcom zrozumienie zadania."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Wszystkie informacje zawarte w tych notatkach zostaną bezpowrotnie usunięte."
+msgstr "Wszystkie informacje zawarte w tych notatkach zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Wszystkie informacje zawarte w tej notatce zostaną bezpowrotnie usunięte."
+msgstr "Wszystkie informacje zawarte w tej notatce zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "Wszystkie informacje o tych spotkaniach zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4184,19 +4078,16 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Wszystkie informacje o tych zadaniach zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Wszystkie informacje o tym spotkaniu zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Wszystkie informacje o tym zebraniu zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr ""
-"Wszystkie informacje zawarte w tej notatce zostaną bezpowrotnie usunięte."
+msgstr "Wszystkie informacje zawarte w tej notatce zostaną bezpowrotnie usunięte."
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
@@ -4232,19 +4123,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Czy na pewno usunąć to spotkanie?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Czy na pewno usunąć to zebranie?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "Czy na pewno usunąć tą notatkę?"
+msgstr "Czy na pewno usunąć tę notatkę?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Czy na pewno usunąć to zadanie?"
@@ -4262,318 +4153,310 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Czy na pewno wysłać zadanie bez podsumowania?"
 
 #: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "Repozytorium kalendarza jest rozłączone"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Nie można utworzyć nowego zdarzenia"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Nie można zapisać zdarzenia"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Usunąć kalendarz \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Usunąć listę notatek '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Usuwa listę zadań \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Nie wysyłaj"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Trwa pobieranie. Czy zapisać spotkanie?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Trwa pobieranie. Czy zapisać zmiany?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Nie można wczytać edytora."
 
-#: ../calendar/calendar.error.xml.h:37
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Do wszystkich uczestników zadania wysłane zostaną zaproszenia, które pozwolą "
-"zaakceptować zadanie."
-
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Do wszystkich uczestników wysłane zostaną zaproszenia, na które będą mogli "
-"odpowiedzieć."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Do wszystkich uczestników zadania wysłane zostaną zaproszenia, które pozwolą zaakceptować zadanie."
 
 #: ../calendar/calendar.error.xml.h:39
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Do wszystkich uczestników wysłane zostaną zaproszenia, na które będą mogli odpowiedzieć."
+
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Błąd podczas wczytywania kalendarza"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Błąd podczas wczytywania listy notatek"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Błąd podczas wczytywania listy zadań"
 
-#: ../calendar/calendar.error.xml.h:42
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się "
-"nie dowiedzieć, że zebranie się nie odbędzie."
-
-#: ../calendar/calendar.error.xml.h:43
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się "
-"nie dowiedzieć, że notatka została usunięta."
-
+#. For Translators: {0} is specify the backend server
 #: ../calendar/calendar.error.xml.h:44
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się "
-"nie dowiedzieć, że zadanie zostało usunięte."
+msgid "Error on '{0}'"
+msgstr "Błąd w \"{0}\""
 
 #: ../calendar/calendar.error.xml.h:45
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Wysyłanie aktualnych informacji, pozwoli innym uczestnikom na aktualizację "
-"ich kalendarzy."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się nie dowiedzieć, że zebranie się nie odbędzie."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Wysyłanie aktualnych informacji, pozwoli innym uczestnikom na aktualizację "
-"ich listy zadań."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się nie dowiedzieć, że notatka została usunięta."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Trwa pobieranie załączników. Zapisanie spotkania spowoduje utratę tych "
-"załączników."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się nie dowiedzieć, że zadanie zostało usunięte."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "No response from the server."
 msgstr ""
-"Trwa pobieranie załączników. Zapisanie zadania spowoduje utratę tych "
-"załączników."
 
 #: ../calendar/calendar.error.xml.h:49
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Nowe spotkanie"
+
+#: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+msgid "Save Memo"
+msgstr "Notatkę _współdzieloną"
+
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "Save Task"
+msgstr "Zapisz jako"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Wysyłanie aktualnych informacji, pozwoli innym uczestnikom na aktualizację ich kalendarzy."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Wysyłanie aktualnych informacji, pozwoli innym uczestnikom na aktualizację ich listy zadań."
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Trwa pobieranie załączników. Zapisanie spotkania spowoduje utratę tych załączników."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Trwa pobieranie załączników. Zapisanie zadania spowoduje utratę tych załączników."
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "Część funkcji może działać niepoprawnie z bieżącą wersją serwera"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendarz Evolution niespodziewanie zakończył pracę."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Kalendarz Evolution niespodziewanie zakończył pracę."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Notatki Evolution niespodziewanie zakończyły pracę."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Zadania Evolution niespodziewanie zakończyły pracę."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalendarz nie jest zaznaczony do użycia w trybie offline."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Lista notatek nie jest zaznaczona do użycia w trybie bez połączenia."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Lista zadań nie jest zaznaczona do użycia w trybie offline"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Kalendarz zostanie trwale usunięty."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Lista notatek zostanie trwale usunięta."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Lista zadań zostanie trwale usunięta."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Nie można wczytać kalendarza '%s'."
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Czy zapisać zmiany w tym spotkaniu?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Czy zapisać zmiany w tej notatce?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Czy zapisać zmiany w tym zadaniu?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Czy wysłać informację o odwołaniu tej notatki?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Czy wysłać wszystkim uczestnikom informację o odwołaniu?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Czy wysłać do uczestników powiadomienie o zebraniu?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Czy wysłać to zadanie do uczestników?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Czy wysłać aktualizację informacji o zebraniu do uczestników?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Czy wysłać aktualizację zadania do uczestników?"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"Łączenie z nieobsługiwanym serwerem GroupWise za pomocą Evolution może "
-"spowodować problemy. Proszę rozważyć uaktualnienie serwera do obsługiwanej "
-"wersji."
+#: ../calendar/calendar.error.xml.h:78
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "Łączenie z nieobsługiwanym serwerem GroupWise za pomocą Evolution może spowodować problemy. Proszę rozważyć uaktualnienie serwera do obsługiwanej wersji."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Wprowadzono zmiany w spotkaniu, ale nie zostały one jeszcze zapisane."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Wprowadzono zmiany w zadaniu, ale nie zostały one jeszcze zapisane."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr ""
-"Wprowadzono zmiany w tej notatce, ale nie zostały one jeszcze zapisane."
+msgstr "Wprowadzono zmiany w tej notatce, ale nie zostały one jeszcze zapisane."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Kalendarze nie będą dostępne do czasu następnego uruchomienia programu "
-"Evolution."
+msgstr "Kalendarze nie będą dostępne do czasu następnego uruchomienia programu Evolution."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
-"Notatki nie będą dostepne do czasu następnego uruchomienia programu "
-"Evolution."
+msgstr "Notatki nie będą dostepne do czasu następnego uruchomienia programu Evolution."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Zadania nie będą dostepne do czasu następnego uruchomienia programu "
-"Evolution."
+msgstr "Zadania nie będą dostepne do czasu następnego uruchomienia programu Evolution."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Porzuć zmiany"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Zapisz zmiany"
 
-#: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:88
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_Wyślij informację"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Dzielenie zdarzeń wielodniowych:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "Nie można uruchomić evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie można odczytać bloku aplikacji kalendarza Pilota"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Nie można odczytać bloku aplikacji Memo Pilota"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Nie można zapisać bloku aplikacji Memo Pilota"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Domyślny priorytet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie można odczytać bloku aplikacji ToDo Pilota"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "Nie można zapisać bloku aplikacji ToDo Pilota"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "Calendar and Tasks"
 msgstr "Kalendarz i zadania"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "Kalendarze"
 
@@ -4614,22 +4497,28 @@ msgid "Memo_s"
 msgstr "_Notatki"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278
+#: ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1807
+#: ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016
+#: ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notatki"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714
+#: ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1675
+#: ../calendar/gui/print.c:1981
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005
+#: ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4650,28 +4539,30 @@ msgstr "_Zadania"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Usługa przypominania kalendarza Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "godzin"
 msgstr[1] "godzin"
 msgstr[2] "godzin"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Czas rozpoczęcia"
 
@@ -4682,9 +4573,9 @@ msgstr "Spotkania"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Położenie:"
@@ -4694,52 +4585,61 @@ msgid "Snooze _time:"
 msgstr "_Czas uśpienia:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#, fuzzy
+msgid "_Dismiss"
+msgstr "Zamknij"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:51
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "_Uśpij"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "miejsce spotkania"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Brak podsumowania."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Brak informacji o położeniu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d przypomnień"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
-#: ../mail/mail-component.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4751,24 +4651,22 @@ msgstr ""
 "z powiadamianiem za pośrednictwem wiadomości. Zamiast tego\n"
 "zostanie wyświetlone zwykłe okno przypomnienia."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Za chwilę zostanie uaktywnione powiadomienie kalendarza Evolution. Zostało "
-"ono skonfigurowane tak, aby uruchomić następujący program:\n"
+"Za chwilę zostanie uaktywnione powiadomienie kalendarza Evolution. Zostało ono skonfigurowane tak, aby uruchomić następujący program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Czy na pewno uruchomić ten program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przyszłości."
 
@@ -4777,18 +4675,16 @@ msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr ""
-"Nie można utworzyć fabryki przypomnień, być może jest już uruchomiona..."
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
+msgstr "Nie można utworzyć fabryki przypomnień, być może jest już uruchomiona..."
 
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4798,7 +4694,8 @@ msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4810,7 +4707,8 @@ msgstr[2] "%d minut"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4824,511 +4722,489 @@ msgid "Alarm programs"
 msgstr "Programy przypomnień"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Czas pokazywania błędu w pasku statusu (w sekundach)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Pytanie o potwierdzanie przed usunięciem elementów"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Kolor tła zadań na dziś, w formacie \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Kolor tła zadań zaległych, w formacie \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Kalendarze dla których będą uruchamiane przypomnienia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Kolor linii Marcusa Bainsa w pasku czasu (puste oznacza kolor domyślny)."
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Kolor linii Marcusa Bainsa w pasku czasu (puste oznacza kolor domyślny)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Kolor linii Marcusa Bainsa w widoku dziennym."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Kompresowanie weekendów w widoku miesięcznym"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Potwierdzanie oczyszczenia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dni na których powinny być wskazane godziny początku i końca pracy."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Domyślne przypomnienie spotkania"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Domyślne jednostki przypomnienia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Domyślna wartość przypomnienia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Directory for saving alarm audio files"
 msgstr "Katalog do zapisywania plików dźwiękowych alarmów"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Gradient zdarzeń"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Przezroczystość zdarzeń"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Adresy URL serwera z informacją o zajętości"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Adres URL szablonu z informacją o zajętości"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient zdarzeń w widoku kalendarza."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Ukrywanie zakończonych zadań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Jednostki ukrywania zadań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Wartość ukrywania zadania"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Poziome położenie panela"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Godzina zakończenia dnia roboczego, w formacie 24-godzinnym, 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Godzina rozpoczęcia dnia roboczego, w formacie 24-godzinnym, 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Przedziały czasu w widoku dnia oraz tygodnia roboczego, w minutach."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Czas ostatniego przypomnienia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr "Poziom powyżej którego wiadomość ma zostać zapisana w dzienniku."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista adresów URL serwerów udostępniających informację o zajętości."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Linia Marcusa Bainsa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Kolor linii Marcusa Bainsa - widok dzienny"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Kolor linii Marcusa Bainsa - pasek czasu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuta końca dnia roboczego - od 0 do 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuta początku dnia roboczego, 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Położenie poziome panelu widoku miesiąca"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Położenie pionowe panelu widoku miesiąca"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Liczba jednostek określających domyślne przypomnienie."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr "Liczba jednostek określających kiedy ukryć zadania."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Kolor zaległych zadań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Położenie panelu poziomego, pomiędzy nawigatorem dat kalendarza a listą "
-"zadań kiedy nie ma widoku miesiąca, w pikselach."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "Położenie panelu poziomego, pomiędzy nawigatorem dat kalendarza a listą zadań kiedy nie ma widoku miesiąca, w pikselach."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Położenie panelu poziomego pomiędzy widokiem a nawigatorem dat kalendarza "
-"oraz listą zadań w widoku miesiąca, w pikselach."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Położenie panelu poziomego pomiędzy widokiem a nawigatorem dat kalendarza oraz listą zadań w widoku miesiąca, w pikselach."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "Położenie panelu pionowego, pomiędzy listą kalendarzy a wyborem dat."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Położenie panelu pionowego, pomiędzy listą zadań oraz panelem podglądu zadań "
-"(w pikselach)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgstr "Położenie panelu pionowego, pomiędzy listą zadań oraz panelem podglądu zadań (w pikselach)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Położenie panelu pionowego, pomiędzy widokiem a nawigatorem dat kalendarza "
-"oraz listą zadań w widoku miesiąca, w pikselach."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Położenie panelu pionowego, pomiędzy widokiem a nawigatorem dat kalendarza oraz listą zadań w widoku miesiąca, w pikselach."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-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 ""
-"Położenie panelu pionowego, pomiędzy widokiem a nawigatorem dat kalendarza "
-"oraz listą zadań kiedy nie w widoku miesiąca, w pikselach."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "Położenie panelu pionowego, pomiędzy widokiem a nawigatorem dat kalendarza oraz listą zadań kiedy nie w widoku miesiąca, w pikselach."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programy które można uruchomić przez przypomnienia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Katalog zapisu plików dźwiękowych alarmów"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Pokazuj pole RSVP w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Pokazuj pole roli w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
-msgstr ""
-"Wyświetlanie czasów zakończenia spotkań w widoku tygodniowym i miesięcznym"
+msgstr "Wyświetlanie czasów zakończenia spotkań w widoku tygodniowym i miesięcznym"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Pokazuj pole kategorii w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Wyświetlanie przypomnień z w obszarze powiadamiania"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Pokazuj pole status w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Wyświetlanie panelu \"Podgląd\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Wyświetlanie panelu \"Podgląd\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Pokazuj pole strefy czasowej w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Pokazuj pole typu w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Wyświetlanie numerów tygodni w nawigatorze dat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Kolor zadań na dziś"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Położenie pionowe panela zadań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Szablon adresu URL używany jako zastępczy dla informacji o zajętości, %u "
-"jest zastępowane przez użytkownika z adresu e-mail, natomiast %d przez "
-"domenę."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "Szablon adresu URL używany jako zastępczy dla informacji o zajętości, %u jest zastępowane przez użytkownika z adresu e-mail, natomiast %d przez domenę."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "Domyślna strefa czasowa używana dla dat i czasu w kalendarzu, jako nieprzetłumaczona baza położeń stref czasowych Olsena np.: \"America/New York\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
 msgstr ""
-"Domyślna strefa czasowa używana dla dat i czasu w kalendarzu, jako "
-"nieprzetłumaczona baza położeń stref czasowych Olsena np.: \"America/New York"
-"\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#, fuzzy
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "Możliwe wartości to: 0 dla błędów, 1 dla ostrzeżeń oraz 2 dla komunikatów debugowania."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Przedziały czasu:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "Czas uruchomienia ostatniego porzypomnienia, w time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Przezroczystość zdarzeń w widoku kalendarza. Wartość 0 (przezroczysty) do 1."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Przezroczystość zdarzeń w widoku kalendarza. Wartość 0 (przezroczysty) do 1."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "24-godzinny format czasu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Jednostki dla domyślnego przypomnienia, \"minutes\" (minuty), \"hours"
-"\" (godziny) lub \"days\" (dni)."
+msgstr "Jednostki dla domyślnego przypomnienia, \"minutes\" (minuty), \"hours\" (godziny) lub \"days\" (dni)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Jednostki określające kiedy ukryć zadania, \"minutes\" (minuty), \"hours"
-"\" (godziny) lub \"days\" (dni)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Jednostki określające kiedy ukryć zadania, \"minutes\" (minuty), \"hours\" (godziny) lub \"days\" (dni)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Początek tygodnia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Początkowy dzień tygodnia, od Niedzieli (0) do Soboty (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Określa, czy używać obszaru powiadamiania do wyświetlania przypomnień."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Określa, czy potwierdzać kasowanie spotkań i zadań."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Określa, czy potwierdzać usunięcie spotkań i zadań."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Określa czy kompresować weekendy w widoku miesięcy, co powoduje umieszczenie "
-"Soboty i Niedzieli w miejscu jednego dnia."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "Określa czy kompresować weekendy w widoku miesięcy, co powoduje umieszczenie Soboty i Niedzieli w miejscu jednego dnia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Określa, czy wyświetlać czasów zakończenia zdarzeń w widoku tygodniowym i "
-"miesięcznym."
+msgstr "Określa, czy wyświetlać czasów zakończenia zdarzeń w widoku tygodniowym i miesięcznym."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Określa czy rysować w kalendarzu wskazującą bieżący czas linię Marcusa "
-"Bainsa."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "Określa czy rysować w kalendarzu wskazującą bieżący czas linię Marcusa Bainsa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Określa, czy ukrywać zakończone zadania w widoku zadań."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr "Określa, czy ustawić domyślne przypomnienie dla spotkań."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Określa, czy wyświetlać pole RSVP w edytorze zdarzeń/zadań/zebań?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Określa, czy wyświetlać kategorie edytorze zdarzeń/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Określa, czy polę rola w edytorze zdarzeń/zadań/spotkań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Określa, czy pole stanu w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Określa, czy wyświetlać czas w formacie 24-godzinnym zamiast 12-godzinnym."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Określa, czy wyświetlać czas w formacie 24-godzinnym zamiast 12-godzinnym."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Określa, czy wyświetlać pole strefy czasowej w edytorze zdarzeń/zadań/zebrań"
+msgstr "Określa, czy wyświetlać pole strefy czasowej w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Określa, czy wyświetlać polę typu w edytorze zdarzeń/zadań/zebrań"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Określa, czy wyświetlać numery tygodni w nawigatorze dat."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Określa czy używać czasu zimowgo podczas wyświetlania zdarzeń."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Dni robocze"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Godzina końca dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Minuta końca dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Godzina początku dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Minuta początku dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "czas zimowy"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Podsumowanie zawiera"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategorią jest"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Położenie zawiera"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Nie pasujące"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Zadania na następne 7 dni"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Aktualne zadania "
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Zaległe zadania"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Zakończone zadania"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Zadania z załącznikami"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Aktualne spotkania"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Spotkania w następnych 7 dniach"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:90
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: ../calendar/gui/calendar-commands.c:317
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Operacja ta bezpowrotnie usunie wszystkie zdarzenia starsze niż zaznaczony "
-"okres czasu. W przypadku kontynuowania operacji, późniejsze odzyskanie zadań "
-"nie będzie możliwe."
+#: ../calendar/gui/calendar-commands.c:315
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "Operacja ta bezpowrotnie usunie wszystkie zdarzenia starsze niż zaznaczony okres czasu. W przypadku kontynuowania operacji, późniejsze odzyskanie zadań nie będzie możliwe."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Usunięcie zdarzeń starszych niż"
 
-#: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../calendar/gui/calendar-commands.c:326
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dni"
@@ -5337,100 +5213,95 @@ msgstr "dni"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/calendar-component.c:281
+#: ../calendar/gui/memos-component.c:235
+#: ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "W sieci"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318
+#: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Urodziny i rocznice"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Pogoda"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "_Nowy kalendarz"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500
+#: ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505
+#: ../calendar/gui/tasks-component.c:496
+msgid "_Make available for offline use"
+msgstr "_Oznacz do użycia w trybie offline"
+
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506
+#: ../calendar/gui/tasks-component.c:497
+msgid "_Do not make available for offline use"
+msgstr "_Nie udostępniaj w trybie offline"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "Nie można zaktualizować kalendarzy."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"Nie można otworzyć kalendarza \"%s\" w celu utworzenia zdarzeń i zebrań"
+msgstr "Nie można otworzyć kalendarza \"%s\" w celu utworzenia zdarzeń i zebrań"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Brak dostępnego kalendarza do utworzenia zdarzeń i zebrań"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "Wybór źródła kalendarza"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "Nowe spotkanie"
 
-#: ../calendar/gui/calendar-component.c:1597
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Spotkanie"
-
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "Tworzy nowe spotkanie"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "Nowe zebranie"
 
-#: ../calendar/gui/calendar-component.c:1605
-msgctxt "New"
-msgid "M_eeting"
-msgstr "Ze_branie"
-
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o zebranie"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "Nowe spotkanie całodniowe"
 
-#: ../calendar/gui/calendar-component.c:1613
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Spotkanie _całodniowe"
-
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowe spotkanie całodniowe"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: ../calendar/gui/calendar-component.c:1621
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Kal_endarz"
-
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
@@ -5450,217 +5321,143 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Dowolne pole"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Służbowy"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Konkurencja"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Tajny"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Opis zawiera"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Istnieje"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Ulubione"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Upominki"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Cele/zamierzenia"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Święta"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Kartki świąteczne"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Ważne kontakty"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Pomysły"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Międzynarodowe"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Kluczowy klient"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Różne"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Następne 7 dni"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Telefony"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:346
+#: ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Prywatny"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
-#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:337
+#: ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:555
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Publiczny"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Powtarzanie"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stan"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Strategie"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Podsumowanie zawiera"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Dostawcy"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Czas i wydatki"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "VIP"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "Oczekujące"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "zawiera"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "jest"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "nie jest"
 
@@ -5676,7 +5473,8 @@ msgstr "Nieobsługiwana metoda podczas otwierania kalendarza"
 msgid "Permission denied to open the calendar"
 msgstr "Brak uprawnień do otwarcia kalendarza"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433
+#: ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -5713,17 +5511,17 @@ msgid "Mes_sage:"
 msgstr "_Wiadomość:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Odtwórz dźwięk"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Przypomnienie"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Uruchom program"
 
@@ -5736,7 +5534,7 @@ msgid "Send To:"
 msgstr "Adresat:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Wysłanie wiadomości"
 
@@ -5801,25 +5599,57 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Przypomnienia"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerowanie automatycznego wyświetlenia załącznika"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153
+#: ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684
+#: ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438
+#: ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305
+#: ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Brak"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendarze dla których będą uruchamiane alarmy"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "_Pokaż pole w widoku"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5833,60 +5663,57 @@ msgstr ""
 "10 minut\n"
 "05 minut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u oraz %d zostaną zastąpione przez użytkownika i domenę z adresu e-mail."
-"</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u oraz %d zostaną zastąpione przez użytkownika i domenę z adresu e-mail.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmy</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Domyślny serwer zajętości</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Główne</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Lista zadań</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Czas</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Tydzień roboczy</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Korekta dla czasu _zimowego"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "_Koniec dnia:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Wyświetlanie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Piątek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5896,13 +5723,13 @@ msgstr ""
 "Godziny\n"
 "Dni"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5920,242 +5747,247 @@ msgstr ""
 "Sobota\n"
 "Niedziela"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Wybór koloru"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_Nie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Adresat:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Przypomnienia z wybranych kalendarzy"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "_Przypomnienie na"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr "Zadania na _dziś:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "_Czw"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "Szablon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Strefa czasowa:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Środa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Środa"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "Początek _tygodnia:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "Dni robocze:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "Potw_ierdzanie przed usunięciem elementów"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekendów na widoku miesięcznym"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "Początek _dnia:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "_Pią"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zakończonych zadań po"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "P_on"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr "Z_aległe zadania:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "_Sob"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr "Pokaż _czasy zakończenia spotkań w widoku tygodniowym i miesięcznym"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "_Przedziały czasu:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "_Wto"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "Ś_ro"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "przed każdym spotkaniem"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "S_kopiuj zawartość kalendarza do pracy w trybie offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Skopiuj listę _zadań dla trybu offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Skopiuj listę _notatek dla trybu offline"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "K_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Lista zadań"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Lista notatek"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Właściwości kalendarza"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Nowy kalendarz"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Właściwości listy zadań"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Nowa lista zadań"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Właściwości listy notatek"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Nowa lista notatek"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Zdarzenie zostało usunięte."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Zadanie zostało usunięte."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Notatka została usunięta."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i zamknąć edytor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, zamknąć edytor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Zdarzenie zostało zmienione."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Zadanie zostało zmienione."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Notatka została zmieniona."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
@@ -6165,35 +5997,41 @@ msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 msgid "Validation error: %s"
 msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
+#: ../calendar/gui/dialogs/comp-editor-util.c:186
+#: ../calendar/gui/print.c:2355
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:190
+#: ../calendar/gui/print.c:2359
 msgid " (Completed "
 msgstr " (Zakończone "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
+#: ../calendar/gui/dialogs/comp-editor-util.c:192
+#: ../calendar/gui/print.c:2361
 msgid "Completed "
 msgstr "Zakończone"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:197
+#: ../calendar/gui/print.c:2366
 msgid " (Due "
 msgstr " (Należne "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:199
+#: ../calendar/gui/print.c:2368
 msgid "Due "
 msgstr "Należne "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Załączona wiadomość - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417
+#: ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6201,211 +6039,228 @@ msgstr[0] "Załączona wiadomość"
 msgstr[1] "Załączone %d wiadomości"
 msgstr[2] "Załączonych %d wiadomości"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:488
+#: ../composer/e-msg-composer.c:2052
+#: ../mail/em-folder-tree.c:1006
+#: ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1183
+#: ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490
+#: ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008
+#: ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Anuluj p_rzeciąganie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3300
+#: ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "załącznik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:937
 msgid "Edit Appointment"
 msgstr "Modyfikacja spotkania"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Meeting - %s"
 msgstr "Zebranie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "Spotkanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Przypisane zadanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:954
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Memo - %s"
 msgstr "Notatka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "No Summary"
 msgstr "Bez podsumowania"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1116
+msgid "Keep original item?"
+msgstr "Czy zachować element oryginalny?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to close the current window"
 msgstr "Zamyka bieżące okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiuje zaznaczony tekst do schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Cut selected text to the clipboard"
 msgstr "Wycina zaznaczony tekst do schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1332
 msgid "Click here to view help available"
 msgstr "Wyświetla dostępną pomoc"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "Paste text from the clipboard"
 msgstr "Wkleja tekst ze schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "Click here to save the current window"
 msgstr "Zapisuje bieżące okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1367
 msgid "Select all text"
 msgstr "Zaznacza cały tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1374
 msgid "_Classification"
 msgstr "_Klasyfikacja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1388
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Plik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Insert"
 msgstr "W_staw"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Options"
 msgstr "_Opcje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../calendar/gui/dialogs/comp-editor.c:1416
+#: ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Widok"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Załącznik..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "Click here to attach a file"
 msgstr "Wybór załącznika"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Categories"
 msgstr "_Kategorie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether to display categories"
 msgstr "Przełącza wyświetlanie kategorii"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Time _Zone"
 msgstr "Strefa c_zasowa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the time zone is displayed"
 msgstr "Przełącza wyświetlanie pola strefa czasowa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Classify as public"
 msgstr "Określ jako publiczne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1462
 msgid "_Private"
 msgstr "_Prywatny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1464
 msgid "Classify as private"
 msgstr "Określ jako prywatne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "_Confidential"
 msgstr "P_oufny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "Classify as confidential"
 msgstr "Oznacz jako poufne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1479
 msgid "R_ole Field"
 msgstr "Pole R_ola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1481
 msgid "Toggles whether the Role field is displayed"
 msgstr "Przełącza wyświetlanie pola rola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1487
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1489
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Przełącza wyświetlanie pola RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1495
 msgid "_Status Field"
 msgstr "_Stan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1497
 msgid "Toggles whether the Status field is displayed"
 msgstr "Przełącza wyświetlanie pola statusu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1503
 msgid "_Type Field"
 msgstr "_Typ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1505
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Przełącza wyświetlanie pola typ uczestnika"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../composer/e-composer-private.c:64
+#: ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Ostatnio używane _dokumenty"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Załącz"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1933
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6413,48 +6268,47 @@ msgstr[0] "<b>%d</b> załącznik"
 msgstr[1] "<b>%d</b> załączniki"
 msgstr[2] "<b>%d</b> załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1965
 msgid "Hide Attachment _Bar"
 msgstr "_Ukryj pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1968
+#: ../calendar/gui/dialogs/comp-editor.c:2271
 msgid "Show Attachment _Bar"
 msgstr "_Pokaż pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Dod_aj załącznik..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Pokaż załączniki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 msgid "Press space key to toggle attachment bar"
 msgstr "Klawisz spacji przełącza pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2439
+#: ../calendar/gui/dialogs/comp-editor.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:3333
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Zmiany dokonane w tym elemencie mogą zostać porzucone, jeśli nadejdzie "
-"aktualizacja"
+msgstr "Zmiany dokonane w tym elemencie mogą zostać porzucone, jeśli nadejdzie aktualizacja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3362
 msgid "Unable to use current version!"
 msgstr "Nie można użyć bieżącej wersji!"
 
@@ -6470,55 +6324,55 @@ msgstr "Nie można otworzyć celu"
 msgid "Destination is read only"
 msgstr "Cel jest tylko do odczytu"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Usunąć ten element ze wszystkoch innych skrzynek odbiorcy?"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu mechanizmu CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Nie można usunąć zadania na skutek błędu mechanizmu CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Nie można usunąć notatki na skutek błędu mechanizmu CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Nie można usunąć elementu na skutek błędu mechanizmu CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Nie można usunąć zdarzenia na skutek braku uprawnień"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Nie można usunąć zadania na skutek braku uprawnień"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Nie można usunąć notatki na skutek braku uprawnień"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Nie można usunąć elementu na skutek braku uprawnień"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Nie można usunąć zadania na skutek błędu"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Nie można usunąć notatki z powodu błędu"
 
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Nie można usunąć elementu na skutek błędu"
 
@@ -6535,142 +6389,143 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Przypomnienia"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Ustawia przypomnienia dla tego zdarzenia"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "_Powtarzanie"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Oznacz jako zdzrzenie powtarzalne"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opcje wysyłania"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Zaawansowane opcje wysyłania"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Zdarzenie _całodniowe"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Przełącza dostępność pola zdarzenie całodniowe"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Wyświetlanie czasu jako zaję_ty"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Przełącza pokazywanie jako zajętego"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Wolny/Zajęty"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Sprawdź status wolny / zajęcty dla uczestników."
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "_Spotkanie"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "To zdarzenie zawiera przypomnienia"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Organiza_tor:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "_Delegaci"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "_Uczestnicy"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Zdarzenie bez daty rozpoczęcia"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Zdarzenie bez daty zakończenia"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Data końcowa jest niepoprawna"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Czas początkowy jest niepoprawny"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Czas końcowy jest niepoprawny"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "Wybrany organizator nie posiada już konta."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Dodaj"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nie można otworzyć kalendarza \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Działanie w imieniu %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6678,7 +6533,7 @@ msgstr[0] "dzień przed spotkaniem"
 msgstr[1] "%d dni przed spotkaniem"
 msgstr[2] "%d dni przed spotkaniem"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6686,7 +6541,7 @@ msgstr[0] "godzinę przed spotkaniem"
 msgstr[1] "%d godziny przed spotkaniem"
 msgstr[2] "%d godzin przed spotkaniem"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6694,28 +6549,10 @@ msgstr[0] "minutę przed spotkaniem"
 msgstr[1] "%d minuty przed spotkaniem"
 msgstr[2] "%d minut przed spotkaniem"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "Dostosuj"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Brak"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "dzień przed spotkaniem"
@@ -6791,19 +6628,24 @@ msgstr "Ko_ntakty..."
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111
+#: ../calendar/gui/print.c:2475
 msgid "Memo"
 msgstr "Notatka"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nie można otworzyć notatek w '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620
+#: ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77
+#: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Do"
 
@@ -6817,60 +6659,62 @@ msgid "T_o:"
 msgstr "_Do:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Modyfikowane jest zdarzenie okresowe. Co zmodyfikować?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegowane jest zdarzenie okresowe. Co delegować?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Modyfikowane jest zadanie okresowe. Co zmodyfikować?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Modyfikowana jest notatka okresowa. Co zmodyfikować?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Tylko tę instancję"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Tę i wcześniejsze instancje"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Tę i przyszłe instancje"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Wszystkie instancje"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Spotkanie zawiera powtórzenia, których nie można zmieniać za pomocą "
-"Evolution."
+msgstr "Spotkanie zawiera powtórzenia, których nie można zmieniać za pomocą Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Okresowa data jest niepoprawna"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "w"
 
@@ -6878,7 +6722,7 @@ msgstr "w"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "pierwszy"
 
@@ -6887,7 +6731,7 @@ msgstr "pierwszy"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "drugi"
 
@@ -6895,7 +6739,7 @@ msgstr "drugi"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "trzeci"
 
@@ -6903,7 +6747,7 @@ msgstr "trzeci"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "czwarty"
 
@@ -6911,13 +6755,13 @@ msgstr "czwarty"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "ostatni"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Inna data"
 
@@ -6925,7 +6769,7 @@ msgstr "Inna data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1. do 10."
 
@@ -6933,7 +6777,7 @@ msgstr "1. do 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11. do 20."
 
@@ -6941,45 +6785,45 @@ msgstr "11. do 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21. do 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "dzień"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "w"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "wystąpień"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Dodaj wyjątek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Nie można pobrać zaznaczenia do modyfikacji."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Modyfikuj wyjątek"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Nie można pobrać zaznaczenia do usunięcia."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Data/Czas"
 
@@ -7051,55 +6895,64 @@ msgstr "<span weight=\"bold\">Stan</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:247
 #: ../calendar/gui/e-cal-model-tasks.c:362
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:652
+#: ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2551
+#: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Zakończone"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Wysoki"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:244
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
+#: ../calendar/gui/e-calendar-table.c:651
+#: ../calendar/gui/print.c:2548
 msgid "In Progress"
 msgstr "W trakcie"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Niski"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:985
+#: ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Zwykły"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-calendar-table.c:650
+#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nierozpoczęte"
 
@@ -7112,7 +6965,8 @@ msgid "Stat_us:"
 msgstr "_Stan:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580
+#: ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
@@ -7138,28 +6992,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "Zmień / pokaż szczegóły stanu zadania"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Opcje _wysyłania"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Szczegóły zadania"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie można otworzyć zadań w \"%s\"."
@@ -7181,7 +7035,7 @@ msgid "Time zone:"
 msgstr "Strefa czasowa:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7190,7 +7044,7 @@ msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -7198,116 +7052,119 @@ msgstr[0] "%d tydzień"
 msgstr[1] "%d tygodnie"
 msgstr[2] "%d tygodni"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Wykonanie nieznanej czynności"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s przed początkiem spotkania"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po początku spotkania"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na początku spotkania"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s przed końcem spotkania"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po końcu spotkania"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na końcu spotkania"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67
+#: ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknij, aby otworzyć %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171
+#: ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Data rozpoczęcia:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Witryna WWW:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Podsumowanie:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Czas zakończenia:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stan:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Priorytet:"
 
@@ -7321,13 +7178,13 @@ msgid "Start Date"
 msgstr "Data rozpoczęcia"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Wolny"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:619
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Zajęty"
 
@@ -7341,32 +7198,41 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029
+#: ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Tak"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029
+#: ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nie"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:350
+#: ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123
+#: ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198
+#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001
+#: ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2138
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7381,27 +7247,35 @@ msgstr "Powtarzanie"
 msgid "Assigned"
 msgstr "Przyporządkowano"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184
+#: ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
+#: ../calendar/gui/e-cal-popup.c:200
+#: ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Katalog zapisu wybranych załączników..."
 
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232
+#: ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nienazwany_obraz.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1747
+#: ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333
+#: ../mail/em-popup.c:559
+#: ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287
+#: ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Ustaw jako _tło"
 
@@ -7409,7 +7283,8 @@ msgstr "Ustaw jako _tło"
 msgid "_Save Selected"
 msgstr "_Zapisz wybrane"
 
-#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430
+#: ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
@@ -7420,7 +7295,7 @@ msgstr "* Bez podsumowania*"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2214
+#: ../calendar/gui/e-calendar-view.c:2368
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -7428,7 +7303,7 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2218
+#: ../calendar/gui/e-calendar-view.c:2372
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
@@ -7441,125 +7316,138 @@ msgstr "Rozpoczęcie: "
 msgid "Due: "
 msgstr "Termin: "
 
-#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:878
-#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:670
+#: ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:835
+#: ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Aktualizowanie obiektów"
 
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1296
+#: ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: ../calendar/gui/e-calendar-table.c:1570
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "New _Task"
 msgstr "Nowe _zadanie"
 
-#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "_Otwórz stronę WWW"
 
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1732
+#: ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Wy_drukuj..."
 
-#: ../calendar/gui/e-calendar-table.c:1580
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1752
+#: ../calendar/gui/e-memo-table.c:930
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1659
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1735
+#: ../calendar/gui/e-calendar-view.c:1754
+#: ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57
+#: ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "P_rzypisz zadanie"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Prześlij w formacie i_Calendar"
 
-#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "Zakończ_ona"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zakończone"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "_Oznacz jako niekompletne"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Oznacz zadania jako niekompletne"
 
-#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "_Usuń zaznaczone zadania"
 
-#: ../calendar/gui/e-calendar-table.c:1833
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknij, aby dodać zadanie"
@@ -7582,7 +7470,7 @@ msgid "Due date"
 msgstr "Data wykonania"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:20
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Priorytet"
@@ -7591,108 +7479,163 @@ msgstr "Priorytet"
 msgid "Start date"
 msgstr "Data rozpoczęcia"
 
-#: ../calendar/gui/e-calendar-view.c:1339
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stan"
+
+#: ../calendar/gui/e-calendar-view.c:1415
 msgid "Moving items"
 msgstr "Przenoszenie elementów"
 
-#: ../calendar/gui/e-calendar-view.c:1341
+#: ../calendar/gui/e-calendar-view.c:1417
 msgid "Copying items"
 msgstr "Kopiowanie elementów"
 
-#: ../calendar/gui/e-calendar-view.c:1650
+#: ../calendar/gui/e-calendar-view.c:1726
 msgid "New _Appointment..."
 msgstr "Nowe _spotkanie..."
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1727
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "New _Meeting"
 msgstr "Nowe ze_branie"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1739
 msgid "_Current View"
 msgstr "_Bieżący widok"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1741
 msgid "Select T_oday"
 msgstr "_Dzisiejszy dzień"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1742
 msgid "_Select Date..."
 msgstr "_Wybierz datę..."
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1748
 msgid "Pri_nt..."
 msgstr "Wydr_ukuj..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "Cop_y to Calendar..."
 msgstr "S_kopiuj do kalendarza..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1759
 msgid "Mo_ve to Calendar..."
 msgstr "P_rzenieś do kalendarza..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1760
 msgid "_Delegate Meeting..."
 msgstr "_Deleguj zebranie..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1761
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj zebranie..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1762
 msgid "_Forward as iCalendar..."
 msgstr "_Przekaż jako iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1763
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564
+#: ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1769
 msgid "Make this Occurrence _Movable"
 msgstr "Uczyń to wystąpienie p_rzenośnym"
 
-#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1770
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
+#: ../calendar/gui/e-calendar-view.c:2223
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2126
+msgid "Accepted"
+msgstr "Zaakceptowane"
+
+#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2132
+msgid "Declined"
+msgstr "Odrzucone"
+
+#: ../calendar/gui/e-calendar-view.c:2225
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Próbne"
+
+#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2135
+msgid "Delegated"
+msgstr "Oddelegowane"
+
+#: ../calendar/gui/e-calendar-view.c:2227
+#, fuzzy
+msgid "Needs action"
+msgstr "Wymaga działania"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2388
+#: ../calendar/gui/print.c:2507
 #, c-format
 msgid "Location: %s"
 msgstr "Miejsce: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2422
 #, c-format
 msgid "Time: %s %s"
 msgstr "Czas: %s %s "
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7705,39 +7648,48 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutowe przedziały czasu"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Wyświetlanie panelu \"Podgląd\""
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1566
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+#: ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:1561
+#: ../calendar/gui/e-week-view-main-item.c:326
+#: ../calendar/gui/print.c:1671
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:801
+#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:804
+#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Tak (powtarzalność złożona)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7745,7 +7697,7 @@ msgstr[0] "Codziennie"
 msgstr[1] "Co %d dni"
 msgstr[2] "Co %d dni"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7753,7 +7705,7 @@ msgstr[0] "Co tydzień"
 msgstr[1] "Co %d tygodnie"
 msgstr[2] "Co %d tygodni"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7762,21 +7714,21 @@ msgstr[1] "Co %d tygodnie w "
 msgstr[2] "Co %d tygodni w "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " i "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dzień "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7784,7 +7736,7 @@ msgstr[0] "co miesiąc"
 msgstr[1] "co %d miesiące"
 msgstr[2] "co %d miesięcy"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7792,45 +7744,48 @@ msgstr[0] "Co roku"
 msgstr[1] "Co %d lata"
 msgstr[2] "Co %d lat"
 
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
+#: ../calendar/gui/e-itip-control.c:869
+#, fuzzy, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "łącznie %d raz"
 msgstr[1] "łącznie %d razy"
 msgstr[2] "łącznie %d razy"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", kończąc dnia "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Rozpoczęcie"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Zakończenie"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Wykonanie"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998
+#: ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "Błąd iKalendarza"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1087
+#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114
+#: ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/itip-formatter/itip-view.c:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7841,301 +7796,282 @@ msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Proszę przejrzeć wyświetlone informacje, a następnie wybrać czynność z "
-"poniższego menu."
+#: ../calendar/gui/e-itip-control.c:1138
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Proszę przejrzeć wyświetlone informacje, a następnie wybrać czynność z poniższego menu."
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "Zaakceptowane"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2129
 msgid "Tentatively Accepted"
 msgstr "Wstępnie zaakceptowane"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "Odrzucone"
-
-#: ../calendar/gui/e-itip-control.c:1283
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr ""
-"Zebranie zostało odwołane, jednak nie można go było odnaleźć w kalendarzach"
+#: ../calendar/gui/e-itip-control.c:1278
+msgid "The meeting has been canceled, however it could not be found in your calendars"
+msgstr "Zebranie zostało odwołane, jednak nie można go było odnaleźć w kalendarzach"
 
-#: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Zadanie zostało odwołane, jednak nie można go było odnaleźć w listach zadań"
+#: ../calendar/gui/e-itip-control.c:1280
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Zadanie zostało odwołane, jednak nie można go było odnaleźć w listach zadań"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Informacja o zebraniu opublikowana przez <b>%s</b>."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Informacje o zebraniu"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zwraca się o obecność osoby %s na zebraniu."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zwraca się o twoją obecność na zebraniu."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Propozycja zebrania"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> chce dołączyć do istniejącego zebrania."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Aktualizacja zebrania"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzymać najświeższe informacje o zebraniu."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Żądanie aktualizacji zebrania"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpowiedział na zwrócenie się o zebranie."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Odpowiedź na zebranie"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> anulował zebranie."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Anulowanie zebrania"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wysłał niezrozumiałą wiadomość."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomość o zebraniu"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Informacja o zadaniu opublikowana przez <b>%s</b>."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> zwraca się do osoby %s o wykonanie przez zadania."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zwraca się o wykonanie przez ciebie zadania."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> chce być dodany do istniejącego zadania."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzymać  najświeższe informacje o zadaniu."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Zwrócenie się o aktualizację zadania"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpowiedział na przypisanie zadania."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Odpowiedź na zadanie"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> anulował zadanie."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Anulowanie zadania"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomość o zadaniu"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Informacja o zajętości opublikowana przez <b>%s</b>."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Informacja o zajętości"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zwraca się o informację o zajętości."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Zwrócenie się o informację o zajętości"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpowiedział na zwrócenie się o informację o zajętości."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Odpowiedź z informacją o zajętości"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomość o zajętości"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "Forma wiadomości jest niepoprawna"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobsługiwane żądania."
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Załącznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Załącznik nie zawiera dających się wyświetlić elementów kalendarza"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Obiekt jest niepoprawny i nie można go zaktualizować\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako "
-"uczestnika?"
+msgstr "Odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako uczestnika?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy!\n"
+msgstr "Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Nie można uaktualnić stanu uczestnika, ponieważ element już nie istnieje"
+msgstr "Nie można uaktualnić stanu uczestnika, ponieważ element już nie istnieje"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112
+#: ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Wybór czynności:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Próbna akceptacja"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Wysłanie informacji o zajętości"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Wysłanie najświeższej informacji"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../calendar/gui/e-itip-control.c:2465
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
@@ -8164,112 +8100,106 @@ msgstr "Wczytywanie kalendarza..."
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Osoby przewodniczące"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Zasoby"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Uczestnicy"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739
+#: ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Osoba"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Zasób"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Prowadzący"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742
+#: ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1002
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1003
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Wymaga działania"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
-msgid "Tentative"
-msgstr "Próbne"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "Oddelegowane"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Uczestnik                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182
+#: ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "W toku"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2120
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -8278,7 +8208,7 @@ msgstr "%A, %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2151
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -8288,67 +8218,67 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "_Uczestnicy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "_Opcje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Wyświetlanie _tylko godzin roboczych"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Wyświetlanie w pomniejs_zeniu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Uaktualnij informację o zajętości"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Automatyczny wybór"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Wszyscy _ludzie i jeden zasób"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "Wy_magani ludzie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Wymagani ludzie i j_eden zasób"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "Cza_s rozpoczęcia:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "_Czas zakończenia:"
 
@@ -8380,12 +8310,13 @@ msgstr "Członek"
 msgid "_Delete Selected Memos"
 msgstr "_Usuń zaznaczone notatki"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Kliknij, aby dodać notatkę"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
+#: ../calendar/gui/e-memos.c:760
+#: ../calendar/gui/e-tasks.c:910
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8403,7 +8334,8 @@ msgstr "Wczytywanie notatek"
 msgid "Opening memos at %s"
 msgstr "Otwieranie notatek z %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1062
+#: ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
@@ -8424,52 +8356,53 @@ msgstr "Wykańczanie zadań..."
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Stref czasowa"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
+#: ../calendar/gui/e-week-view-main-item.c:343
+#: ../calendar/gui/print.c:1652
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2621
 msgid "_Custom View"
 msgstr "_Własny widok"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2622
 msgid "_Save Custom View"
 msgstr "_Zapisz własny widok"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2627
 msgid "_Define Views..."
 msgstr "Z_definiuj widoki..."
 
 # FIXME - upewnić się tego "at"
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2869
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Wczytywanie spotkań z %s"
 
 # FIXME - upewnić się tego "at"
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2884
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Wczytywanie zadań z %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2893
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Wczytywanie notatek z %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:2998
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3966
 msgid "Purging"
 msgstr "Czyszczenie"
 
@@ -8529,7 +8462,8 @@ msgstr "Wrzesień"
 msgid "_Select Today"
 msgstr "Dzi_siaj"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:404
+#: ../calendar/gui/itip-utils.c:456
 #: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Należy podać organizatora."
@@ -8538,19 +8472,23 @@ msgstr "Należy podać organizatora."
 msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626
+#: ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Informacja o spotkaniu"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628
+#: ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "Informacja o zadaniu"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "Informacja w notatce"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "Informacja o zajętości"
 
@@ -8558,36 +8496,24 @@ msgstr "Informacja o zajętości"
 msgid "Calendar information"
 msgstr "Informacja kalendarza"
 
-#: ../calendar/gui/itip-utils.c:683
-msgid "Updated"
-msgstr "Aktualizacja"
-
-#: ../calendar/gui/itip-utils.c:691
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: ../calendar/gui/itip-utils.c:695
-msgid "Counter-proposal"
-msgstr "Kontrpropozycja"
-
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informacja o zajętości (od %s do %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "Informacja w formacie iCalendar"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "Musisz należeć do uczestników zdarzenia."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "_Nowa lista notatek"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8595,7 +8521,8 @@ msgstr[0] "%d notatka"
 msgstr[1] "%d notatki"
 msgstr[2] "%d notatek"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584
+#: ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8603,97 +8530,75 @@ msgstr[0] ", %d zaznaczone"
 msgstr[1] ", %d zaznaczone"
 msgstr[2] ", %d zaznaczonych"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "Nie można zaktualizować notatek."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Nie można otworzyć listy notatek '%s' w celu utworzenia zdarzeń i zebrań"
+msgstr "Nie można otworzyć listy notatek '%s' w celu utworzenia zdarzeń i zebrań"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "Brak dostępnego kalendarza do utworzenia notatek"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "Wybór źródła notek"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "Nowa notatka"
 
-#: ../calendar/gui/memos-component.c:1261
-msgctxt "New"
-msgid "Mem_o"
-msgstr "N_otatkę"
-
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "Tworzy nową notatkę"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "Nowa współdzielona notatka"
 
-#: ../calendar/gui/memos-component.c:1269
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "Notatkę _współdzieloną"
-
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "Tworzy nową współdzieloną notatkę"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "Nowa lista notatek"
 
-#: ../calendar/gui/memos-component.c:1277
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Listę n_otatek"
-
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "Tworzy nową listę notatek"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Drukuj notatki"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Następne 7 dni"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Położenie i hierarchia katalogów zadań Evolution uległy zmianie od wersji 1."
-"x.\n"
+"Położenie i hierarchia katalogów zadań Evolution uległy zmianie od wersji 1.x.\n"
 "\n"
 "Proszę czkać. Trwa migracja katalogów..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Położenie i hierarchia katalogów kalendarzy Evolution uległy zmianie od "
-"wersji 1.x.\n"
+"Położenie i hierarchia katalogów kalendarzy Evolution uległy zmianie od wersji 1.x.\n"
 "\n"
 "Proszę czkać. Trwa migracja katalogów..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:775
+#: ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nie można zmigrować starych ustawień z evolution/config.xmldb"
@@ -8717,210 +8622,210 @@ msgstr "Nie można zmigrować zadań w \"%s\""
 msgid "Notes"
 msgstr "Notatki"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:523
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "Ni"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Wt"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Śr"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Cz"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Pt"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "So"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2471
 msgid "Appointment"
 msgstr "Spotkanie"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2473
 msgid "Task"
 msgstr "Zadanie"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2498
 #, c-format
 msgid "Summary: %s"
 msgstr "Podsumowanie: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2521
 msgid "Attendees: "
 msgstr "Uczestnicy:"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2561
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2590
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zakończenia: %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2602
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2626
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "_Nowa lista zadań"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8928,81 +8833,64 @@ msgstr[0] "%d zadanie"
 msgstr[1] "%d zadania"
 msgstr[2] "%d zadań"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "Nie można zaktualizować zadań."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Nie można otworzyć listy zadań \"%s\" w celu utworzenia zdarzeń i zebran"
+msgstr "Nie można otworzyć listy zadań \"%s\" w celu utworzenia zdarzeń i zebran"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "Wybór źródła zadania"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: ../calendar/gui/tasks-component.c:1326
-msgctxt "New"
-msgid "_Task"
-msgstr "_Zadanie"
-
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "Nowe przypisane zadanie"
 
-#: ../calendar/gui/tasks-component.c:1334
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Przypisane za_danie"
-
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "Tworzy nowe przypisane zadanie"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "Nowa lista zadań"
 
-#: ../calendar/gui/tasks-component.c:1342
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Lis_tę zadań"
-
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "Tworzy nową listę zadań"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"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 ""
-"Wykonanie tej operacji spowoduje trwałe usunięcie wszystkich zadań "
-"oznaczonych jako zakończone. W przypadku kontynuowania operacji późniejsze "
-"odzyskanie zadań nie będzie możliwe.\n"
+"Wykonanie tej operacji spowoduje trwałe usunięcie wszystkich zadań oznaczonych jako zakończone. W przypadku kontynuowania operacji późniejsze odzyskanie zadań nie będzie możliwe.\n"
 "\n"
 "Czy rzeczywiście usunąć te zadania?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445
+#: ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przyszłości."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Wydruku zadań"
 
@@ -9011,57 +8899,59 @@ msgstr "Wydruku zadań"
 msgid "% Completed"
 msgstr "% ukończenia"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr " Anulowano"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "W trakcie"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "jest większy niż"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "jest mniejszy niż"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Spotkania i zebrania"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 msgid "Opening calendar"
 msgstr "Otwieranie kalendarza"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "Pliki iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Asystent importu plików iCalendar dla Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Przypomnienie!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "Pliki vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Asystent importu plików vCalendar dla Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Zdarzenia kalendarza"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentny asystent importu kalendarza Evolution"
 
@@ -10617,249 +10507,258 @@ msgstr "Pacyfik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacyfik/Yap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Nie można otworzyć pliku autozapisu"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Nie można pobrać wiadomości z edytora"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Wstaw załącznik"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "Z_ałącz"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Wiadomość bez tytułu"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Załączenie pliku"
 
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476
+#: ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Zamyka bieżący plik"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../composer/e-composer-actions.c:483
+#: ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58
+#: ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:490
+#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Podgląd wyd_ruku"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Zapisuje bieżący plik"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bieżący plik pod inną nazwą"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Zapisz _szkic"
+#: ../composer/e-composer-actions.c:511
+#, fuzzy
+msgid "Save as _Draft"
+msgstr "Zapisz jako szkic"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Zapisz jako szkic"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "_Wyślij"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Wysyła wiadomość"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Wstaw opcje wysyłania"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Nowa _wiadomość"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Otwórz okno nowej wiadomości"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "_Kodowanie znaków"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Bezpieczeństwo"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "_Szyfrowanie PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Szyfruje wiadomość przy użyciu PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "_Podpis PGP"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Podpisuje wiadomość za pomocą klucza PGP"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Określ priorytet"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Ustawia priorytet wiadomości na wysoki"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "_Zażądaj potwierdzenia przeczytania"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Zażądaj potwierdzenia przeczytania wiadomości"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S_zyfrowanie S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Szyfruje wiadomość za pomocą certyfikatu szyfrującego S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "P_odpis S/MIME"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpisuje wiadomość za pomocą certyfikatu podpisującego S/MIME"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Przełącza wyświetlanie pola BCC"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Przełącza wyświetlanie pola CC"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Przełącza wyświetlanie listy wyboru w polu Od"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "Pole _Wyślij do"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Przełącza wyświetlanie pola Wyślij do (Post-To)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Pole Odpowiedź _do"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Przełącza wyświetlanie pola Odpowiedź do (Reply-To)"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Pole _tematu"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Przełącza wyświetlanie pola tematu"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "Pole _Do"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Przełącza wyświetlanie pola Do"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#, fuzzy
+msgid "Save Draft"
+msgstr "Zapisz _szkic"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Proszę podać adres odbiorcy wiadomości"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Proszę podać adresy, pod które zostanie przesłana kopia wiadomości"
 
-#: ../composer/e-composer-header-table.c:71
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"Proszę podać adresy, które nie mają się pojawić w liście odbiorców, a pod "
-"które zostanie przesłana kopia wiadomości "
+#: ../composer/e-composer-header-table.c:69
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Proszę podać adresy, które nie mają się pojawić w liście odbiorców, a pod które zostanie przesłana kopia wiadomości "
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "_Od:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "Odpo_wiedź do:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Do:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Wyślij do:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "_Temat:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Podp_is:"
 
@@ -10879,27 +10778,23 @@ msgstr "Katalogi do których będzie wysłana wiadomość."
 msgid "Click here to select folders to post to"
 msgstr "Kliknięcie pozwala wybrać katalogi docelowe wysyłki"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:179
+#: ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "_Pokaż pasek załączników"
 
-#: ../composer/e-msg-composer.c:870
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"podpisującego dla tego konta"
+#: ../composer/e-msg-composer.c:866
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu podpisującego dla tego konta"
 
-#: ../composer/e-msg-composer.c:877
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"szyfrującego dla tego konta"
+#: ../composer/e-msg-composer.c:873
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu szyfrującego dla tego konta"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494
+#: ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596
+#: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10907,59 +10802,42 @@ msgstr[0] "Załączniki"
 msgstr[1] "Załącznik"
 msgstr[2] "Załączników"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "_Ukryj pasek załączników"
 
-#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1567
+#: ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Tworzenie wiadomości"
 
-#: ../composer/e-msg-composer.c:4053
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(Edytor wiadomości zawiera treść nie będącą tekstem, która nie może "
-"podlegać modyfikacjom.)</b>"
+#: ../composer/e-msg-composer.c:4093
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(Edytor wiadomości zawiera treść nie będącą tekstem, która nie może podlegać modyfikacjom.)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-"Trwa pobieranie załączników. Wysłanie wiadomości teraz spowoduje, że "
-"pobierane pliki nie będą załączone."
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr "Trwa pobieranie załączników. Wysłanie wiadomości teraz spowoduje, że pobierane pliki nie będą załączone."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Wszystkie konta zostały usunięte."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "Czy na pewno porzucić pisaną właśnie wiadomość o tytule \"{0}\"?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Z powodu &quot;{0}&quot;, może być konieczne użycie innych opcji poczty "
-"ponieważ"
+msgstr "Z powodu &quot;{0}&quot;, może być konieczne użycie innych opcji poczty ponieważ"
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Ponieważ &quot;{1}&quot;"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Zamknięcie okna tworzenia wiadomości spowoduje bezpowrotne porzucenie "
-"wiadomości, chyba że zostanie wybrany zapis wiadomości w katalogu szkiców. "
-"Pozwoli to na późniejsze kontynuowanie pisania wiadomości."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Zamknięcie okna tworzenia wiadomości spowoduje bezpowrotne porzucenie wiadomości, chyba że zostanie wybrany zapis wiadomości w katalogu szkiców. Pozwoli to na późniejsze kontynuowanie pisania wiadomości."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10998,21 +10876,13 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Błąd zapisu do pliku autozapisu z powodu &quot;{1}&quot;"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowej "
-"wiadomości. Odtworzenie wiadomości pozwoli na kontynuację pracy w tym samym "
-"miejscu."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowej wiadomości. Odtworzenie wiadomości pozwoli na kontynuację pracy w tym samym miejscu."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Opcje wysyłania są dostępne tylko dla kont Novell Groupwise oraz Microsoft "
-"Excange."
+#, fuzzy
+msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
+msgstr "Opcje wysyłania są dostępne tylko dla kont Novell Groupwise oraz Microsoft Excange."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11020,29 +10890,21 @@ msgstr "Opcje wysyłania nie są dostępne."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Plik \"{0}\" nie jest zwykłym plikiem i nie może być wysłany w wiadomości."
+msgstr "Plik \"{0}\" nie jest zwykłym plikiem i nie może być wysłany w wiadomości."
 
 #: ../composer/mail-composer.error.xml.h:20
-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 ""
-"Aby załączyć zawartość tego katalogu, należy albo załączyć poszczególne "
-"pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i "
-"załączyć je."
+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 "Aby załączyć zawartość tego katalogu, należy albo załączyć poszczególne pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i załączyć je."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Nie można uaktywnić komponentu edytora HTML.\n"
 "\n"
-"Upewnij się, że w systemie zainstalowane są poprawne wersje pakietów gtkhtml "
-"i libgtkhtml."
+"Upewnij się, że w systemie zainstalowane są poprawne wersje pakietów gtkhtml i libgtkhtml."
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
@@ -11084,7 +10946,8 @@ msgstr "_Zapisz szkic"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution - poczta i kalendarz"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2
+#: ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Pakiet do pracy grupowej"
 
@@ -11100,11 +10963,15 @@ msgstr "karta adresowa"
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Błąd Evolution"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:81
+#: ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Ostrzeżenie Evolution"
 
@@ -11117,23 +10984,84 @@ msgid "Evolution Query"
 msgstr "Zapytanie Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:450
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Błąd wewnętrzny. Żadany błąd '%s'"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponente"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Nazwa komponentu zapisywanego do dziennika"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Dziennik debug"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Wyświetlanie w pasku stanu _błędów dla "
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "sekund(y)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Informacje dziennika:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Poziom zapisu"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Czas"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291
+#: ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Wiadomości"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zamyka bieżące okno"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Błąd"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Błędy"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Ostrzeżenia i błędy"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Debug"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Informacje typu błąd, ostrzeżenie i debug"
+
+#: ../e-util/e-plugin.c:308
+#: ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482
+#: ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Aktywne"
 
@@ -11150,11 +11078,11 @@ msgid "The printing system reported the following details about the error:"
 msgstr "System drukowania zgłosił następujące szczegóły dot. błędu:"
 
 #: ../e-util/e-print.c:173
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "System drukowania nie zgłosił żadnych szczegółów dotyczących błędu."
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Z powodu  \"{1}\"."
 
@@ -11178,70 +11106,74 @@ msgstr "Plik istnieje \"{0}\"."
 msgid "Overwrite file?"
 msgstr "Nadpisać plik?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Nadpisz"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Nie można otworzyć pliku autozapisu"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Nie można wyświetlić pomocy programu Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "_Ważne"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Praca"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Osobiste"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "_Do zrobienia"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "Póź_niej"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_Nazwa etykiety:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Edycja etykiety"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Dodawanie etykiety"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Nazwa oznaczenia nie może być pusta."
 
-#: ../e-util/e-util-labels.c:356
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
+#: ../e-util/e-util-labels.c:362
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "Etykieta z taką nazwą już istnieje na serwerze. Proszę zmienić nazwę."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "Błąd GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Dalsze błędy zostaną wyświetlone w oknie terminalu"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11249,7 +11181,7 @@ msgstr[0] "sekundę temu"
 msgstr[1] "%d sekundy temu"
 msgstr[2] "%d sekund temu"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11257,7 +11189,7 @@ msgstr[0] "1 sekunda w przyszłości"
 msgstr[1] "%d sekundy w przyszłości"
 msgstr[2] "%d sekund w przyszłości"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11265,7 +11197,7 @@ msgstr[0] "minutę temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11273,7 +11205,7 @@ msgstr[0] "1 minuta w przyszłości"
 msgstr[1] "%d minuty w przyszłości"
 msgstr[2] "%d minut w przyszłości"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11281,7 +11213,7 @@ msgstr[0] "godzinę temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11289,7 +11221,7 @@ msgstr[0] "1 godzina w przyszłości"
 msgstr[1] "%d godziny w przyszłości"
 msgstr[2] "%d godzin w przyszłości"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11297,7 +11229,7 @@ msgstr[0] "wczoraj"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11305,7 +11237,7 @@ msgstr[0] "1 dzień w przyszłości"
 msgstr[1] "%d dni w przyszłości"
 msgstr[2] "%d dni w przyszłości"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11313,7 +11245,7 @@ msgstr[0] "tydzień temu"
 msgstr[1] "%d tygodnie temu"
 msgstr[2] "%d tygodni temu"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11321,7 +11253,7 @@ msgstr[0] "1 tydzień w przyszłości"
 msgstr[1] "%d tygodnie w przyszłości"
 msgstr[2] "%d tygodni w przyszłości"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11329,7 +11261,7 @@ msgstr[0] "miesiąc temu"
 msgstr[1] "%d miesiące temu"
 msgstr[2] "%d miesięcy temu"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11337,7 +11269,7 @@ msgstr[0] "1 miesiąc w przyszłości"
 msgstr[1] "%d miesiące w przyszłości"
 msgstr[2] "%d miesięcy w przyszłości"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11345,7 +11277,7 @@ msgstr[0] "rok temu"
 msgstr[1] "%d lata temu"
 msgstr[2] "%d lat temu"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11353,21 +11285,22 @@ msgstr[0] "1 rok w przyszłości"
 msgstr[1] "%d lata w przyszłości"
 msgstr[2] "%d lat w przyszłości"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybrać datę>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291
+#: ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "teraz"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d %b %Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Wybór czasu odniesienia"
 
@@ -11380,57 +11313,63 @@ msgstr "Wybór pliku"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Nazwa _reguły:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Znajdź obiekty spełniające poniższe kryteria"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "_Dodaj regułę filtru"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Dodaj a_kcję"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "przy spełnieniu wszystkich kryteriów"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "przy spełnieniu któregokolwiek z kryteriów"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Znajdź elementy:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Wszystkie powiązane"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Odpowiedzi i nadrzędne"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Bez odpowiedzi lub rodzica"
 
 # FIXME - czy też załącza
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "_Wątki"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Przychodzące"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Wychodzące"
 
@@ -11454,7 +11393,8 @@ msgstr "Brakująca data."
 msgid "Missing file name."
 msgstr "Brakująca nazwa pliku."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Brakująca nazwa."
 
@@ -11531,7 +11471,8 @@ msgstr "w przyszłości"
 msgid "months"
 msgstr "miesięcy"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19
+#: ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "sekund"
 
@@ -11543,10 +11484,12 @@ msgstr "bieżącym czasem"
 msgid "the time you specify"
 msgstr "podanym czasem"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "tygodni"
 
@@ -11554,15 +11497,15 @@ msgstr "tygodni"
 msgid "years"
 msgstr "lat"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Dodawanie reguły"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regułę"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Nazwa reguły"
 
@@ -11571,16 +11514,12 @@ msgid "Composer Preferences"
 msgstr "Edytor wiadomości"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguracja preferencji dotyczących wiadomości, m.in. bezpieczeństwa i "
-"wyświetlania"
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Konfiguracja preferencji dotyczących wiadomości, m.in. bezpieczeństwa i wyświetlania"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora wiadomości"
+msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora wiadomości"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11618,10 +11557,13 @@ msgstr "Kontrola preferencji poczty Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Konfiguracja sieci programu Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:762
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:597
+#: ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Poczta"
@@ -11632,7 +11574,7 @@ msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "Ustawienia poczty"
 
@@ -11662,13 +11604,16 @@ msgstr ""
 "wyświetloną poniżej dla %s\n"
 "i zaznacz pole wyboru aby ją zaakceptować\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465
+#: ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Wybór katalogu"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589
+#: ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701
+#: ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Wygenerowany automatycznie"
 
@@ -11676,11 +11621,13 @@ msgstr "Wygenerowany automatycznie"
 msgid "Ask for each message"
 msgstr "Pytaj dla każdej wiadomości"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809
+#: ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Tożsamość"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858
+#: ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
@@ -11692,34 +11639,41 @@ msgstr "Sprawdzanie _nowych wiadomości co"
 msgid "minu_tes"
 msgstr "minu_t"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Wysyłanie wiadomości"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385
+#: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Domyślne"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451
+#: ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Sprawdzanie nowych wiadomości"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931
+#: ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Asystent dodawania konta Evolution"
 
@@ -11736,24 +11690,27 @@ msgstr "Nazwa konta"
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:303
+#: ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1190
+#: ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Język(i)"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Dodawanie treści podpisu"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1150
+#: ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Przekazywana wiadomość ----------"
 
@@ -11765,12 +11722,8 @@ msgstr "nieznany nadawca"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:2009
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"Dnia ${Year}-${Month}-${Day}, ${AbbrevWeekdayName} o godzinie ${24Hour}:"
-"${Minute} ${TimeZone}, ${Sender} pisze:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "Dnia ${Year}-${Month}-${Day}, ${AbbrevWeekdayName} o godzinie ${24Hour}:${Minute} ${TimeZone}, ${Sender} pisze:"
 
 #: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
@@ -11823,8 +11776,10 @@ msgstr "Data wysłania"
 
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Usuń"
@@ -11873,7 +11828,8 @@ msgstr "Wyrażenie"
 msgid "Follow Up"
 msgstr "Kontynuuj"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Ważne"
 
@@ -11901,7 +11857,8 @@ msgstr "nie jest ustawiony"
 msgid "is set"
 msgstr "jest ustawiony"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Niechciana"
@@ -11910,7 +11867,8 @@ msgstr "Niechciana"
 msgid "Junk Test"
 msgstr "Test spamu"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42
+#: ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etykieta"
 
@@ -11950,48 +11908,56 @@ msgstr "Prześlij do programu"
 msgid "Play Sound"
 msgstr "Odtwórz dźwięk"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Przeczytane"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Lista odbiorców"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Odpowiedziana do"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "zwraca"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "zwraca więcej niż"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "zwraca mniej niż"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Uruchom program"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Punkty"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Nadawca"
 
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "Wyślij potwierdzenie"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Ustaw etykietę"
@@ -12024,11 +11990,14 @@ msgstr "rozpoczyna się od"
 msgid "Stop Processing"
 msgstr "Zatrzymaj przetwarzanie"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-quote.c:342
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Temat"
 
@@ -12045,51 +12014,51 @@ msgstr "Następnie wg"
 msgid "Add Ac_tion"
 msgstr "Dodaj a_kcję"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "_Utwórz katalog z wyszukiwania..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Wszystkie wiadomości"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Bez etykiety"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Przeczytane wiadomości"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Ostatnie wiadomości"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Wiadomości z ostatnich 5 dni"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Wiadomości z załącznikami"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Ważne wiadomości"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Wiadomości pożądane"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Wyszukiwanie w koncie"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Wyszukiwanie we wszystkich kontach"
 
@@ -12121,15 +12090,17 @@ msgid "Quota usage"
 msgstr "Użycie przydziału"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
-#: ../mail/mail-component.c:580
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-properties.c:359
+#: ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597
+#: ../mail/mail-component.c:164
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Właściwości katalogu"
@@ -12147,52 +12118,45 @@ msgid "Folder _name:"
 msgstr "_Nazwa katalogu:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
+#: ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:980
+#: ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Katalogi wyszukiwania"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "NIEPASUJĄCE"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:504
+#: ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Szkice"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:506
+#: ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Szablony"
+
+#: ../mail/em-folder-tree-model.c:512
+#: ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Wychodzące"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:514
+#: ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Wysłane"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536
+#: ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:380
-msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
-
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Drzewo katalogów poczty"
@@ -12207,12 +12171,14 @@ msgstr "Przenoszenie katalogu %s"
 msgid "Copying folder %s"
 msgstr "Kopiowanie katalogu %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909
+#: ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Przenoszenie wiadomości do katalogu %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911
+#: ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiowanie wiadomości do katalogu %s"
@@ -12222,437 +12188,425 @@ msgstr "Kopiowanie wiadomości do katalogu %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można upuścić wiadomości w głównym katalogu"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1003
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do katalogu"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:1004
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "P_rzenieś do katalogu"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie katalogów w \"%s\""
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Nowy katalog..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Przenieś..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Zmień nazwę..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "O_dśwież"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Wyślij wy_chodzące"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Opróżnij śmi_etnik"
 
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Utwórz katalog _wyszukiwania"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiowanie \"%s\" do \"%s\""
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
 #: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Wybór katalogu"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "Sk_opiuj"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Tworzenie katalogu \"%s\""
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Tworzenie katalogu"
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Miejsce utworzenia katalogu:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Usunięcie wiadomości nie powiodło się"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Brak uprawnień do usunięcia tej wiadomości."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328
+#: ../mail/em-popup.c:566
+#: ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Przekaż"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nową wiadomość..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "P_rzenieś do katalogu..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do katalogu..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Oz_nacz jako nieważną"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Ozna_cz jako niechcianą"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Oz_nacz jako ważne"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Oznacz do k_ontynuacji..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_Etykieta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352
+#: ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Brak"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Nowa etykieta"
 
 # FIXME - upewnić się, że tak a nie inaczej :)
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "_Oznacz jako zakończone"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie wiadomości"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Katalog wyszukiwania w oparciu o _temat"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Katalog wyszukiwania w oparciu o _nadawcę"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Katalog wyszukiwania w oparciu o _odbiorców"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Katalog wyszukiwania w oparciu o _listę dyskusyjną"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Filtr na podstawie t_ematu"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Filtr na podstawie n_adawcy"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Filtr na podstawie o_dbiorców"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Filtr na podstawie li_stę dyskusyjnej"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252
+#: ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "Domyślne"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Nie można pobrać wiadomości"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Pobieranie wiadomości..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "Z_adzwoń do..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Utwórz katalog _wyszukiwania"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Z tego adresu"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_Na ten adres"
 
 # FIXME - Nie mam pewności , że to o to idzie
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknij aby wysłać %s"
 
 # FIXME - Nie mam pewności , że to o to idzie
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknij aby zadzwonić do %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknięcie pokazuje/ukrywa adresy"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:471
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Trafienia: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Znaj_dź:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:639
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Poprzedni"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Następny"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "Uwzględnianie _wielkości liter"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Niepodpisana"
 
-#: ../mail/em-format-html-display.c:948
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Wiadomość nie jest podpisana. Nie ma gwarancji, że ta wiadomość jest "
-"autentyczna."
+#: ../mail/em-format-html-display.c:951
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "Wiadomość nie jest podpisana. Nie ma gwarancji, że ta wiadomość jest autentyczna."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Podpis prawidłowy"
 
-#: ../mail/em-format-html-display.c:949
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że jest ona "
-"autentyczna."
+#: ../mail/em-format-html-display.c:952
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że jest ona autentyczna."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Nieprawidłowy podpis"
 
-#: ../mail/em-format-html-display.c:950
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Nie można zweryfikować podpisu wiadomości, mogła być ona naruszona podczas "
-"transmisji."
+#: ../mail/em-format-html-display.c:953
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Nie można zweryfikować podpisu wiadomości, mogła być ona naruszona podczas transmisji."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Poprawny podpis, ale nie można zweryfikować nadawcy"
 
-#: ../mail/em-format-html-display.c:951
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Wiadomość ta jest podpisana poprawnym podpisem, ale jej nadawca nie może być "
-"zweryfikowany."
+#: ../mail/em-format-html-display.c:954
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Wiadomość ta jest podpisana poprawnym podpisem, ale jej nadawca nie może być zweryfikowany."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Sygnatura istnieje, lecz wymaga klucza publicznego"
 
-#: ../mail/em-format-html-display.c:952
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"Wiadomość ta jest podpisana poprawnym podpisem, ale brak odpowiedniego "
-"klucza publicznego."
+#: ../mail/em-format-html-display.c:955
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "Wiadomość ta jest podpisana poprawnym podpisem, ale brak odpowiedniego klucza publicznego."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Niezaszyfrowana"
 
-#: ../mail/em-format-html-display.c:959
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być przechwycona "
-"podczas transmisji przez Internet."
+#: ../mail/em-format-html-display.c:962
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być przechwycona podczas transmisji przez Internet."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Zaszyfrowana, słabo"
 
-#: ../mail/em-format-html-display.c:960
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"Ta wiadomość jest zaszyfrowana słabym algorytmem szyfrującym. Możliwe będzie "
-"jej odszyfowanie przez osoby trzecie w skończonym czasie."
+#: ../mail/em-format-html-display.c:963
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ta wiadomość jest zaszyfrowana słabym algorytmem szyfrującym. Możliwe będzie jej odszyfowanie przez osoby trzecie w skończonym czasie."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Zaszyfrowana"
 
-#: ../mail/em-format-html-display.c:961
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć jej "
-"zawartość."
+#: ../mail/em-format-html-display.c:964
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć jej zawartość."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Zaszyfrowana, silnie"
 
-#: ../mail/em-format-html-display.c:962
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"Ta wiadomość jest zaszyfrowana silnym algorytmem szyfrującym. Odszyfowanie "
-"jej przez osoby trzecie w skończonym czasie jest bardzo trudne."
+#: ../mail/em-format-html-display.c:965
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ta wiadomość jest zaszyfrowana silnym algorytmem szyfrującym. Odszyfowanie jej przez osoby trzecie w skończonym czasie jest bardzo trudne."
 
-#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Tego certyfikatu nie można wyświetlić"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ukończono %d %B %Y, %k:%M"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Zaległe:"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d %B %Y, %k:%M"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Wyświetlenie w treści wiadomości"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Dopasuj szerokość"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Pokaż _pierwotny rozmiar"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Zapis załącznika jako"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Katalog do zapisu wszystkich załączników"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Zapisz zaznaczone..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12660,44 +12614,43 @@ msgstr[0] "%d _załącznik"
 msgstr[1] "%d _załączniki"
 msgstr[2] "%d _załączników"
 
-#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
+#: ../mail/em-format-html-display.c:2297
+#: ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_Zapisz"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Zapisz _wszystkie"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Brak załącznika"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2529
+#: ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Pokaż _niesformatowane"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Ukryj _niesformatowane"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "Ot_wórz z"
 
-#: ../mail/em-format-html-display.c:2479
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Nie można wyświetlić tej wiadomości ponieważ jest ona zbyt duża. Można "
-"wyświetlić ją bez formatowania lub za pomocą zewnętrznego edytora tekstu."
+#: ../mail/em-format-html-display.c:2664
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Nie można wyświetlić tej wiadomości ponieważ jest ona zbyt duża. Można wyświetlić ją bez formatowania lub za pomocą zewnętrznego edytora tekstu."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Pobieranie \"%s\""
@@ -12743,20 +12696,27 @@ msgstr "Formatowanie wiadomości"
 msgid "Formatting Message..."
 msgstr "Formatowanie wiadomości..."
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1563
+#: ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-format-html.c:1744
+#: ../mail/em-format-quote.c:353
 #: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Program pocztowy"
@@ -12774,33 +12734,40 @@ msgstr "(%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Wiadomość została wysłana przez <b>%s</b> w imieniu <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Od"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Odpowiedź do"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/em-format.c:890
+#: ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Grupy dyskusyjne"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format.c:892
+#: ../mail/em-mailer-prefs.c:83
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Obraz"
@@ -12814,16 +12781,14 @@ msgstr "Załącznik: %s"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nie można przetworzyć wiadomości S/MIME: nieznany błąd"
 
-#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
+#: ../mail/em-format.c:1337
+#: ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"Nie można przetworzyć jako wiadomość MIME. Wyświetlanie w postaci źródłowej."
+msgstr "Nie można przetworzyć jako wiadomość MIME. Wyświetlanie w postaci źródłowej."
 
 #: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
-"szyfrowanych"
+msgstr "Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/szyfrowanych"
 
 #: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
@@ -12837,19 +12802,22 @@ msgstr "Nie można przetworzyć wiadomości PGP/MIME: nieznany błąd"
 msgid "Unsupported signature format"
 msgstr "Nieobsługiwany format podpisu"
 
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1520
+#: ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Błąd weryfikacji podpisu"
 
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1520
+#: ../mail/em-format.c:1582
+#: ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Nieznany błąd weryfikacji podpisu"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Nie można przetworzyć wiadomości PGP"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nie można przetworzyć wiadomości PGP: nieznany błąd"
 
@@ -12894,18 +12862,18 @@ msgid "Tag"
 msgstr "Etykieta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1079
+#: ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Wtyczka %s jest dostępna, a plik wykonywalny jest zainstalowany."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1087
+#: ../mail/em-mailer-prefs.c:1142
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"Wtyczka %s jest niedostępna. Proszę sprawdzić czy pakiet jest zainstalowany."
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr "Wtyczka %s jest niedostępna. Proszę sprawdzić czy pakiet jest zainstalowany."
 
 #: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
@@ -12938,125 +12906,118 @@ msgstr "Nie można wyszukać istniejących skrzynek w \"%s\": %s"
 
 #: ../mail/em-migrate.c:1868
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Położenie i hierarchia katalogów skrzynki pocztowej Evolution uległy zmianie "
-"od wersji 1.x.\n"
+"Położenie i hierarchia katalogów skrzynki pocztowej Evolution uległy zmianie od wersji 1.x.\n"
 "\n"
 "Proszę czkać. Trwa migracja katalogów..."
 
 #: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr ""
-"Nie można otworzyć starych danych POP przechowywanych na serwerze \"%s\": %s"
+msgstr "Nie można otworzyć starych danych POP przechowywanych na serwerze \"%s\": %s"
 
 #: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Nie można utworzyć katalogu danych POP3 przechowywanych na serwerze \"%s\": %"
-"s"
+msgstr "Nie można utworzyć katalogu danych POP3 przechowywanych na serwerze \"%s\": %s"
 
 #: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nie można skopiować danych POP3 przechowywanych na serwerze \"%s\": %s"
 
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#: ../mail/em-migrate.c:2583
+#: ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr ""
-"Nie można utworzyć lokalnego miejsca przechowywania wiadomości \"%s\": %s"
+msgstr "Nie można utworzyć lokalnego miejsca przechowywania wiadomości \"%s\": %s"
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
+#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Od wydania wersji 2.24 Evolution format podsumowania katalogu skrzynek "
-"pocztowych  został przeniesiony do sqlite.\n"
+"Od wydania wersji 2.24 Evolution format podsumowania katalogu skrzynek pocztowych  został przeniesiony do sqlite.\n"
 "\n"
 "Proszę czekać. Trwa przenoszenie katalogów..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nie można utworzyć lokalnych katalogów wiadomości \"%s\": %s"
 
-#: ../mail/em-migrate.c:2982
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Nie można odczytac ustawień z poprzedniej instalacji Evolution, plik "
-"\"evolution/config.xmldb\" nie istnieje lub jest uszkodzony."
+#: ../mail/em-migrate.c:3053
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Nie można odczytac ustawień z poprzedniej instalacji Evolution, plik \"evolution/config.xmldb\" nie istnieje lub jest uszkodzony."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625
+#: ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "Dodaj d_o książki adresowej"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Magazyn ten nie obsługuje subskrypcji, lub nie są one aktywne."
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Zasubskrybowane"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Katalog"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:821
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Proszę wybrać serwer."
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Nie pokazuj tego komunikatu w przyszłości."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtry wiadomości"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "wiadomość"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Zapis wiadomości..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Dodanie adresu"
 
 # FIXME - upewnić się co to jest
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Wiadomości od %s"
@@ -13082,17 +13043,14 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Szerokość okna \"Wysyłanie i odbiór wiadomości\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Zezwala na wyświetlanie części tekstu o ograniczonym rozmiarze"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Zawsze żąda potwierdzenia przeczytania"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Czas pokazywania błędu w pasku statusu (w sekundach)."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatyczne rozpoznawanie emotikon"
@@ -13130,32 +13088,20 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kompresja wyświetlanych adresów w polach Do/Kopia/Ukryta kopia"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Kompresja wyświetlanych adresów w polach  Do/Kopia/Ukryta kopia do liczby "
-"określonej w address_count."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Kompresja wyświetlanych adresów w polach  Do/Kopia/Ukryta kopia do liczby określonej w address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Określa jak często lokalne zmiany są synchronizowane ze zdalnym serwerem "
-"pocztowym. Minimalny przedział czasu to 30 sekund."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgstr "Określa jak często lokalne zmiany są synchronizowane ze zdalnym serwerem pocztowym. Minimalny przedział czasu to 30 sekund."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Określa nagłówek do sprawdzania niechcianej poczty."
 
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Określa nagłówek do sprawdzania niechcianej poczty. Format: "
-"nazwa_nagłówka=wartość w gconf."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "Określa nagłówek do sprawdzania niechcianej poczty. Format: nazwa_nagłówka=wartość w gconf."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13210,52 +13156,28 @@ msgid "Default width of the subscribe dialog."
 msgstr "Domyślna szerokość okna subskrypcji."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Określa, czy szukać adresów dla filtrowania wiadomości niechcianych tylko w "
-"lokalnej książce adresowej"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr "Określa, czy szukać adresów dla filtrowania wiadomości niechcianych tylko w lokalnej książce adresowej"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Określa, czy szukać adresu nadawcy w książce adresowej"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Określa, czy szukać adresu nadawcy w książce adresowej. W razie znalezienia "
-"nie będzie określony jako niechciany. Wyszukiwane wykonywane jest w "
-"książkach oznaczonych do autouzupełniania. W przypadku zdalnych książek "
-"adresowych (np. ldap) może to być czasochłonne."
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr "Określa, czy szukać adresu nadawcy w książce adresowej. W razie znalezienia nie będzie określony jako niechciany. Wyszukiwane wykonywane jest w książkach oznaczonych do autouzupełniania. W przypadku zdalnych książek adresowych (np. ldap) może to być czasochłonne."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"Określa, czy korzystać z dodatkowych nagłówków do wykrywania niechcianych "
-"wiadomości"
+msgstr "Określa, czy korzystać z dodatkowych nagłówków do wykrywania niechcianych wiadomości"
 
 #: ../mail/evolution-mail.schemas.in.h:37
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Określa, czy korzystać z dodatkowych nagłówków do wykrywania niechcianych "
-"wiadomości. Jeśli opcja jest włączona i wiadomości zawierają wspomniane "
-"nagłówki, to prędkość sprawdzania może być zwiększona."
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr "Określa, czy korzystać z dodatkowych nagłówków do wykrywania niechcianych wiadomości. Jeśli opcja jest włączona i wiadomości zawierają wspomniane nagłówki, to prędkość sprawdzania może być zwiększona."
 
 #: ../mail/evolution-mail.schemas.in.h:38
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Określa, czy używać tej samej czcionki dla linii  \"Od\" oraz \"Temat\" w "
-"kolumnie \"Wiadomości\" widoku pionowego."
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgstr "Określa, czy używać tej samej czcionki dla linii  \"Od\" oraz \"Temat\" w kolumnie \"Wiadomości\" widoku pionowego."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13266,7 +13188,8 @@ msgid "Directory for saving mail component files."
 msgstr "Katalog do zapisu plików komponentów poczty."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
+#, fuzzy
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Włącza lub wyłącza skracanie nazw katalogów w drzewie katalogów"
 
 #: ../mail/evolution-mail.schemas.in.h:42
@@ -13283,8 +13206,7 @@ msgstr "Opróżnianie katalogów śmietnika przy zakończeniu"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-"Opróżnianie wszystkich katalogów niechcianych wiadomości przy zakończeniu."
+msgstr "Opróżnianie wszystkich katalogów niechcianych wiadomości przy zakończeniu."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
@@ -13292,9 +13214,7 @@ msgstr "Opróżnianie wszystkich katalogów śmietnika przy zakończeniu."
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Włączenie trybu karetki, dzięki czemu widać kursor podczas czytania "
-"wiadomości."
+msgstr "Włączenie trybu karetki, dzięki czemu widać kursor podczas czytania wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
@@ -13313,23 +13233,12 @@ msgid "Enable search folders on startup."
 msgstr "Włącza katalogi wyszukiwania po starcie programu."
 
 #: ../mail/evolution-mail.schemas.in.h:52
-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 ""
-"Włącza funkcję wyszukiwania w panelu bocznym, która pozwala na wyszukiwanie "
-"poprzez wpisywanie szukanego teksty. Można np. szybko otworzyć dany katalog "
-"wpisując jego nazwę."
+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 "Włącza funkcję wyszukiwania w panelu bocznym, która pozwala na wyszukiwanie poprzez wpisywanie szukanego teksty. Można np. szybko otworzyć dany katalog wpisując jego nazwę."
 
 #: ../mail/evolution-mail.schemas.in.h:53
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Należy włączyć, aby używać klawisza spacji do przewijania wiadomości, ich "
-"listy i katalogów."
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "Należy włączyć, aby używać klawisza spacji do przewijania wiadomości, ich listy i katalogów."
 
 #: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
@@ -13340,623 +13249,505 @@ msgid "Enable/disable caret mode"
 msgstr "Przełącza tryb karetki"
 
 #: ../mail/evolution-mail.schemas.in.h:56
-msgid "Height of the message-list pane"
-msgstr "Wysokość panelu listy wiadomości"
+#: ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Height of the message-list pane."
-msgstr "Wysokość panelu listy wiadomości."
+msgid "Encode file names in the mail headers same as Outlook or GMail does, to let them understand localized file names sent by Evolution, because they do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:58
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Ukrywa podgląd katalogów i usuwa zaznaczenie"
+msgid "Height of the message-list pane"
+msgstr "Wysokość panelu listy wiadomości"
 
 #: ../mail/evolution-mail.schemas.in.h:59
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Pytanie w przypadku, gdy użytkownik chce otworzyć w tym samym czasie 10 i "
-"więcej wiadomości."
+msgid "Height of the message-list pane."
+msgstr "Wysokość panelu listy wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Wyświetlanie okna podglądu pionowo a nie poziomo jeśli jest ono włączone"
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Ukrywa podgląd katalogów i usuwa zaznaczenie"
 
 #: ../mail/evolution-mail.schemas.in.h:61
-msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
-msgstr ""
-"Jeżeli nie ma wbudowanej przeglądarki w Evolution dla konkretnego typu MIME, "
-"do wyświetlenia zawartości zostanie użyty komponenet bonobo przeglądarki z "
-"bazy MIME GNOME, wskazywany przez jeden z elementów MIME na liście."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "Pytanie w przypadku, gdy użytkownik chce otworzyć w tym samym czasie 10 i więcej wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Początkowa wysokość okna \"Wysyłanie i odbieranie poczty\". Wartość jest "
-"aktualizowana, gdy użytkownik zmieni rozmiar pionowy okna."
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
+msgstr "Wyświetlanie okna podglądu pionowo a nie poziomo jeśli jest ono włączone"
 
 #: ../mail/evolution-mail.schemas.in.h:63
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Stan maksymalizacji okna \"Wysyłanie i odbieranie poczty\". Wartość jest "
-"aktualizowana, gdy użytkownik maksymalizuje lub minimalizuje okno. Ta "
-"wartość nie jest używana przez program Evolution, ponieważ opisywane okno "
-"nie może być zmaksymalizowane. Ten klucz istnieje tylko jako detal "
-"implementacji."
+#, fuzzy
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+msgstr "Jeżeli nie ma wbudowanej przeglądarki w Evolution dla konkretnego typu MIME, do wyświetlenia zawartości zostanie użyty komponenet bonobo przeglądarki z bazy MIME GNOME, wskazywany przez jeden z elementów MIME na liście."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Początkowa szerokość okna \"Wysyłanie i odbieranie poczty\". Wartość jest "
-"aktualizowana, gdy użytkownik zmieni rozmiar poziomy okna."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgstr "Początkowa wysokość okna \"Wysyłanie i odbieranie poczty\". Wartość jest aktualizowana, gdy użytkownik zmieni rozmiar pionowy okna."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Włącza/wyłącza zapytanie podczas zaznaczania wielu wiadomości."
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr "Stan maksymalizacji okna \"Wysyłanie i odbieranie poczty\". Wartość jest aktualizowana, gdy użytkownik maksymalizuje lub minimalizuje okno. Ta wartość nie jest używana przez program Evolution, ponieważ opisywane okno nie może być zmaksymalizowane. Ten klucz istnieje tylko jako detal implementacji."
 
 #: ../mail/evolution-mail.schemas.in.h:66
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"Włącza/wyłącza powtarzane pytania o synchronizację przed przejściem w tryb "
-"offline."
+msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+msgstr "Początkowa szerokość okna \"Wysyłanie i odbieranie poczty\". Wartość jest aktualizowana, gdy użytkownik zmieni rozmiar poziomy okna."
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"Włącza/wyłącza ostrzeżenia o usuwaniu oryginalnej wiadomości podczas "
-"usuwania jej z katalogu wyszukiwania."
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "Włącza/wyłącza zapytanie podczas zaznaczania wielu wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Last time empty junk was run"
-msgstr "Ostanie usuwanie niechcianych wiadomości"
+msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+msgstr "Włącza/wyłącza powtarzane pytania o synchronizację przed przejściem w tryb offline."
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Last time empty trash was run"
-msgstr "Ostanie opróżnianie śmietnika"
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr "Włącza/wyłącza ostrzeżenia o usuwaniu oryginalnej wiadomości podczas usuwania jej z katalogu wyszukiwania."
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Poziom powyżej którego wiadomość ma zostać zapisana w dzienniku."
+msgid "Last time empty junk was run"
+msgstr "Ostanie usuwanie niechcianych wiadomości"
 
 #: ../mail/evolution-mail.schemas.in.h:71
+msgid "Last time empty trash was run"
+msgstr "Ostanie opróżnianie śmietnika"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Lista etykiet i przypisanych im kolorów"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+#, fuzzy
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Lista typów MIME sprawdzanych na obecność składnika przeglądarki bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Lista zaakceptowanych licencji"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Lista kont"
 
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Lista kont znanych komponentowi poczty Evolution. Lista zawiera nazwy "
-"podkatalogów względem /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Lista kont znanych komponentowi poczty Evolution. Lista zawiera nazwy podkatalogów względem /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista własnych nagłówków oraz czy są włączone."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista kodów języków używanych do sprawdzania pisowni."
 
-#: ../mail/evolution-mail.schemas.in.h:77
-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 ""
-"Lista etykiet znanych komponentowi poczty Evolution. Lista zawiera ciągi "
-"zawierające nazwa:kolor, gdzie kolor używa kodowania HTML hex."
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Lista typów MIME sprawdzanych na obecność składnika przeglądarki bonobo"
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "Lista etykiet znanych komponentowi poczty Evolution. Lista zawiera ciągi zawierające nazwa:kolor, gdzie kolor używa kodowania HTML hex."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista nazw protokołów których licencje zostały zaakceptowane."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
 msgstr "Pobieranie obrazów dla wiadomości HTML poprzez protokół HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Pobieranie obrazów dla wiadomości HTML poprzez protokół http(s). Możliwe "
-"wartości to: 0 - bez pobierania obrazów z sieci, 1 - pobieranie obrazów "
-"jeżeli nadawca jest w książce adresowej, 2 - pobieranie wszystkich obrazów."
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "Pobieranie obrazów dla wiadomości HTML poprzez protokół http(s). Możliwe wartości to: 0 - bez pobierania obrazów z sieci, 1 - pobieranie obrazów jeżeli nadawca jest w książce adresowej, 2 - pobieranie wszystkich obrazów."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Akcje filtra dziennika"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Akcje filtra dziennika na podanym pliku dziennika."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Plik dziennika do zapisu akcji filtra"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Plik dziennika do zapisu akcji filtra."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Oznaczenie jako przeczytane po określonym czasie"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Oznaczenie jako przeczytane po określonym czasie."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Domyślna wysokość okna okna wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Domyślna szerokość okna wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Styl wyświetlania wiadomości (\"zwykły\", \"pełne nagłówki\",\" źródło\")"
+msgstr "Styl wyświetlania wiadomości (\"zwykły\", \"pełne nagłówki\",\" źródło\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-"Minimalna liczba dni pomiędzy usuwanie niechcianych wiadomości przy wyjściu"
+msgstr "Minimalna liczba dni pomiędzy usuwanie niechcianych wiadomości przy wyjściu"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimalna liczba dni pomiędzy opróżnieniami śmietnika przy wyjściu"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-"Minimalny okres czasu w dniach, pomiędzy usuwaniem niechcianych wiadomości "
-"przy wyjściu."
+msgstr "Minimalny okres czasu w dniach, pomiędzy usuwaniem niechcianych wiadomości przy wyjściu."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-"Minimalny okres czasu w dniach, pomiędzy opróżnieniami śmietnika przy "
-"wyjściu."
+msgstr "Minimalny okres czasu w dniach, pomiędzy opróżnieniami śmietnika przy wyjściu."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Liczba adresów wyświetlanych w polach Do/Kopia/Ukryta kopia"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Potwierdzenie przy pustym temacie"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Potwierdzenie przy opróźnianiu katalogu."
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Potwierdzenie podczas próby wysłania wiadomości bez tematu."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
-"Wyświetla pytanie czy użytkownik chce przejść natychmiast w tryb offline"
+msgstr "Wyświetla pytanie czy użytkownik chce przejść natychmiast w tryb offline"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Potwierdzanie przy usuwaniu wiadomości z katalogu wyszukiwania"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Potwierdzanie podczas opróżniania katalogu przez użytkownika"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
-msgstr ""
-"Potwierdzanie jeżeli użytkownik wypełnił tylko pole ukrytego adresata (Bcc)"
+msgstr "Potwierdzanie jeżeli użytkownik wypełnił tylko pole ukrytego adresata (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Potwierdzanie przy próbie otwarcia 10 i więcej wiadomości za jednym razem"
+msgstr "Potwierdzanie przy próbie otwarcia 10 i więcej wiadomości za jednym razem"
 
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Potwierdzanie przy wysyłaniu wiadomości w formacie HTML do osób, które ich "
-"nie chcą."
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Potwierdzanie przy wysyłaniu wiadomości w formacie HTML do osób, które ich nie chcą."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Potwierdzanie przy wysyłaniu wiadomości bez adresatów w polach Do lub Cc"
+msgstr "Potwierdzanie przy wysyłaniu wiadomości bez adresatów w polach Do lub Cc"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Potwierdzanie przy próbie wysłania niepożądanego formatu HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Potwierdzanie podczas zaznaczania wielu wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Rozpoznawanie emotikon w tekście i zamienianie ich na obrazy."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Rozpoznawanie odnośników w tekście i zamienianie ich."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Uruchamia test niechcianych dla przychodzących wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Katalog zapisu"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Search for the sender photo in local address books"
 msgstr "Wyszukuje zdjęcie nadawcy w lokalnych książkach adresowych"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Domyślne wysłanie wiadomości w formacie HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Domyślne wysłanie wiadomości w formacie HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Sender email-address column in the message list"
 msgstr "Wyświetlanie kolumny adresu nadawcy na liście wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Czas pomiędzy synchronizacjami z serwerem"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Wyświetlanie animacji"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Wyświetlanie animowanych obrazów jako animacji."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-"Wyświetlanie usuniętych wiadomości (z przekreśleniem) na liście wiadomości."
+msgstr "Wyświetlanie usuniętych wiadomości (z przekreśleniem) na liście wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Wyświetlanie usuniętych wiadomości na liście wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Wyświetlanie zdjęcia nadawcy"
 
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Wyświetlanie adresu nadawcy w osobnej kolumnie w liście wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Wyświetlanie zdjęcia nadawcy w oknie podglądu wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Sprawdzanie pisowni"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Kolor sprawdzania pisowni"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Języki sprawdzania pisowni"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Domyślna wysokość okna subskrypcji"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Domyślna szerokość okna subskrypcji"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Czcionka terminalowa"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Ograniczenie części tekstowej wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "Domyślna wtyczka dla funkcji Junk hook."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Czas ostatniego usunięcia niechcianych wiadomości, w dniach od epoki."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Czas ostatniego opróżniania śmietnika, w dniach od epoki."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "Czcionka terminalowa do wyświetlania wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "Czcionka o zmiennej szerokości do wyświetlania wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Możliwe wartości to: 0 dla błędów, 1 dla ostrzeżeń oraz 2 dla komunikatów "
-"debugowania."
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
-msgstr ""
-"Określa maksymalny rozmiar części tekstu, który może być formatowany przez "
-"evolution. Domyślnie jest to 4MB / 4096KB (wartość podawana w KB)."
-
 #: ../mail/evolution-mail.schemas.in.h:142
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"To jest domyślna wtyczka niechcianych, aktywna nawet gdy włączonych jest "
-"więcej wtyczek. Jeśli domyślna wtyczka jest wyłączona, to inne wtyczki nie "
-"zostaną aktywowane/"
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgstr "Możliwe wartości to: 0 dla błędów, 1 dla ostrzeżeń oraz 2 dla komunikatów debugowania."
 
 #: ../mail/evolution-mail.schemas.in.h:143
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-msgstr ""
-"Ten klucz odczytywany jest tylko raz a następnie ustawiany jest jako \"false"
-"\". Służy do usuwania zaznaczenia na liście wiadomości oraz wyłącza podgląd "
-"katalogu."
+#, fuzzy
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "Określa maksymalny rozmiar części tekstu, który może być formatowany przez evolution. Domyślnie jest to 4MB / 4096KB (wartość podawana w KB)."
 
 #: ../mail/evolution-mail.schemas.in.h:144
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Klucz ten powinien zawierać listę struktur XML określających nagłówki własne "
-"(użytkownika) oraz kiedy powinny być wyświetlane. Format struktury XML jest "
-"następujący: &lt;header enabled&gt; - ustawione enabled (włączony) kiedy "
-"nagłówek ma być wyświetlany w widoku wiadomości."
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr "To jest domyślna wtyczka niechcianych, aktywna nawet gdy włączonych jest więcej wtyczek. Jeśli domyślna wtyczka jest wyłączona, to inne wtyczki nie zostaną aktywowane/"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Opcja ta jest powiązana z kluczem lookup_addressbook i jest używana do "
-"określania czy szukać adresów w lokalnej książce adresowej tylko w celu "
-"wyłączenia sprawdzania niechcianej poczty we wiadomościach od osób z "
-"kontaktów."
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+msgstr "Ten klucz odczytywany jest tylko raz a następnie ustawiany jest jako \"false\". Służy do usuwania zaznaczenia na liście wiadomości oraz wyłącza podgląd katalogu."
 
 #: ../mail/evolution-mail.schemas.in.h:146
-msgid "This option would help in improving the speed of fetching."
-msgstr "Ta opcja może zwiększyć prędkość pobierania/."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "Klucz ten powinien zawierać listę struktur XML określających nagłówki własne (użytkownika) oraz kiedy powinny być wyświetlane. Format struktury XML jest następujący: &lt;header enabled&gt; - ustawione enabled (włączony) kiedy nagłówek ma być wyświetlany w widoku wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:147
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Określa liczbę adresów wyświetlanych w domyślnym widoku wiadomości. Dla "
-"nadmiarowych wyświetlone będą '...'."
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+msgstr "Opcja ta jest powiązana z kluczem lookup_addressbook i jest używana do określania czy szukać adresów w lokalnej książce adresowej tylko w celu wyłączenia sprawdzania niechcianej poczty we wiadomościach od osób z kontaktów."
 
 #: ../mail/evolution-mail.schemas.in.h:148
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Ta opcja określa czy wątki mają być domyślnie rozwinięte lub zwinięte. Po "
-"zmianie wymagane jest ponowne uruchomienie Evolution."
+msgid "This option would help in improving the speed of fetching."
+msgstr "Ta opcja może zwiększyć prędkość pobierania/."
 
 #: ../mail/evolution-mail.schemas.in.h:149
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Ta opcja określa czy wątki mają być sortowane na podstawie ostatniej "
-"wiadomości czy na podstawie daty. Po zmianie wymagane jest ponowne "
-"uruchomienie Evolution."
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Określa liczbę adresów wyświetlanych w domyślnym widoku wiadomości. Dla nadmiarowych wyświetlone będą '...'."
 
 #: ../mail/evolution-mail.schemas.in.h:150
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr "Ta opcja określa czy wątki mają być domyślnie rozwinięte lub zwinięte. Po zmianie wymagane jest ponowne uruchomienie Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgstr "Ta opcja określa czy wątki mają być sortowane na podstawie ostatniej wiadomości czy na podstawie daty. Po zmianie wymagane jest ponowne uruchomienie Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Grupowanie wiadomości w wątki."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Grupowanie wiadomości w wątki"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Grupowanie wiadomości w wątki według tematu"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Czas po jakim wiadomość będzie uznana za otwartą"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Czas po jakim wiadomość będzie uznana za otwartą."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "Ciąg określający UID domyślnego konta."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Kolor podkreślania błędnie napisanych słów."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Użycie demona i klienta SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Użycie demona i klienta SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Użycie własnych czcionek"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Użycie własnych czcionek do wyświetlania wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Użycie tylko lokalnych testów spamu."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Użycie tylko lokalnych testów spamu (bez DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Użyj układu pionowego lub szerokiego"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Czcionka o zmiennej szerokości"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Element menu Widok/Bcc jest zaznaczony"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Element menu Widok/Bcc jest zaznaczony."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Element menu Widok/Cc jest zaznaczony"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Element menu Widok/Cc jest zaznaczony."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Element menu Widok/Od jest zaznaczony"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Element menu Widok/Od jest zaznaczony."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Element menu Widok/Wyślij do jest zaznaczony"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Element menu Widok/Wyślij do jest zaznaczony."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Element menu Widok/Odpowiedz do jest zaznaczony"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Element menu Widok/Odpowiedz do jest zaznaczony."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
-"Określa, czy żądanie potwierdzenia przeczytania wiadomości ma być dodawane "
-"domyślnie do każdej wiadomości."
+msgstr "Określa, czy żądanie potwierdzenia przeczytania wiadomości ma być dodawane domyślnie do każdej wiadomości."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
-"Określa, czy wyłączyć funkcję skracania nazw katalogów w drzewie katalogów."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "Określa, czy wyłączyć funkcję skracania nazw katalogów w drzewie katalogów."
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Określa, czy powrócić do wątkowania według tematu, jeżeli wiadomość nie "
-"zawiera nagłówków In-Reply-To lub Reference."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Określa, czy powrócić do wątkowania według tematu, jeżeli wiadomość nie zawiera nagłówków In-Reply-To lub Reference."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
-"Określa czy sortować wątki na podstawie ostatniej wiadomości danym wątku."
+msgstr "Określa czy sortować wątki na podstawie ostatniej wiadomości danym wątku."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Szerokość panelu listy wiadomości"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Szerokość panelu listy wiadomości."
 
@@ -13988,16 +13779,17 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Import formatu Berkeley Mailbox"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231
+#: ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importowanie \"%s\""
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizowanie %s"
@@ -14014,37 +13806,32 @@ msgstr "Asystent importu poczty Pine dla Evolution"
 msgid "Import mail from Pine."
 msgstr "Importuj pocztę z Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Wiadomość do %s"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236
+#: ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Wiadomość od %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Dodanie reguły filtru"
 
-#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
-#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Szablony"
-
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -14052,7 +13839,7 @@ msgstr[0] "%d zaznaczona, "
 msgstr[1] "%d zaznaczone, "
 msgstr[2] "%d zaznaczonych, "
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14060,7 +13847,7 @@ msgstr[0] "%d usunięta"
 msgstr[1] "%d usunięte"
 msgstr[2] "%d usuniętych"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14068,7 +13855,7 @@ msgstr[0] "%d niechciana"
 msgstr[1] "%d niechciane"
 msgstr[2] "%d niechcianych"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -14076,7 +13863,7 @@ msgstr[0] "%d szkic"
 msgstr[1] "%d szkice"
 msgstr[2] "%d szkiców"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14084,7 +13871,7 @@ msgstr[0] "%d wysłana"
 msgstr[1] "%d wysłane"
 msgstr[2] "%d wysłanych"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14092,7 +13879,7 @@ msgstr[0] "%d niewysłana"
 msgstr[1] "%d niewysłane"
 msgstr[2] "%d niewysłanych"
 
-#: ../mail/mail-component.c:569
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14100,7 +13887,7 @@ msgstr[0] "%d nieprzeczytana, "
 msgstr[1] "%d nieprzeczytane, "
 msgstr[2] "%d nieprzeczytanych, "
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14108,92 +13895,26 @@ msgstr[0] "%d wiadomość"
 msgstr[1] "%d wiadomości"
 msgstr[2] "%d wiadomości"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Nowa wiadomość"
 
-#: ../mail/mail-component.c:923
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Wiadomość"
-
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Tworzy nową wiadomość"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Nowy katalog wiadomości"
 
-#: ../mail/mail-component.c:931
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Katalog wiado_mości"
-
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Tworzy nowy katalog wiadomości"
 
-#: ../mail/mail-component.c:1079
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Aktualizacja ustawień poczty lub katalogów zakończona niepowodzeniem."
 
-#: ../mail/mail-component.c:1595
-msgid "Error"
-msgstr "Błąd"
-
-#: ../mail/mail-component.c:1595
-msgid "Errors"
-msgstr "Błędy"
-
-#: ../mail/mail-component.c:1596
-msgid "Warnings and Errors"
-msgstr "Ostrzeżenia i błędy"
-
-#: ../mail/mail-component.c:1597
-msgid "Debug"
-msgstr "Debug"
-
-#: ../mail/mail-component.c:1597
-msgid "Error, Warnings and Debug messages"
-msgstr "Informacje typu błąd, ostrzeżenie i debug"
-
-#: ../mail/mail-component.c:1724
-msgid "Debug Logs"
-msgstr "Dziennik debug"
-
-#: ../mail/mail-component.c:1738
-msgid "Show _errors in the status bar for"
-msgstr "Wyświetlanie w pasku stanu _błędów dla "
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1754
-msgid "second(s)."
-msgstr "sekund(y)."
-
-#: ../mail/mail-component.c:1760
-msgid "Log Messages:"
-msgstr "Informacje dziennika:"
-
-#: ../mail/mail-component.c:1801
-msgid "Log Level"
-msgstr "Poziom zapisu"
-
-#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Czas"
-
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Wiadomości"
-
-#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zamyka bieżące okno"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Sprawdź obsługiwane typy "
@@ -14329,8 +14050,7 @@ msgstr "Dodaj _skrypt"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
-"P_odpisywanie wszystkich wiadomości wychodzących podczas używania tego konta"
+msgstr "P_odpisywanie wszystkich wiadomości wychodzących podczas używania tego konta"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
@@ -14447,9 +14167,7 @@ msgstr "Bez _formatowania treści tekstowej jeśli rozmiar przekracza"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"Wiadomości od _nadawców z książki adresowej nigdy nie oznaczane jako "
-"niechciane"
+msgstr "Wiadomości od _nadawców z książki adresowej nigdy nie oznaczane jako niechciane"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Do not quote"
@@ -14476,128 +14194,124 @@ msgid "Empty trash folders on e_xit"
 msgstr "_Opróżnianie katalogów śmietnika przy zakończeniu"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+msgid "Enable Magic S_pacebar"
 msgstr "Obsługa magicznej _spacji"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Obsługa _katalogów wyszukiwania"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "C_ertyfikat szyfrujący:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Szyfrowanie wychodzących wiadomości (domyślnie)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "_Stała szerokość:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Czcionka o _stałej szerokości:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Ustawienia czcionek"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Zapis wiadomości w formacie _HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "Imię i _nazwisko:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "Wiadomości HTML"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "Pośrednik H_TTP:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "_Wyróżnianie cytatów za pomocą koloru"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "W treści"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Oryginalna wiadomość w treści (styl Outlook)"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etykiety"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Tabela języków"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Tabela nagłówków wiadomości"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Położenie skrzynki"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Edytor wiadomości"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "_Bez pośrednika dla:"
 
-#: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"Uwaga: podkreślenie w nazwie używane jest jako identyfikator skrótu w menu."
-
 #: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Uwaga: zapytanie o hasło pojawi się dopiero przy pierwszej próbie połączenia"
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "Uwaga: podkreślenie w nazwie używane jest jako identyfikator skrótu w menu."
 
 #: ../mail/mail-config.glade.h:109
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Opcja jest ignorowana jeśli dopasowany własny nagłówek niechcianej poczty."
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Uwaga: zapytanie o hasło pojawi się dopiero przy pierwszej próbie połączenia"
 
 #: ../mail/mail-config.glade.h:110
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Opcja jest ignorowana jeśli dopasowany własny nagłówek niechcianej poczty."
+
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14605,142 +14319,135 @@ msgstr ""
 "W polu poniżej proszę podać opisową nazwę konta.\n"
 "Nazwa ta używana będzie tylko do wyświetlania."
 
-#: ../mail/mail-config.glade.h:116
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Proszę podać informacje o metodzie wysyłania wiadomości. W razie wątpliwości "
-"najlepiej skontaktować się z  administratorem lub dostawcą internetu (ISP)."
-
 #: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Proszę podać poniżej swoje imię i nazwisko oraz adres e-mail. Pola w rubryce "
-"\"Informacje dodatkowe\" nie muszą być wypełnione. Podane tam informacje "
-"będą zawarte w wysyłanych wiadomościach."
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Proszę podać informacje o metodzie wysyłania wiadomości. W razie wątpliwości najlepiej skontaktować się z  administratorem lub dostawcą internetu (ISP)."
 
 #: ../mail/mail-config.glade.h:118
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Proszę podać poniżej swoje imię i nazwisko oraz adres e-mail. Pola w rubryce \"Informacje dodatkowe\" nie muszą być wypełnione. Podane tam informacje będą zawarte w wysyłanych wiadomościach."
+
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Proszę wybrać jedną z poniższych opcji"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Potwierdzanie przy wysyłaniu wiadomości tylko z _ukrytymi adresatami (Bcc)"
+msgstr "Potwierdzanie przy wysyłaniu wiadomości tylko z _ukrytymi adresatami (Bcc)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "Zapa_miętanie hasła"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "O_dpowiedź do:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Zapamiętanie _hasła"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "Host S_OCKS:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_zukanie zdjęcia wiadomości tylko w lokalnych książkach adresowych"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "Wybi_erz..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "_Wysyłanie potwierdzeń:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "_Zwykła czcionka:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "Wybór katalogu szkiców"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Wybór czcionki o stałej szerokości używanej w HTML-u"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Wybór czcionki o stałej szerokości używanej na wydruku"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Wybór czcionki o zmiennej szerokości używanej w HTML-u"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Wybór czcionki o zmiennej szerokości używanej na wydruku"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "Wybór katalogu wysłanych"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Wysyłanie wiadomości"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Katalog _wysłanych wiadomości:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Certyfikat podpis_ujący:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "_Podpis:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Tabela podpisów"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "_Wpisywanie odpowiedzi u dołu"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "R_odzaj: "
 
-#: ../mail/mail-config.glade.h:148
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Lista dostępnych języków odnosi się tylko do języków, dla których zostały "
-"zainstalowane słowniki."
+#: ../mail/mail-config.glade.h:151
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Lista dostępnych języków odnosi się tylko do języków, dla których zostały zainstalowane słowniki."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14750,35 +14457,35 @@ msgstr ""
 "podpis. Wpisana nazwa będzie używana tylko przy\n"
 "wyświetlaniu."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"Proszę wpisać nazwę, przy użyciu której będzie można odnosić się do tego "
-"konta.\n"
+"Proszę wpisać nazwę, przy użyciu której będzie można odnosić się do tego konta.\n"
 "Na przykład: \"Służbowe\" lub \"Prywatne\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Nazwa _użytkownika:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Uwierzytel_nianie"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159
+#: ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "_Zmienna szerokość:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14788,126 +14495,124 @@ msgstr ""
 "\n"
 "Aby rozpocząć, proszę nacisnąć przycisk \"Do przodu\"."
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Dodaj podpis"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "Z_awsze"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Adres URL automatycznej konfiguracji pośrednika:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "_Domyślna wtyczka niechcianych:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "B_ezpośrednie połączenie z Internetem"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Bez podpisywania żądań _zebrań (dla zgodności z programem Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Sposób p_rzesyłania:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Przy odpowiadaniu sygnatura ponad wiadomością oryginalną"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Tylko w wiadomościach od osób z kontaktów"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "_Szukanie tylko w lokalnej książce adresowej"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Konto domyślne"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "_Ręczna konfiguracja pośrednika:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie wiadomości jako \"przeczytane\" po upływie"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_Nigdy"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-"_Pytanie podczas wysyłania wiadomości w formacie HTML do osób, które ich nie "
-"chcą"
+msgstr "_Pytanie podczas wysyłania wiadomości w formacie HTML do osób, które ich nie chcą"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysyłaniu wiadomości bez _tematu"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "Sposób odpo_wiadania:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Skrypt:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "Be_zpieczny pośrednik HTTP:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "Wybi_erz..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "_Wyświetlanie animacji"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Zdję_cie nadawcy w podglądzie wiadomości"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Zwężenie pól Do/Kopia/Ukryta kopia do"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Bezpieczne połączenie:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "_Domyślne ustawienia systemu"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Używanie tych samych czcionek co inne aplikacje"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "adresy"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "kolor"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "opis"
 
@@ -14956,7 +14661,8 @@ msgid "Find in Message"
 msgstr "Wyszukiwanie w liście"
 
 # FIXME - Albo Zaznacz by kontynuować
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Zaznacz do kontynuacji"
 
@@ -15008,27 +14714,28 @@ msgstr "_Znacznik:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Należy zaznaczyć aby zaakceptować umowę _licencyjną"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Odpytywanie %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtrowanie zaznaczonych wiadomości"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Pobieranie wiadomości"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Zastosowanie filtrów wychodzących nie powiodło się: %s"
 
 # FIXME - jakieś takie kwadratowe to zdanie
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573
+#: ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15037,109 +14744,112 @@ msgstr ""
 "Nie powiodło się dodanie do %s: %s\n"
 "Zamiast tego będzie dodane do katalogu \"Wysłane\"."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Dodanie do lokalanego katalogu \"Wysłane\" nie powiodło się: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysyłanie %d. z %d wiadomości"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Niepowodzenie przy wysyłaniu %d z %d wiadomości"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764
+#: ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Anulowano."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766
+#: ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Gotowe."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Zapisywanie wiadomości w katalogu"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie wiadomości do %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie wiadomości do %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Przesłane wiadomości"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie katalogu %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Pobieranie informacji o przydziałach dla katalogu %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie katalogu %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie katalogu \"%s\""
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Oczyszczanie i zapisywanie konta \"%s\""
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Zapisywanie konta \"%s\""
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Odświeżanie katalogu"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689
+#: ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Oczyszczanie katalogu"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Opróżnianie śmietnika w \"%s\""
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Lokalne katalogi"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie wiadomości %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15147,7 +14857,7 @@ msgstr[0] "Pobieranie %d wiadomości"
 msgstr[1] "Pobieranie %d wiadomości"
 msgstr[2] "Pobieranie %d wiadomości"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15155,7 +14865,7 @@ msgstr[0] "Zapisywanie %d wiadomości"
 msgstr[1] "Zapisywanie %d wiadomości"
 msgstr[2] "Zapisywanie %d wiadomości"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15164,11 +14874,12 @@ msgstr ""
 "Błąd przy zapisie wiadomości do: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Zapisywanie załącznika"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178
+#: ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15177,27 +14888,27 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odłączanie od %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Przygotowywanie konta \"%s\" do trybu offline"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Sprawdzanie usługi"
 
@@ -15213,39 +14924,40 @@ msgstr "Wysyłanie i odbiór wiadomości"
 msgid "Cancel _All"
 msgstr "Anuluj _wszystko"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowych wiadomości"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Proszę podać hasło dla %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Hasło"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez użytkownika."
 
@@ -15292,21 +15004,21 @@ msgstr "Niepoprawny katalog: \"%s\""
 msgid "Setting up Search Folder: %s"
 msgstr "Ustawianie katalogu wyszukiwania: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Aktualizowanie katalogów wyszukiwania dla '%s:%s'"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Aktualizowanie katalogów wyszukiwania dla '%s'"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Modyfikuj katalog wyszukiwania"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Nowy katalog wyszukiwania"
 
@@ -15322,8 +15034,7 @@ msgstr "Katalog o nazwie \"{1}\" już istnieje. Proszę podać inną nazwę."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Istnieje już niepusty katalog w \"{1}\".\n"
 "\n"
@@ -15331,26 +15042,16 @@ msgstr ""
 "zawartość, albo zrezygnować."
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr ""
-"Zażądano potwierdzenia przeczytania dla \"{1}\". Czy wysłać potwierdzenie do "
-"{0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Zażądano potwierdzenia przeczytania dla \"{1}\". Czy wysłać potwierdzenie do {0}?"
 
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "Isnieje już sygnatura o nazwie \"{0}\". Proszę podać inną nazwę."
 
 #: ../mail/mail.error.xml.h:8
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Podanie tytułu opisującego wiadomość, pozwoli odbiorcom wyobraźić sobie jej "
-"zawartość."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Podanie tytułu opisującego wiadomość, pozwoli odbiorcom wyobraźić sobie jej zawartość."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15361,8 +15062,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno usunąć to konto?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Czy na pewno wyłączyć to konto i usunąć wszystkie jego proxy?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15370,20 +15070,12 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Czy na pewno otworzyć {0} wiadomości jednocześnie?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Czy na pewno trwale usunąć wiadomości oznaczone do usunięcia ze wszystkich "
-"katalogów?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Czy na pewno trwale usunąć wiadomości oznaczone do usunięcia ze wszystkich katalogów?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr ""
-"Czy na pewno trwale usunąć wiadomości oznaczone do usunięcia z katalogu \"{0}"
-"\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Czy na pewno trwale usunąć wiadomości oznaczone do usunięcia z katalogu \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15439,8 +15131,7 @@ msgstr "Nie można usunąć katalogu systemowego \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"Nie można zmodyfikować ktalogu wyszukiwania \"{0}\" ponieważ on nie istnieje."
+msgstr "Nie można zmodyfikować ktalogu wyszukiwania \"{0}\" ponieważ on nie istnieje."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -15459,13 +15150,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Nie można otworzyć obiektu docelowego \"{2}\"."
 
 #: ../mail/mail.error.xml.h:34
-msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
-msgstr ""
-"Nie można odczytać pliku licencji \"{0}\" z powodu problemu instalacji. Nie "
-"będzie można skorzystać z tego dostawcy do czasu zaakceptowania jego "
-"licencji."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Nie można odczytać pliku licencji \"{0}\" z powodu problemu instalacji. Nie będzie można skorzystać z tego dostawcy do czasu zaakceptowania jego licencji."
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -15496,12 +15182,8 @@ msgid "Check Junk Failed"
 msgstr "Nieudane sprawdzenie wiadomości niechcianych"
 
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Proszę sprawdzić czy hasło zostało wpisane prawidłowo. Wiele haseł jest "
-"wrażliwych na wielkość liter; może być włączony klawisz caps lock."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Proszę sprawdzić czy hasło zostało wpisane prawidłowo. Wiele haseł jest wrażliwych na wielkość liter; może być włączony klawisz caps lock."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15540,11 +15222,8 @@ msgid "Do not disable"
 msgstr "Nie wyłączaj"
 
 #: ../mail/mail.error.xml.h:52
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Czy zsynchronizowac lokalnie katalogi zaznaczone do użycia w trybie offline?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr "Czy zsynchronizowac lokalnie katalogi zaznaczone do użycia w trybie offline?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15580,16 +15259,11 @@ msgstr "Plik istnieje ale nie jest zwykłym plikiem."
 
 #: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-"W przypadku kontynuacji, nie będzie możliwości odtworzenia tej wiadomości."
+msgstr "W przypadku kontynuacji, nie będzie możliwości odtworzenia tej wiadomości."
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"Jeżeli katalog zostanie usunięty, cała jego zawartość łącznie z "
-"podkatalogami zostanie trwale skasowana."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "Jeżeli katalog zostanie usunięty, cała jego zawartość łącznie z podkatalogami zostanie trwale skasowana."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15608,12 +15282,8 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "W przypadku kontynuacji, informacje o koncie będą trwale usunięte."
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
-"uruchomienia programu Evolution."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego uruchomienia programu Evolution."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15629,17 +15299,8 @@ msgid "Mail filters automatically updated."
 msgstr "Filtry pocztowe zostały automatycznie zaktualizowane."
 
 #: ../mail/mail.error.xml.h:72
-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 "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Wiele systemów pocztowych dodaje nagłówek Apparently-To (Najwyraźniej-Do) do "
-"wiadomości które posiadają tylko odbiorców BCC (ukrytych adresatów). "
-"Nagłówek ten w przypadku dołożenia, wyświetli wszystkich odbiorców w liście. "
-"Aby temu zpobiec, należy dodać przynajmniej jednego odbiorę do pola Dla: lub "
-"CC: (kopia)."
+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 your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Wiele systemów pocztowych dodaje nagłówek Apparently-To (Najwyraźniej-Do) do wiadomości które posiadają tylko odbiorców BCC (ukrytych adresatów). Nagłówek ten w przypadku dołożenia, wyświetli wszystkich odbiorców w liście. Aby temu zpobiec, należy dodać przynajmniej jednego odbiorę do pola Dla: lub CC: (kopia)."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15666,21 +15327,15 @@ msgid "Please enable the account or send using another account."
 msgstr "Proszę włączyć konto lub spróbować wysłać za pomocą innego konta."
 
 #: ../mail/mail.error.xml.h:80
-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."
-msgstr ""
-"Proszę podać poprawny adres e-mail w polu Do. Można wyszukać adresy e-mail "
-"klikając na przycisku Do: obok pola tekstowego."
+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."
+msgstr "Proszę podać poprawny adres e-mail w polu Do. Można wyszukać adresy e-mail klikając na przycisku Do: obok pola tekstowego."
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
-"Proszę upewnić się, że wymienieni niżej odbiorcy chcą otrzymywać i mają "
-"możliwość \n"
+"Proszę upewnić się, że wymienieni niżej odbiorcy chcą otrzymywać i mają możliwość \n"
 "czytania wiadomości w postaci HTML:\n"
 "{0}"
 
@@ -15702,8 +15357,7 @@ msgstr "Odpytywanie serwera"
 
 #: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
-"Odpytywanie serwera o listę obsługiwanych mechanizmów uwierzytelniających."
+msgstr "Odpytywanie serwera o listę obsługiwanych mechanizmów uwierzytelniających."
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
@@ -15743,29 +15397,18 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "Zsynchronizować katalogi lokalnie do użycia w trybie offline?"
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Katalogi systemowe są wymagane do poprawnej pracy Evolution i nie mogą mieć "
-"zmienianych nazw, być usuwane bądź przenoszone."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Katalogi systemowe są wymagane do poprawnej pracy Evolution i nie mogą mieć zmienianych nazw, być usuwane bądź przenoszone."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"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 in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "Wysyłana lista kontaktów ma skonfigurowane ukrywanie listy odbiorców.\n"
 "\n"
-"Wiele systemów pocztowych dodaje nagłówek Apparently-To (Najwyraźniej-Do) do "
-"listów które posiadają tylko odbiorców BCC (ukrytych adresatów). Nagłówek "
-"ten w przypadku dołożenia, wyświetli wszystkich odbiorców w liście. Aby temu "
-"zapobiec, należy dodać przynajmniej jednego odbiorę do pola Dla: lub CC: "
-"(kopia)."
+"Wiele systemów pocztowych dodaje nagłówek Apparently-To (Najwyraźniej-Do) do listów które posiadają tylko odbiorców BCC (ukrytych adresatów). Nagłówek ten w przypadku dołożenia, wyświetli wszystkich odbiorców w liście. Aby temu zapobiec, należy dodać przynajmniej jednego odbiorę do pola Dla: lub CC: (kopia)."
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -15810,47 +15453,32 @@ msgstr ""
 "z edytora katalogów wyszykiwania."
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Wiadomość nie może zostać wysłana, gdyż wybrane konto jest wyłączone"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Wiadomość nie może zostać wysłana, gdyż nie wpisano żadnego odbiorcy"
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Ten serwer nie obsługuje tego rodzaju uwierzytelniania i może wogóle nie "
-"obsługiwać uwierzytelniania."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Ten serwer nie obsługuje tego rodzaju uwierzytelniania i może wogóle nie obsługiwać uwierzytelniania."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Podpis został zmieniony, lecz zmiany nie zostały zapisane."
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Wszystkie wiadomości w wybranym katalogu i jego podkatalogach zostaną "
-"oznaczone jako przeczytane."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "Wszystkie wiadomości w wybranym katalogu i jego podkatalogach zostaną oznaczone jako przeczytane."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nie można nawiązać połączenia z serwerem GroupWise."
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nie można otworzyć katalogu szkiców dla tego konta. Czy użyć systemowego "
-"katalogu szkiców?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Nie można otworzyć katalogu szkiców dla tego konta. Czy użyć systemowego katalogu szkiców?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15866,13 +15494,11 @@ msgstr "Użyć domyślnego katalogu szkiców?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Uwaga: usunięcie wiadomości z folderu wyszukiwania spowoduje także usunięcie "
-"wiadomości z jej oryginalnego katalogu.\n"
-"Czy na pewno usunąć tą wiadomość?"
+"Uwaga: usunięcie wiadomości z katalogu wyszukiwania spowoduje także usunięcie wiadomości z jej oryginalnego katalogu.\n"
+"Czy na pewno usunąć tę wiadomość?"
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
@@ -15897,8 +15523,7 @@ msgstr "Należy określić katalog."
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "Należy podać przynajmniej jeden katalog jako źródło.\n"
 "Albo poprzez indywidualny wybór katalogów, albo poprzez wybór \n"
@@ -15928,87 +15553,90 @@ msgstr "_Wyczyść"
 msgid "_Open Messages"
 msgstr "_Otwórz wiadomości"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Niewidziana"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Widziana"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Z odpowiedzią"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Przekazana"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych wiadomości"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Wiele wiadomości"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Najniższy"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Niższy"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Wyższy"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Najwyższy"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655
+#: ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662
+#: ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dziś %k:%M"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671
+#: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683
+#: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691
+#: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3984
+#: ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "Tworzenie listy wiadomości"
 
-#: ../mail/message-list.c:4224
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"Brak wiadomości spełniających kryteria wyszukiwania. Proszę wyczyścić lub "
-"zmienić kryterium."
+#: ../mail/message-list.c:4288
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "Brak wiadomości spełniających kryteria wyszukiwania. Proszę wyczyścić lub zmienić kryterium."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Brak wiadomości w tym katalogu."
 
@@ -16042,40 +15670,48 @@ msgstr "Wysłane wiadomości"
 msgid "Size"
 msgstr "Rozmiar"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Pole _tematu"
+
 # FIXME - albo inaczej?
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Wywołaj"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Bez przekazywania"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Kontynuuj"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Do twojej informacji"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Przekaż"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Odpowiedź niekonieczna"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Odp. wszystkim"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Recenzja"
 
@@ -16116,23 +15752,15 @@ msgid "Provides core functionality for local address books."
 msgstr "Zapewnia podstawową funkcjonalność lokalnych książek adresowych."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"Lista słów-kluczy dla wtyczki przypominania o załączniku do wyszukiwania w "
-"wiadomości"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "Lista słów-kluczy dla wtyczki przypominania o załączniku do wyszukiwania w wiadomości"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista słów-kluczy dla wtyczki przypominania o załączniku do wyszukiwania w "
-"wiadomości."
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "Lista słów-kluczy dla wtyczki przypominania o załączniku do wyszukiwania w wiadomości."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:392
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Słowa kluczowe"
 
@@ -16142,20 +15770,12 @@ msgid "Attachment Reminder"
 msgstr "Przypomnienie o załącznikach"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"Wyszukuje w wiadomościach wzmianki o załącznikach i ostrzega, gdy brak "
-"załącznika"
+msgid "Looks for clues in a message for mention of attachments and warns if the attachment is missing"
+msgstr "Wyszukuje w wiadomościach wzmianki o załącznikach i ostrzega, gdy brak załącznika"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Nie znaleziono żadnego załącznika, a wiadomość zawiera słowa sugerujące, że "
-"powinna mieć załącznik."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Nie znaleziono żadnego załącznika, a wiadomość zawiera słowa sugerujące, że powinna mieć załącznik."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
@@ -16166,12 +15786,9 @@ msgid "_Edit Message"
 msgstr "_Zmodyfikuj wiadomość"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
-msgstr ""
-"Wtyczka wyświetlająca załączniki typu audio w treści wiadomości, która "
-"pozwala odegrać je bozpośrednio z evolution."
+#, fuzzy
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from Evolution."
+msgstr "Wtyczka wyświetlająca załączniki typu audio w treści wiadomości, która pozwala odegrać je bozpośrednio z evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -16199,12 +15816,10 @@ msgstr "Przywrócenie z kopii zapasowej"
 
 #: ../plugins/backup-restore/backup-restore.c:278
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
+"You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
-"Można przywrócić Evolution z kopii zapasowej. Przywrócić można wiadomości, "
-"kalendarze, zadania, notatki,\n"
+"Można przywrócić Evolution z kopii zapasowej. Przywrócić można wiadomości, kalendarze, zadania, notatki,\n"
 "kontakty, a ponadto ustawienia osobiste, filtry i inne."
 
 #: ../plugins/backup-restore/backup-restore.c:284
@@ -16250,8 +15865,7 @@ msgstr "Zapisywanie kont i ustawień Evolution"
 
 #: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Zapisywanie danych Evolution (poczta, kontakty, kalendarz, zadania, notatki)"
+msgstr "Zapisywanie danych Evolution (poczta, kontakty, kalendarz, zadania, notatki)"
 
 #: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
@@ -16335,21 +15949,12 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Czy na pewno zamknąć 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?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Czy na pewno przywrócić dane Evolution z wybranego pliku?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Kopia zapasowa Evolution może być uruchomiona tylko gdy program nie jest "
-"uruchomiony. Proszę zapisać stan pracy i zamknąć wszystkie okna. Aby "
-"uruchomić Evolution po zakończeniu tworzenia kopii zapasowej, należy "
-"przełączyć przycisk przełącznika."
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Kopia zapasowa Evolution może być uruchomiona tylko gdy program nie jest uruchomiony. Proszę zapisać stan pracy i zamknąć wszystkie okna. Aby uruchomić Evolution po zakończeniu tworzenia kopii zapasowej, należy przełączyć przycisk przełącznika."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16368,18 +15973,8 @@ msgid "The selected folder is not writable."
 msgstr "Nie można zapisywać do zaznaczonego katalogu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
-msgstr ""
-"Opcja ta usunie wszystkie bieżące dane i ustawienia Evolution i przywróci "
-"dane z kopii zapasowej. Przywracanie może być uruchomione tylko gdy program "
-"nie jest uruchomiony. Proszę zapisać stan pracy i zamknąć wszystkie okna. "
-"Aby uruchomić Evolution po zakończeniu tworzenia kopii zapasowej, należy "
-"przełączyć przycisk przełącznika."
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "Opcja ta usunie wszystkie bieżące dane i ustawienia Evolution i przywróci dane z kopii zapasowej. Przywracanie może być uruchomione tylko gdy program nie jest uruchomiony. Proszę zapisać stan pracy i zamknąć wszystkie okna. Aby uruchomić Evolution po zakończeniu tworzenia kopii zapasowej, należy przełączyć przycisk przełącznika."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16393,75 +15988,69 @@ msgstr "P_rzywróć ustawienia..."
 msgid "_Backup Settings..."
 msgstr "_Utwórz kopię zapasową..."
 
-#: ../plugins/bbdb/bbdb.c:532 ../plugins/bbdb/bbdb.c:541
+#: ../plugins/bbdb/bbdb.c:615
+#: ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Kontakty automatyczne"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:556
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Automatyczne tworzenie wpisów w książce adresowej podczas odpowiedzi"
 
-#: ../plugins/bbdb/bbdb.c:562
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Książka adresowa dla kontaktów automatycznych"
 
-#: ../plugins/bbdb/bbdb.c:577
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Kontakty komunikatora"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:592
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr ""
-"Okresowa synchronizacja informacji i obrazów z kontaktów komunikatora Pidgin"
+msgstr "Okresowa synchronizacja informacji i obrazów z kontaktów komunikatora Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:598
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Książka adresowa dla kontaktów z komunikatora Pidgyn"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronizuj z listą kontaktów"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"Automatycznie wstawia nazwy i adresy email do książki adresowej przy "
-"odpowiadaniu na wiadomości. Dodatkowo wstawiane są dane z listy kontaktów "
-"komunikatora."
+msgid "Automatically fills your address book with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+msgstr "Automatycznie wstawia nazwy i adresy email do książki adresowej przy odpowiadaniu na wiadomości. Dodatkowo wstawiane są dane z listy kontaktów komunikatora."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Napotkano błąd podczas uruchamiania %s: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Proces potomny bogofilter nie odpowiada, usuwanie..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Przerwano oczekiwanie na proces potomny bogofilter, kończenie.."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Błędny potok do bogofilter, kod błędu: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
 msgid "Convert message text to _Unicode"
 msgstr "Konwertowanie tekstu do _Unicode"
 
@@ -16470,12 +16059,8 @@ msgid "Convert mail messages to Unicode"
 msgstr "Konwertuje tekst wiadomości do Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Konwertuje tekst wiadomości do Unicode UTF-8 aby nie pominąć żadnych znaków "
-"z innych kodowań."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Konwertuje tekst wiadomości do Unicode UTF-8 aby nie pominąć żadnych znaków z innych kodowań."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
@@ -16490,21 +16075,32 @@ msgid "Filters junk messages using Bogofilter."
 msgstr "Filtruje niechciane wiadomości za pomocą Bogofilter."
 
 # FIXME - albo inaczej?
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80
+#: ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "Adr_es URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "Użyj _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "O_dśwież:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "Żródła kalendarzy CalDAV"
@@ -16521,13 +16117,6 @@ msgstr "Kalendarze lokalne"
 msgid "Provides core functionality for local calendars."
 msgstr "Zapewnia podstawową funkcjonalność lokalnych kalendarzy."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "O_dśwież:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Bezpieczne połączenie"
@@ -16544,48 +16133,59 @@ msgstr "Kalendarze HTTP"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Zapewnia podstawową funkcjonalność kalendarzy webcal i http."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Pogoda: Pochmurno"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Pogoda: Mgła"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Pogoda: Częściowe zachmurzenie"
+msgid "Weather: Cloudy"
+msgstr "Pogoda: Pochmurno"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Pogoda: Deszcz"
+#, fuzzy
+msgid "Weather: Cloudy Night"
+msgstr "Pogoda: Pochmurno"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+msgid "Weather: Overcast"
+msgstr "Pogoda: Deszcz"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+msgid "Weather: Showers"
+msgstr "Pogoda: Śnieg"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Pogoda: Śnieg"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Pogoda: Słonecznie"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "Kalendarze pogodowe"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Pogoda: Burze"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Proszę wybrać położenie"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Jednostki:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metryczne (Celsjusz, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Angielskie (Fahrenheit, cale, itd.)"
 
@@ -16598,12 +16198,8 @@ msgid "Weather Calendars"
 msgstr "Kalendarze pogodowe"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Testowa wtyczka zawierająca menu kontekstowe służące do kopiowania elementów "
-"do pamięci podręcznej."
+msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
+msgstr "Testowa wtyczka zawierająca menu kontekstowe służące do kopiowania elementów do pamięci podręcznej."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16614,17 +16210,12 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Sprawdź czy Evolution jest domyślnym programem pocztowym"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Sprawdza podczas każdego uruchomienia czy Evolution jest domyślnym programem "
-"pocztowym."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Sprawdza podczas każdego uruchomienia czy Evolution jest domyślnym programem pocztowym."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Sprawdza podczas uruchamiania czy Evolution jest domyślnym programem "
-"pocztowym."
+msgstr "Sprawdza podczas uruchamiania czy Evolution jest domyślnym programem pocztowym."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16635,7 +16226,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Czy ustawić Evolution jako domyślny program pocztowy?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16660,9 +16251,7 @@ msgid "Default Sources"
 msgstr "Źródła domyślne"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+msgid "Provides functionality for marking a calendar or an address book as the default one."
 msgstr "Pozwala oznaczyć kalendarz lub książkę adresową jako domyślne."
 
 #: ../plugins/email-custom-header/email-custom-header.c:560
@@ -16674,7 +16263,7 @@ msgid "Key"
 msgstr "Klucz"
 
 #: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Wartości"
 
@@ -16705,14 +16294,13 @@ msgid "List of Custom Headers"
 msgstr "Lista własnych nagłówków"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgstr "Ten klucz określa listę nagłówków użytkownika, które będą dodawane do wychodzących wiadomości. Format wartości to: nazwa nagłówka, znak \"=\" oraz wartości rozdzielone znakami \";\"."
+
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
 msgstr ""
-"Ten klucz określa listę nagłówków użytkownika, które będą dodawane do "
-"wychodzących wiadomości. Format wartości to: nazwa nagłówka, znak \"=\" oraz "
-"wartości rozdzielone znakami \";\"."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16731,36 +16319,28 @@ msgid "_User:"
 msgstr "Nazwa _użytkownika:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Hasło bezpieczne"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Opcja ta spowoduje połączenie z serwerem Exchange przy wykorzystaniu "
-"bezpiecznego uwierzytelniania (NTLM)."
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "Opcja ta spowoduje połączenie z serwerem Exchange przy wykorzystaniu bezpiecznego uwierzytelniania (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Hasło tekstowe"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Przy tej opcji połączenie z serwerem Exchange nastąpi przy użyciu hasła w "
-"postaci czystego tekstu."
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "Przy tej opcji połączenie z serwerem Exchange nastąpi przy użyciu hasła w postaci czystego tekstu."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Poza biurem"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16768,102 +16348,105 @@ msgstr ""
 "Wiadomość wprowadzona poniżej będzie automatycznie wysyłana \n"
 "do każdej osoby, która przyśle wiadomość podczas nieobecności."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Jestem poza pracą"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Jestem w pracy"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Zmień hasło konta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Zmień hasło"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Zarzadza ustawieniami delegacji dla konta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Asystent delegacji"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Różne"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Pokaż rozmiary wszystkich katalogów Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Rozmiary katalogów"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Ustawienia Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "Adres URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "_Uwierzytelnienie"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+msgid "S_pecify the mailbox name"
+msgstr "Nazwa p_liku:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Skrzynka:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "Rodzaj _uwierzytelniania"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "_Sprawdź obsługiwane typy "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Evolution jest w trybie offline. Foldery można tworzyć i modyfikować\n"
+"Program Evolution jest w trybie offline. Katalogi można tworzyć i modyfikować\n"
 "tylko w trybie online."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
 msgstr "Podane hasło konta nie jest poprawne. Proszę podać je ponownie"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
@@ -16891,32 +16474,32 @@ msgstr "Bieżące hasło wygasło. Proszę zmienić hasło teraz."
 msgid "Your password will expire in the next %d days"
 msgstr "Hasło wygaśnie za %d dni."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Własny widok"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Edytor (czytanie, tworzenie, edycja)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (czytanie, tworzenie)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Recenzent (tylko do odczytu)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Uprawnienia delegata"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16925,35 +16508,31 @@ msgstr "Uprawnienia dla %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Ta wiadomość została wysłana automatycznie przez Evolution. Adresat został "
-"wyznaczony jako delegat i może teraz wysyłać wiadomości w imieniu nadawcy."
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
+msgstr "Ta wiadomość została wysłana automatycznie przez Evolution. Adresat został wyznaczony jako delegat i może teraz wysyłać wiadomości w imieniu nadawcy."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Nadano następujące uprawnienia do katalogów nadawcy:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Delegat może zobaczyć elementy prywatne."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Brak jednak dostępu do elementów prywatnych."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Wyznaczono użytkownika jako delegata dla %s"
@@ -17108,12 +16687,10 @@ msgstr "<b>Stan:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>Wiadomość wprowadzona poniżej będzie automatycznie wysyłana do każdej "
-"osoby,\n"
+"<small>Wiadomość wprowadzona poniżej będzie automatycznie wysyłana do każdej osoby,\n"
 "która przyśle ci wiadomość podczas twojej nieobecności w biurze.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -17158,7 +16735,7 @@ msgstr "Dodaj użytkownika:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/proxy.c:937
 #: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Dodaj użytkownika"
@@ -17294,45 +16871,42 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Subskrybuj kalendarz innego użytkownika"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"Wtyczka obsługująca zestaw specjalnych funkcji i operacji dla kont Exchange."
+msgid "A plugin that manages a collection of Exchange account specific operations and features."
+msgstr "Wtyczka obsługująca zestaw specjalnych funkcji i operacji dla kont Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Operacje Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Nie można zmienić hasła z powodu problemów konfiguracyjnych."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "Nie można wyświetlić katalogów."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "Nie można wykonać operacji."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Zmiany w konfiguracji konta Exchange \"{0}\" zostaną zastosowane po ponownym "
-"uruchomieniu Evolution."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "Zmiany w konfiguracji konta Exchange \"{0}\" zostaną zastosowane po ponownym uruchomieniu Evolution."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Nie można uwierzytelnić na serwerze."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Nie można zmienić hasła."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17342,61 +16916,59 @@ msgstr ""
 "z powodu nieznanego błędu. Proszę zweryfikować\n"
 "URL, nazwę użytkownika oraz hasło i spróbować ponownie."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "Nie można połączyć się z serwerem Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Nie można połączyć się z serwerem {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "Nie można określić uprawnień katalogu dla delegatów."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "Nie można znaleźć systemu Exchange Web Storage."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Nie można odnaleźć serwera {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Nie można uczynić {0} delegatem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Nie można odczytać uprawnień katalogu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "Nie można odczytać uprawnień katalogu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "Nie można odczytać stanu Poza biurem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "Nie można zaktualizować uprawnień katalogu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "Nie można uaktualnić stanu Poza biurem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"Aby wczytać skrzynkę pocztową subskrybowanego użytkownika, należy uruchomić "
-"ponownie program Evolution."
+msgstr "Aby wczytać skrzynkę pocztową subskrybowanego użytkownika, należy uruchomić ponownie program Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Konto Exchange jest w trybie offline."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17422,105 +16994,100 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Aktualizacja delegatów nie powiodła się:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Katalog już istnieje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Katalog nie istnieje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Katalog bez połączenia"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Błąd ogólny"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Serwera globalnego katalogu nie jest dostępny"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Jeśli program OWA uruchamiany jest z innej ścieżki, należy podać ją w oknie "
-"konfiguracji konta."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "Jeśli program OWA uruchamiany jest z innej ścieżki, należy podać ją w oknie konfiguracji konta."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Skrzynka {0} nie znajduje się na tym serwerze."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Proszę sprawdzić URL i spróbować ponownie."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Proszę sprawdzić zapis nazwy serwera i spróbować ponownie."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "Proszę sprawdzić nazwę użytkownika oraz hasło i spróbować ponownie."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "Nie określono serwera globalnego katalogu dla tego konta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "Brak skrzynki użytkownika {0} na {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Brak użytkownika {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "Hasło zmienione."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "Proszę podać ID delegata lub odznaczyć opcję \"Wyślij jako delegat\"."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
-msgstr ""
-"Proszę upewnić się że nazwa globalnego serwera katalogowego jest poprawna."
+msgstr "Proszę upewnić się że nazwa globalnego serwera katalogowego jest poprawna."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Proszę uruchomić ponownie Evolution aby zastosować zmiany"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Proszę wybrać użytkownika."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "Hasło jest zbyt słabe i zostało odrzucone przez serwer."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Konto Exchange zostanie wyłączone po zamknięciu Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Konto Exchange zostanie usunięte po zamknięciu Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Serwer Exchange nie jest kompatybilny z wtyczką Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17528,7 +17095,7 @@ msgstr ""
 "Na serwerze znajduje się Exchange 5.5. Exchange Connector\n"
 "obsługuje tylko Microsoft Exchange 2000 i 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17542,96 +17109,80 @@ msgstr ""
 "\n"
 "Problemem może być także błędne hasło."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Proszę spróbować ponownie z innym hasłem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "Nie można dodać użytkownika do listy praw dostępu:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "Nie można edytować delegatów."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "Nieznany błąd podczas wyszukiwania {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Nieznany typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "Nieobsługiwana operacja"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Rozmiar poczty na serwerze zbliża się do wartości przydziału."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr ""
-"Dozwolone jest wysyłanie wiadomości w imieniu tylko jednego użytkownika na "
-"raz."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You are permitted to send a message on behalf of only one delegator at a time."
+msgstr "Dozwolone jest wysyłanie wiadomości w imieniu tylko jednego użytkownika na raz."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Nie można uczynić samego siebie własnym delegatem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Przekroczono przydział miejsca dla poczty na serwerze."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Można skonfigurować tylko pojedyncze konto Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Bieżące użycie dysku to: {0} KB. Proszę usunąć część poczty i zwolnić "
-"miejsce."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"Bieżące użycie dysku to: {0} KB. Nie będzie można wysyłać i/lub odbierać "
-"poczty."
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "Bieżące użycie dysku to: {0} KB. Proszę usunąć część poczty i zwolnić miejsce."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Bieżące użycie dysku to: {0} KB. Nie będzie można wysyłać poczty do czasu "
-"zwolnienia miejsca."
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgstr "Bieżące użycie dysku to: {0} KB. Nie będzie można wysyłać i/lub odbierać poczty."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "Bieżące użycie dysku to: {0} KB. Nie będzie można wysyłać poczty do czasu zwolnienia miejsca."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Hasło wygasło."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} nie może być dodany do listy dostępu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} jest już delegatem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} jest już na liście"
 
@@ -17652,12 +17203,8 @@ msgid "The default command that must be used as the editor."
 msgstr "Domyślne polecenie używane do uruchomienia edytora."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"Wtyczka umożliwiająca pisanie wiadomości w zewnętrznym edytorze. Można "
-"wysyłać tylko wiadomości tekstowe."
+msgid "A plugin for using an external editor as the composer. You can send only plain-text messages."
+msgstr "Wtyczka umożliwiająca pisanie wiadomości w zewnętrznym edytorze. Można wysyłać tylko wiadomości tekstowe."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17673,20 +17220,12 @@ msgid "Editor not launchable"
 msgstr "Nie można uruchomić edytora"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr ""
-"Nie można utworzyć tymczasowego pliku do zapisu wiadomości. Proszę spróbować "
-"później."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr "Nie można utworzyć tymczasowego pliku do zapisu wiadomości. Proszę spróbować później."
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"Ustawiony w preferencjach wtyczki zewnętrzny edytor nie może być "
-"uruchomiony. Proszę ustawić inny edytor."
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr "Ustawiony w preferencjach wtyczki zewnętrzny edytor nie może być uruchomiony. Proszę ustawić inny edytor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17721,14 +17260,8 @@ msgid "_Face"
 msgstr "_Obraz"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
-msgstr ""
-"Dołącza nagłówek Face do wysyłanych wiadomości. Najpierw należy wybrać obraz "
-"png 48x48. Jest on kodowany za pomocą base64 i przechowywany w ~/.evolution/"
-"faces. Następnie będzie on używany w wysyłanych wiadomościach."
+msgid "Attach Face header to outgoing messages. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces This will be used in messages that are sent further."
+msgstr "Dołącza nagłówek Face do wysyłanych wiadomości. Najpierw należy wybrać obraz png 48x48. Jest on kodowany za pomocą base64 i przechowywany w ~/.evolution/faces. Następnie będzie on używany w wysyłanych wiadomościach."
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -17736,9 +17269,9 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Odsubskrybowanie katalogu \"%s\""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-"Umożliwia anulowanie skubskrypcji katalogów w menu kontekstowym drzewa."
+#, fuzzy
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr "Umożliwia anulowanie skubskrypcji katalogów w menu kontekstowym drzewa."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17750,24 +17283,18 @@ msgstr "O_dsubskrybuj"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Proszę wprowadzić najpierw nazwę użytkownika."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Proszę wprowadzić hasło dostępu do subskrybowanych kalendarzy dla "
-"użytkownika %s."
+msgstr "Proszę wprowadzić hasło dostępu do subskrybowanych kalendarzy dla użytkownika %s."
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:540
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17776,21 +17303,22 @@ msgstr ""
 "Nie można odczytać danych z serwera Google:\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "_Kalendarz:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "Pobierz _listę"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Serwer</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+#, fuzzy
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Wtyczka do ustawień kalendarza i kontaktów Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17802,11 +17330,13 @@ msgid "Checklist"
 msgstr "Lista sprawdzania"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "Wtyczka do ustawień kalendarzy i kontaktów groupwise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "Ustawienia konta Groupwise"
 
 #: ../plugins/groupwise-features/install-shared.c:220
@@ -17864,7 +17394,7 @@ msgid "Email:"
 msgstr "E-mail:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Wyłącz"
 
@@ -17881,12 +17411,8 @@ msgid "Message Retract"
 msgstr "Wycofywanie wiadomości"
 
 #: ../plugins/groupwise-features/mail-retract.c:58
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
-msgstr ""
-"Wycofanie wiadomości może usunąć ją ze skrzynki pocztowej odbiorcy. Na pewno "
-"to zrobić?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+msgstr "Wycofanie wiadomości może usunąć ją ze skrzynki pocztowej odbiorcy. Na pewno to zrobić?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17897,15 +17423,18 @@ msgid "Retract Mail"
 msgstr "Wycofaj pocztę"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#, fuzzy
+msgid "Add Send Options to GroupWise messages"
 msgstr "Dodanie opcji wysyłania do wiadomości groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Wtyczka obsługująca funkcje kont GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Opcje Groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17922,62 +17451,60 @@ msgstr "Serwer nie zezwolił na wycofanie wybranej wiadomości."
 msgid "Invalid user"
 msgstr "Nieprawidłowy użytkownik"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Nie można nadać dostępu pełnomocnika użytkownikowi &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Określenie użytkownika"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Temu użytkownikowi nadano już uprawnienia pełnomocnika."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Aby nadać uprawnienia pełnomocnika, należy określić poprawną nazwę "
-"użytkownika."
+msgstr "Aby nadać uprawnienia pełnomocnika, należy określić poprawną nazwę użytkownika."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Konto o nazwie &quot;{0}&quot; już istnieje. Proszę sprawdzić drzewo "
-"katalogów."
+msgstr "Konto o nazwie &quot;{0}&quot; już istnieje. Proszę sprawdzić drzewo katalogów."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
 msgstr "Konto już istnieje"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Logowanie jako pełnomocnik &quot;{0}&quot; zakończone niepowodzeniem. Proszę "
-"sprawdzić adres e-mail i spróbować ponownie."
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "Logowanie jako pełnomocnik &quot;{0}&quot; zakończone niepowodzeniem. Proszę sprawdzić adres e-mail i spróbować ponownie."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "To jest powtarzające się zebranie"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Zaakceptować je?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Odrzucić je?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr ""
-"Nie można współużytkować katalogu z podanym użytkownikiem &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Nie można współużytkować katalogu z podanym użytkownikiem &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Należy określić użytkownika do dodania do listy"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -18078,8 +17605,8 @@ msgstr "<b>Nazwa konta</b>"
 msgid "Proxy Login"
 msgstr "Login proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -18089,18 +17616,25 @@ msgstr "%sProszę zprowadzić hasło dla %s (użytkownik %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Logowanie pełnomocnika..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Karta pełnomocnik jest dostępna gdy konto jest w trybie online."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Karta pełnomocnik jest dostępna gdy konto jest włączone."
 
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Zaawansowane opcje wysyłania"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
@@ -18130,56 +17664,56 @@ msgstr "Dodaj"
 msgid "Modify"
 msgstr "Modyfikuj"
 
-#: ../plugins/groupwise-features/status-track.c:107
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Stan wiadomości"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:121
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Temat:"
 
-#: ../plugins/groupwise-features/status-track.c:135
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "Od:"
 
-#: ../plugins/groupwise-features/status-track.c:150
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Data utworzenia:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Odbiorca:"
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Dostarczono:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Otwarto:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Zaakceptowano:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Usunięto:"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Odrzucono:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Zakończono:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Niedostarczone:"
 
-#: ../plugins/groupwise-features/status-track.c:251
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Śledź status wiadomości..."
 
@@ -18217,8 +17751,7 @@ msgstr "Pobierz _wszystkie nagłówki"
 
 #: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "Dodatkowe nagłówki, które należy pobrać poza standardowymi.\n"
@@ -18287,24 +17820,16 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr "Nie wczytano usługi  Hardware Abstraction Layer"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"Wymagana usługa \"hald\" nie jest uruchomiona. Proszę uruchomić usługę i "
-"uruchomić ten program ponownie lub skontaktować się z administratorem."
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "Wymagana usługa \"hald\" nie jest uruchomiona. Proszę uruchomić usługę i uruchomić ten program ponownie lub skontaktować się z administratorem."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Wyszukiwanie odtwarzacza iPod zakończone niepowodzeniem"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Nie można znaleźć urządzenia iPod do synchronizacji. Być może nie jest ono "
-"podłączone do komputera lub włączone."
+msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
+msgstr "Nie można znaleźć urządzenia iPod do synchronizacji. Być może nie jest ono podłączone do komputera lub włączone."
 
 #: ../plugins/ipod-sync/ical-format.c:119
 #: ../plugins/save-calendar/ical-format.c:164
@@ -18312,10 +17837,8 @@ msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Synchronizuje wybrane zadanie/notatkę/kalendarz/książkę adresową z Apple iPod"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "Synchronizuje wybrane zadanie/notatkę/kalendarz/książkę adresową z Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -18325,192 +17848,183 @@ msgstr "Synchronizuj z iPod"
 msgid "iPod Synchronization"
 msgstr "Synchronizacja z iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nie można wczytać kalendarza '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Spotkanie w kalendarzu '%s' koliduje z tym zebraniem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Znaleziono spotkanie w kalendarzu '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:741
 msgid "Unable to find any calendars"
 msgstr "Nie można znaleźć żadnego kalendarza"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:748
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nie można znaleźć tego zebrania w żadnym kalendarzu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find this task in any task list"
 msgstr "Nie można znaleźć tego zadania w żadnej liście"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:756
 msgid "Unable to find this memo in any memo list"
 msgstr "Nie można znaleźć tej notatki w żadnej liście"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:827
 msgid "Searching for an existing version of this appointment"
 msgstr "Wyszukiwanie istniejącej wersji spotkania"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:996
 msgid "Unable to parse item"
 msgstr "Nie można przeanalizować elementu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1054
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nie można wysłać elementu do kalendarza \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1066
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Wysłane do kalendarza \"%s\" jako zaakceptowane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Wysłane do kalendarza \"%s\" jako wstępne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1075
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Wysłane do kalendarza \"%s\" jako odrzucone"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Wysłane do kalendarza '%s' jako odwołane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1174
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator usunął delegata %s."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1181
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Wysłano informację o odwołaniu do delegata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1183
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nie można wysłać informacji o odwołaniu do delegata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1318
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nie można uaktualnić uczestnika. \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1322
 msgid "Attendee status updated"
 msgstr "Stan uczestnika został uaktualniony"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Meeting information sent"
 msgstr "Wysłano informacje o zebraniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 msgid "Task information sent"
 msgstr "Wysłano informacje o zadaniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1354
 msgid "Memo information sent"
 msgstr "Wysłano informacje o notatce"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nie można wysłać informacji o zebraniu. Zebranie nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nie wysłać informacji dot. tego zadania. Zadanie nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1369
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nie można wysłać informacji o notatce. Notatka nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "The calendar attached is not valid"
 msgstr "Przypisany kalendarz jest niepoprawny"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1450
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Wiadomość zawiera kalendarz, ale nie jest on formatu iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1490
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The item in the calendar is not valid"
 msgstr "Element w kalendarzu nie jest poprawny"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"Wiadomość zawiera kalendarz, ale nie zawiera on zdarzeń, zadań lub "
-"informacji o zajętości"
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1601
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Wiadomość zawiera kalendarz, ale nie zawiera on zdarzeń, zadań lub informacji o zajętości"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1530
 msgid "The calendar attached contains multiple items"
 msgstr "Załączony kalendarz zawiera wiele elementów"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Aby przetworzyć wszystkie elementy, należy zapisać plik, a następnie "
-"zaimportować kalendarz"
+#: ../plugins/itip-formatter/itip-formatter.c:1531
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "Aby przetworzyć wszystkie elementy, należy zapisać plik, a następnie zaimportować kalendarz"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2240
 msgid "This meeting recurs"
 msgstr "Spotkanie powtarzalne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2243
 msgid "This task recurs"
 msgstr "Zadanie powtarzalne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2246
 msgid "This memo recurs"
 msgstr "Notatka powtarzalna"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "_Delete message after acting"
 msgstr "_Usunięcie wiadomości po wykonaniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2492
+#: ../plugins/itip-formatter/itip-formatter.c:2524
 msgid "Conflict Search"
 msgstr "Wyszukiwanie konfliktów"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2507
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Proszę wybrać kalendarze w celu wyszukania kolidujących zebrań"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:189
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Dziś"
 
@@ -18683,8 +18197,7 @@ msgstr "<b>%s</b> delegował następujące zebranie:"
 #: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
-"<b>%s</b> poprzez %s zwraca się o twoją obecność na następującym zebraniu:"
+msgstr "<b>%s</b> poprzez %s zwraca się o twoją obecność na następującym zebraniu:"
 
 #: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
@@ -18703,25 +18216,18 @@ msgstr "<b>%s</b> chce dodania do istniejącego zebrania:"
 
 #: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> poprzez %s chce otrzymać najświeższe informacje o następującym "
-"zebraniu:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> poprzez %s chce otrzymać najświeższe informacje o następującym zebraniu:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> chce otrzymać najświeższe informacje o następującym zebraniu:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> chce otrzymać najświeższe informacje o następującym zebraniu:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr ""
-"<b>%s</b> poprzez %s odesłał(a) następującą odpowiedź odnośnie zebrania:"
+msgstr "<b>%s</b> poprzez %s odesłał(a) następującą odpowiedź odnośnie zebrania:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
@@ -18795,26 +18301,17 @@ msgstr "<b>%s</b> chce dodania do istniejącego zadania:"
 
 #: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> poprzez %s chce otrzymać najświeższe informacje o następującym "
-"przypisanym zadaniu:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> poprzez %s chce otrzymać najświeższe informacje o następującym przypisanym zadaniu:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> chce otrzymać najświeższe informacje o przypisanym następującym "
-"zadaniu:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> chce otrzymać najświeższe informacje o przypisanym następującym zadaniu:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> poprzez %s odesłał(a) odpowiedź dot. przypisanego zadania:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
@@ -18834,10 +18331,8 @@ msgstr "<b>%s</b> anulował(a) następujące przypisane zadanie:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> poprzez %s zaproponował(a) następujące zmiany przypisania zadania:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> poprzez %s zaproponował(a) następujące zmiany przypisania zadania:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
@@ -18970,11 +18465,11 @@ msgstr "_Zastosuj do wszystkich instancji"
 msgid "Show time as _free"
 msgstr "Wyświetlanie czasu jako _wolny"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Zadania :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Notatki :"
 
@@ -18987,24 +18482,18 @@ msgid "Itip Formatter"
 msgstr "Formater 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;?"
-msgstr ""
-"&quot;{0}&quot; wydelegował zebranie. Czy dodać delegata &quot;{1}&quot; ?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgstr "&quot;{0}&quot; wydelegował zebranie. Czy dodać delegata &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "To zebranie zostało oddelegowane."
 
 #: ../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 ""
-"Ta odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako "
-"uczestnika?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Ta odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako uczestnika?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Wyloguj z proxy"
 
@@ -19037,12 +18526,8 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Generuje komunikat D-BUS po otrzymaniu nowych wiadomości."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"Jeśli ma wartość \"true\" to dźwięk systemowy, w innym wypadku odegra plik "
-"dźwiękowy gdy nadejdzie nowa wiadomość."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr "Jeśli ma wartość \"true\" to dźwięk systemowy, w innym wypadku odegra plik dźwiękowy gdy nadejdzie nowa wiadomość."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -19066,20 +18551,15 @@ msgstr "Nazwa pliku dźwiękowego do odtworzenia."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr ""
-"Nazwa pliku dźwiękowego do odtworzenia, jeśli nie jest aktywny dzwonek "
-"systemowy."
+msgstr "Nazwa pliku dźwiękowego do odtworzenia, jeśli nie jest aktywny dzwonek systemowy."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"Określa czy po otrzymaniu nowej wiadomości odegrać dźwięk czy dzwonek "
-"systemowy."
+msgstr "Określa czy po otrzymaniu nowej wiadomości odegrać dźwięk czy dzwonek systemowy."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Określa czy wyświetlać informacje nad ikoną gdy nadejdzie nowa wiadomość."
+msgstr "Określa czy wyświetlać informacje nad ikoną gdy nadejdzie nowa wiadomość."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -19087,23 +18567,22 @@ msgstr "Określa czy ikona powinna mrugać."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
-msgstr ""
-"Określa czy powiadamiać o nowych wiadomościach tylko dla katalogu Odebrane."
+msgstr "Określa czy powiadamiać o nowych wiadomościach tylko dla katalogu Odebrane."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Generacja komunikatu _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Powiadamianie o nowych wiadomościach"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Właściwości powiadamiania o nowych wiadomościach"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19121,7 +18600,7 @@ msgstr[2] ""
 "%d nowych wiadomości\n"
 "w katalogu %s"
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19129,67 +18608,61 @@ msgstr[0] "Nadeszła %d nowa wiadomość."
 msgstr[1] "Nadeszły %d nowe wiadomości."
 msgstr[2] "Nadeszło %d nowych wiadomości."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Nowa wiadomość"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Wyświetlanie i_kony z w obszarze powiadamiania"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "_Mruganie ikony w obszarze powiadamiania"
 
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "O_kno informacyjne wraz z ikoną"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej wiadomości"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "D_zwonek systemowy"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Odt_worzenie pliku dźwiękowego"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Nazwa p_liku:"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Plik dźwiękowy"
 
-#: ../plugins/mail-notification/mail-notification.c:750
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Od_twórz"
 
-#: ../plugins/mail-notification/mail-notification.c:807
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Powiadamianie tylko dla katalogu _Odebrane"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr ""
-"Generuje komunikat D-Bus lub powiadamia o nowych wiadomościach za pomocą "
-"ikony w polu systemowym i powiadomienia."
+msgid "Generates a D-Bus message or notifies the user with an icon in notification area and a notification message whenever a new message has arrived."
+msgstr "Generuje komunikat D-Bus lub powiadamia o nowych wiadomościach za pomocą ikony w polu systemowym i powiadomienia."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Powiadamianie o nowych wiadomościach"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
 msgstr "Wtyczka umożliwiająca tworzenie zebrań z treści wiadomości."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
@@ -19206,17 +18679,11 @@ msgid "Cannot open calendar. %s"
 msgstr "Nie można otworzyć kalendarza. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:292
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr ""
-"Wybrane źródło jest tylko do odczytu i nie można utworzyć tutaj zadania. "
-"Proszę wybrać inne źródło."
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr "Wybrane źródło jest tylko do odczytu i nie można utworzyć tutaj zadania. Proszę wybrać inne źródło."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
 msgstr "Wtyczka umożliwiająca tworzenie zadań z treści wiadomości."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
@@ -19254,10 +18721,8 @@ msgid "Mailing _List"
 msgstr "_Lista dyskusyjna"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"Akcje dla typowych poleceń listy pocztowej (subscribe, unsubscribe, ...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr "Akcje dla typowych poleceń listy pocztowej (subscribe, unsubscribe, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19277,17 +18742,13 @@ msgstr "Czynność nie jest dostępna"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"Wiadomość e-mail zostanie wysłana na adres URL \"{0}\". Można wysłać "
-"wiadomość automatycznie, albo przejrzeć i zmienić ją.\n"
+"Wiadomość e-mail zostanie wysłana na adres URL \"{0}\". Można wysłać wiadomość automatycznie, albo przejrzeć i zmienić ją.\n"
 "\n"
-"W krótkim czasie po wysłaniu wiadomości, powinna nadejść odpowiedź z listy "
-"dyskusyjnej."
+"W krótkim czasie po wysłaniu wiadomości, powinna nadejść odpowiedź z listy dyskusyjnej."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -19302,27 +18763,21 @@ msgid "Posting not allowed"
 msgstr "Wysyłanie nie jest dozwolone"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Wysyłanie na tą listę dyskusyjną nie jest dozwolone. Prawdopodobnie, jest to "
-"lista tylko do odczytu. W celu uzyskania szczegółów skontaktuj się z "
-"właścicielem listy."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Wysyłanie na tę listę dyskusyjną nie jest dozwolone. Prawdopodobnie, jest to lista tylko do odczytu. W celu uzyskania szczegółów skontaktuj się z właścicielem listy."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Wysłać wiadomość e-mail na listę dyskusyjną?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Nie można wykonać czynności. Oznacza to, że nagłówek nie zawiera żadnej "
-"obsługiwanej czynności.\n"
+"Nie można wykonać czynności. Oznacza to, że nagłówek nie zawiera żadnej obsługiwanej czynności.\n"
 "\n"
 "Nagłówek: {0}"
 
@@ -19337,11 +18792,8 @@ msgstr ""
 "Nagłówek: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"Wiadomość nie zawiera informacji nagłówka koniecznych dla tej czynności."
+msgid "This message does not contain the header information required for this action."
+msgstr "Wiadomość nie zawiera informacji nagłówka koniecznych dla tej czynności."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -19404,12 +18856,8 @@ msgid "Also mark messages in subfolders?"
 msgstr "Czy oznaczyć także wiadomości w podkatalogach?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:41
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Oznaczyć jako przeczytane wiadomości tylko z bieżącego katalogu lub także z "
-"podkatalogów?"
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Oznaczyć jako przeczytane wiadomości tylko z bieżącego katalogu lub także z podkatalogów?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
@@ -19431,22 +18879,6 @@ msgstr "O_znacz wiadomości jako przeczytane"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Służy do oznaczania katalogów jako przeczytane"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Oznacz kalendarz jako offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Oznacza wybrnay kalendarz do przeglądania w trybie offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Nie udostępniaj w trybie offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Oznacz do użycia w trybie offline"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Wtyczka implementująca wtyczki mono."
@@ -19496,13 +18928,11 @@ msgstr "Wtyczka"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Testowa wtyczka demonstrująca formatowanie wiadomości (pozwala wyłączyć "
-"wiadomości HTML)\n"
+"Testowa wtyczka demonstrująca formatowanie wiadomości (pozwala wyłączyć wiadomości HTML)\n"
 "\n"
 "Ta wtyczka zawiera kod demonstracyjny i nie jest wspierana.\n"
 
@@ -19555,8 +18985,9 @@ msgstr "Położenia"
 msgid "_Publish Calendar Information"
 msgstr "_Publikuj informacje z kalendarza"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Czy na pewno usunąć ten adres URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19594,8 +19025,9 @@ msgid "Publishing _Frequency:"
 msgstr "_Częstotliwość publikacji"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19643,6 +19075,16 @@ msgstr ""
 "iCal\n"
 "Wolny/Zajęty"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+msgid "New Location"
+msgstr "Położenie"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+msgid "Edit Location"
+msgstr "Położenie"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -19660,83 +19102,78 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Wtyczka testowa dla modułu Python EPlugin loader."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+#, fuzzy
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Wtczka, która wczytuje inne wtyczki napisane w języku python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Python Loader"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (wbudowany)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Nie znaleziono programu SpamAssassin, kod %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Nie można utworzyć potoku: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Błąd po funkcji fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Proces potomny SpamAssassin nie odpowiada, usuwanie..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
-#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, fuzzy, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Przerwano oczekiwanie na proces potomny SpamAssassin, kończenie..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Błędny potok do programu SpamAssasin, kod błędu: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "Program SpamAssassin nie jest dostępny"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
-msgstr ""
-"Spowoduje to pewniejsze, ale również wolniejsze działanie programu "
-"SpamAssassin"
+msgstr "Spowoduje to pewniejsze, ale również wolniejsze działanie programu SpamAssassin"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_Dołączenie zewnętrznych testów"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Filtruje niechcianą pocztę za pomoca programu SpamAssassin. Wtyczka wymaga "
-"programu SpamAssassin."
+msgid "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed."
+msgstr "Filtruje niechcianą pocztę za pomoca programu SpamAssassin. Wtyczka wymaga programu SpamAssassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Wtyczka SpamAssassin "
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Opcje SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opcje SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Wtyczka SpamAssassin "
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
-"Wtyczka pozwalająca zapisać na raz wszystki załączniki lub części wiadomości."
+msgstr "Wtyczka pozwalająca zapisać na raz wszystki załączniki lub części wiadomości."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -19912,14 +19349,11 @@ msgstr "Witamy"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"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 ""
-"Wtamy w Evolution. Na kolejnych kilku ekranach będzie można podać "
-"informacje, które pozwolą na łączenie się z kontami e-mail oraz na "
-"importowanie plików z innych aplikacji. \n"
+"Witamy w Evolution. Na kolejnych kilku ekranach będzie można podać informacje, które pozwolą na łączenie się z kontami e-mail oraz na importowanie plików z innych aplikacji. \n"
 "\n"
 "Aby kontynuować, proszę nacisnąć przycisk \"Dalej\". "
 
@@ -19967,20 +19401,18 @@ msgid "F_all back to threading messages by subject"
 msgstr "Powrót do grupowania listów w wątki według _tematu"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "Lista kluczy/wartości dla wtyczki szablonów do zamiany w wiadomości."
 
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Bez tytułu"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Zapisz jako _szablon"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Zapisz jako szablon"
 
@@ -19989,7 +19421,8 @@ msgid "Drafts based template plugin"
 msgstr "Wtyczka wzorców w kopiach roboczych"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "Prosta wtyczka do dekodowania załączników tnef za pomocą ytnef."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -20015,7 +19448,8 @@ msgid "URL:"
 msgstr "Adres URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#, fuzzy
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unikanie IfMatch (wymagane dla apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20063,11 +19497,8 @@ msgid "Default window width"
 msgstr "Domyślna szerokość okna"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Włącza ustawienia pośrednika podczas łączenia się z witrynami HTTP/Secure "
-"HTTP."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Włącza ustawienia pośrednika podczas łączenia się z witrynami HTTP/Secure HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -20090,27 +19521,16 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID lub alias składnika domyślnie wyświetlanego przy uruchomieniu."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Jeśli włączone, to połączenia do serwera pośrednika wymagać będą "
-"uwierzytelniania. Nazwa użytkownika pobierana jest z klucza GConf  \"/apps/"
-"evolution/shell/network_config/authentication_user\", a hasło z bazy kluczy "
-"lub z pliku ~/.gnome2_private/Evolution."
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr "Jeśli włączone, to połączenia do serwera pośrednika wymagać będą uwierzytelniania. Nazwa użytkownika pobierana jest z klucza GConf  \"/apps/evolution/shell/network_config/authentication_user\", a hasło z bazy kluczy lub z pliku ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Ostatnia zaktualizowana wersja konfiguracji"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista ścieżek do katalogów synchronizowanych na dysk, dla użytku bez "
-"podłączenia do sieci"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Lista ścieżek do katalogów synchronizowanych na dysk, dla użytku bez podłączenia do sieci"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
@@ -20141,16 +19561,8 @@ msgid "Secure HTTP proxy port"
 msgstr "Port pośrednika bezpiecznego HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Wybór trybu konfiguracji pośrednika. Dostępne wartości to 0,1,2 i 3 "
-"oznaczające odpowiednio \"użycie ustawień systemowych\", \"bez pośrednika\", "
-"\"ręczna konfiguracja pośrednika\" oraz \"użycie konfiguracji pośrednika z "
-"adresu url autokonfiguracji\"."
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr "Wybór trybu konfiguracji pośrednika. Dostępne wartości to 0,1,2 i 3 oznaczające odpowiednio \"użycie ustawień systemowych\", \"bez pośrednika\", \"ręczna konfiguracja pośrednika\" oraz \"użycie konfiguracji pośrednika z adresu url autokonfiguracji\"."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -20160,7 +19572,8 @@ msgstr "Panel boczny jest wodoczny"
 msgid "Skip development warning dialog"
 msgstr "Pominięcie ostrzegawczego okna o rozwojowej wersji"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
@@ -20169,9 +19582,7 @@ msgid "Statusbar is visible"
 msgstr "Pasek stanu jest wodoczny"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Wersja konfiguracji Evolution z numerami wersji (np: \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
@@ -20187,12 +19598,8 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Domyślna szerokość paska bocznego, w pikselach."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"Ostatnio zaktualizowana wersja konfiguracji Evolution z numerami wersji (np: "
-"\"2.6.0\")."
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Ostatnio zaktualizowana wersja konfiguracji Evolution z numerami wersji (np: \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
@@ -20207,52 +19614,24 @@ msgid "The machine name to proxy socks through."
 msgstr "Nazwa komputera pośrednika sieciowego SOCKS."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Port na komputerze pośrednika określony przez \"/apps/evolution/shell/"
-"network_config/http_host\"."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgstr "Port na komputerze pośrednika określony przez \"/apps/evolution/shell/network_config/http_host\"."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Port na komputerze pośrednika określony przez \"/apps/evolution/shell/"
-"network_config/secure_host\"."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr "Port na komputerze pośrednika określony przez \"/apps/evolution/shell/network_config/secure_host\"."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Port na komputerze pośrednika określony przez \"/apps/evolution/shell/"
-"network_config/socks_host\"."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "Port na komputerze pośrednika określony przez \"/apps/evolution/shell/network_config/socks_host\"."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"Styl przycisków okna. Może być \"text\" (tekst), \"icons\" (ikony), \"both"
-"\" (oba), \"toolbar\" (pasek narzędziowy). Jeżeli ustawione jest \"toolbar"
-"\", styl przycisków jest określany przez ustawienia paska narzędziowego "
-"GNOME."
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "Styl przycisków okna. Może być \"text\" (tekst), \"icons\" (ikony), \"both\" (oba), \"toolbar\" (pasek narzędziowy). Jeżeli ustawione jest \"toolbar\", styl przycisków jest określany przez ustawienia paska narzędziowego GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
-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 "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Ten klucz zawiera listę komputerów, z którymi należy łączyć się "
-"bezpośrednio, a nie poprzez pośrednika (jeśli jest on aktywny). Dopuszczalne "
-"wartości klucza to nazwy hostów, domeny (za pomocą znaków zastępujących jak "
-"np: *.foo.com), adresy IP (IPv4 oraz IPv6) i adresy z maską sieciową (jak "
-"np: 192.168.0.0/24)."
+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 (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr "Ten klucz zawiera listę komputerów, z którymi należy łączyć się bezpośrednio, a nie poprzez pośrednika (jeśli jest on aktywny). Dopuszczalne wartości klucza to nazwy hostów, domeny (za pomocą znaków zastępujących jak np: *.foo.com), adresy IP (IPv4 oraz IPv6) i adresy z maską sieciową (jak np: 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
@@ -20272,9 +19651,7 @@ msgstr "Nazwa użytkownika uwierzytelniania dla pośrednika HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Określa, czy Evolution będzie uruchomiony w trybie bez podłączenia do sieci, "
-"zamiast z podłączeniem."
+msgstr "Określa, czy Evolution będzie uruchomiony w trybie bez podłączenia do sieci, zamiast z podłączeniem."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
@@ -20293,11 +19670,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Określa, czy pasek narzędzi jest widoczny."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Określa, czy okno ostrzegające o rozwojowej wersji Evolution nie będzie "
-"wyświetlane."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Określa, czy okno ostrzegające o rozwojowej wersji Evolution nie będzie wyświetlane."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
@@ -20321,20 +19695,15 @@ msgstr "Aktywne połączenia"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Proszę nacisnąć przycisk OK, aby zamknąć powyższe połączenia i przejść w "
-"tryb bez podłączenia do sieci"
+msgstr "Proszę nacisnąć przycisk OK, aby zamknąć powyższe połączenia i przejść w tryb bez podłączenia do sieci"
 
 #: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Typ importu:"
 
 #: ../shell/e-shell-importer.c:134
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Proszę wybrać typ pliku i plik do zaimportowania do programu Evolution."
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+msgstr "Proszę wybrać typ pliku i plik do zaimportowania do programu Evolution."
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -20379,7 +19748,8 @@ msgstr "Preferencje Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20412,23 +19782,20 @@ msgstr "GNOME PL Team <gnome-l10n@lists.aviary.pl>"
 msgid "Evolution Website"
 msgstr "Witryna WWW Evolution"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Błąd podczas otwierania witryny FAQ."
-
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "Praca _z podłączeniem"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Praca _bez podłączenia"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20436,11 +19803,11 @@ msgstr ""
 "Program Evolution jest w trybie online.\n"
 "Kliknięcie na tym przycisku przełącza w tryb offline."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Program Evolution jest w trakcie rozłączania z siecią."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20449,33 +19816,35 @@ msgstr ""
 "Kliknięcie na tym przycisku przełącza w tryb online."
 
 # FIXME - sprawdzić formę!!
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Przełącz do %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Nieznany błąd systemowy."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838
+#: ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261
+#: ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Nie można dokonać rejestracji na serwerze OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
@@ -20489,11 +19858,6 @@ msgstr "Utwórz"
 msgid "New Test"
 msgstr "Nowy test"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "_Test"
-
 #: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Tworzy nowy element testowy"
@@ -20521,8 +19885,9 @@ msgid "Importer Type"
 msgstr "Rodzaj importera"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Wybór importerów"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Katalog do którego odbędzie się import"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20539,7 +19904,7 @@ msgstr ""
 "zewnętrznych plików do Evolution ."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20574,7 +19939,7 @@ msgstr ""
 "Mamy nadzieję, że spodobają się Państwu wyniki naszej ciężkiej pracy,\n"
 "my zaś będziemy oczekiwać z niecierpliwością na na wsparcie!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20582,44 +19947,43 @@ msgstr ""
 "Dzięki\n"
 "Zespół Evolution\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Nie informuj ponownie"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Rozpoczyna Evolution aktywując podany komponent"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Rozpoczyna w trybie z podłączeniem"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Wymusza zamknięcie wszystkich komponentów Evolution"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Wymusza ponowną migrację z Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Zapisuje do pliku informacje dotyczące przebiegu wykonania komponentów."
+msgstr "Zapisuje do pliku informacje dotyczące przebiegu wykonania komponentów."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Wyłącza wczytywanie wtyczek."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Wyłącza okno podglądu wiadomości, kontaktów i zadań."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution - klient poczty i organizator informacji osobistych"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20633,90 +19997,74 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Czy na pewno usunąć wszystkie zapamiętane hasła?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ponowne uruchomienie Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Usunąć stare dane z wersji {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Nie można uruchomić Evolution."
 
-#: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Usunięcie zapamiętanych haseł spowoduje, że w razie potrzeby, trzeba będzie "
-"podać je ponownie."
+#: ../shell/shell.error.xml.h:6
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Usunięcie zapamiętanych haseł spowoduje, że w razie potrzeby, trzeba będzie podać je ponownie."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Zbyt mało miejsca na dysku do aktualizacji."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Na pewno usunąć stare dane?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
-"Cała zawartość katalogu  &quot;evolution&quot; zostanie bezpowrotnie "
-"usunięta.\n"
+"Cała zawartość katalogu  &quot;evolution&quot; zostanie bezpowrotnie usunięta.\n"
 "\n"
-"Przed usunięciem danych, warto upewnić się, czy wszystkie wiadomości, "
-"kontakty i dane kalendarza są obecne, oraz czy nowa wersja Evolution działa "
-"poprawnie.\n"
+"Przed usunięciem danych, warto upewnić się, czy wszystkie wiadomości, kontakty i dane kalendarza są obecne, oraz czy nowa wersja Evolution działa poprawnie.\n"
 "\n"
-"Po usunięciu danych, nie będzie można powrócić do poprzedniej wersji "
-"Evolution bez ręcznej interwencji.\n"
+"Po usunięciu danych, nie będzie można powrócić do poprzedniej wersji Evolution bez ręcznej interwencji.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 msgstr ""
 "Poprzednia wersja Evolution przechowywała dane w innym miejscu.\n"
 "\n"
-"Jeżeli wybrano usunięcie tych danych, wtedy zawartość całego katalogu &quot;"
-"evolution&quot; zostanie trwale skasowana. Jeżeli wybrano zachowanie tych "
-"danych, wtedy będzie można usunąć je ręcznie, zgodnie z własnymi "
-"potrzebami.\n"
+"Jeżeli wybrano usunięcie tych danych, wtedy zawartość całego katalogu &quot;evolution&quot; zostanie trwale skasowana. Jeżeli wybrano zachowanie tych danych, wtedy będzie można usunąć je ręcznie, zgodnie z własnymi potrzebami.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Aktualizacja z poprzedniej wersji nie powiodła się: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, ale "
-"dostępne jest tylko {1}.\n"
+"Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, ale dostępne jest tylko {1}.\n"
 "\n"
-"Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą "
-"kontynuacją."
+"Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą kontynuacją."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20726,7 +20074,7 @@ msgstr ""
 "\n"
 "Kliknij pomoc aby dowiedzieć się szczegółów"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20740,29 +20088,27 @@ msgstr ""
 "\n"
 "Kliknij pomoc aby dowiedzieć się szczegółów."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Usuń"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Zachowaj dane"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Przypomnij później"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być "
-"dostępna.\n"
+"Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być dostępna.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20776,23 +20122,12 @@ msgstr ""
 "Modyfikacja ustawień zaufania:"
 
 #: ../smime/gui/cert-trust-dialog.c:151
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Ponieważ zaufano ośrodkowi certyfikacji, który wystawił ten certyfikat, "
-"zaufano też autentyczności tego certyfikatu o ile tutaj nie wskazano inaczej"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Ponieważ zaufano ośrodkowi certyfikacji, który wystawił ten certyfikat, zaufano też autentyczności tego certyfikatu, o ile tutaj nie wskazano inaczej"
 
 #: ../smime/gui/cert-trust-dialog.c:155
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Ponieważ nie zaufano ośrodkowi certyfikacji, który wystawił ten certyfikat, "
-"nie zaufano też autentyczności tego certyfikatu o ile tutaj nie wskazano "
-"inaczej"
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Ponieważ nie zaufano ośrodkowi certyfikacji, który wystawił ten certyfikat, nie zaufano też autentyczności tego certyfikatu, o ile tutaj nie wskazano inaczej"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -20821,8 +20156,9 @@ msgstr "Nazwa certyfikatu"
 msgid "Purposes"
 msgstr "Zastosowania"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
@@ -20850,16 +20186,16 @@ msgstr "Przeglądarka certyfikatu: %s"
 #: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
-msgstr "Wprowadź hasło dla \"%s\""
+msgstr "Proszę wprowadzić hasło dla \"%s\""
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
-msgstr "Wprowadź nowe hasło dla bazy certyfikatów"
+msgstr "Proszę wprowadzić nowe hasło dla bazy certyfikatów"
 
 #: ../smime/gui/component.c:71
 msgid "Enter new password"
-msgstr "Wprowadź nowe hasło"
+msgstr "Proszę wprowadzić nowe hasło"
 
 # FIXME - może zamiast temat dać przedmiot?
 #. FIXME: add serial no, validity date, uses
@@ -20915,8 +20251,7 @@ msgstr "<b>Wydany dla</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
-"<b>Niniejszy certyfikat został zweryfikowany dla następującego użytku:</b>"
+msgstr "<b>Niniejszy certyfikat został zweryfikowany dla następującego użytku:</b>"
 
 #: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -20935,15 +20270,11 @@ msgid "Backup All"
 msgstr "Kopia zapasowa wszystkich"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Przed zaufaniem ośrodka certyfikacji dla dowolnego przeznaczenia, należy "
-"zapoznać się z jego certyfikatem oraz procedurami bezpieczeństwa (o ile są "
-"dostępne)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Przed zaufaniem ośrodka certyfikacji dla dowolnego przeznaczenia, należy zapoznać się z jego certyfikatem oraz procedurami bezpieczeństwa (o ile są dostępne)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certyfikat"
 
@@ -21019,46 +20350,43 @@ msgstr "Jednostka organizacyjna (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odcisk SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certyfikat klienta SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certyfikat serwera SSL"
 
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
-msgstr "Zaufanie do autentyczności tego certyfikatu"
+msgstr "Zaufaj autentyczności tego certyfikatu"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "Zaufane CA do identyfikacji użytkowników e-mail."
+msgstr "Zaufaj temu CA do identyfikowania użytkowników e-mail."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "Zaufane CA do identyfikowania twórców oprogramowania."
+msgstr "Zaufaj temu CA do identyfikowania twórców oprogramowania."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr "Zaufane CA do identyfokowania stron WWW."
+msgstr "Zaufaj temu CA do identyfikowania stron WWW."
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Wyświetl"
 
-# FIXME - jak to inaczej zformułować?
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"Dostępne są certyfikaty identyfikujące Ciebie z następujących instytucji:"
+msgstr "Użytkownik posiada certyfikaty identyfikujące z następujących instytucji:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"W ewidencji dostępne są certyfikaty identyfikujące nastepujące ośrodki "
-"certyfikacji:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "W ewidencji dostępne są certyfikaty identyfikujące następujące ośrodki certyfikacji:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -21074,184 +20402,189 @@ msgid "_Edit CA Trust"
 msgstr "_Modyfikuj zaufanie CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "Certyfikat już istnieje"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222
+#: ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Wersja"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Wersja 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Wersja 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Wersja 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD2 z RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD5 z RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 SHA-1 z RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Użycie klucza certyfikatu"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Rodzaj certyfikatu Natscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Identyfikator klucza ośrodka certyfikacji"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identyfikator algorytmu (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identyfikator algorytmu"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parametry algorytmu"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Informacja klucza publicznego tematu"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algorytm klucza publicznego tematu"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Klucz publiczny tematu"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793
+#: ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Błąd: Nie można przetworzyć rozszerzenia"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814
+#: ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Podpisujący obiekt"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Ośrodek certyfikacji SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Ośrodek certyfikacji e-mail"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Podpisywanie"
 
 # FIXME - albo nieodrzucanlne
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Nie odrzucone"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Kodowanie klucza"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Kodowanie danych"
 
 # FIXME - albo kluczowe uzgodnienie?
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Uzgodnienie kluczy"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Podpisujący certyfikat"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "Podpisujący CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Krytyczne"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924
+#: ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Nie krytyczne"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075
+#: ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
-msgstr "Błędny podpis certyfikatu"
+msgstr "Algorytm podpisu certyfikatu"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Wystawiający"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Unikalne ID wystawiającego"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Unikalne ID tematu"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Hasło pliku PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Wprowadź hasło dla pliku PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Zaimportowany certyfikat"
 
@@ -21284,20 +20617,23 @@ msgstr "_Kopiuj wszystkie kontakty do..."
 msgid "Contact _Preview"
 msgstr "_Podgląd kontaktu"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Skopiuj"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Copy selected contacts to another folder"
 msgstr "Kopiuj wybrane kontakty do innego katalogu..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Kopiuje kontakty z wybranego katalogu do innego katalogu"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
@@ -21309,12 +20645,14 @@ msgstr "Skopiuj do katalogu..."
 msgid "Create a new address book folder"
 msgstr "Tworzy nowy katalog książki adresowej"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
@@ -21339,7 +20677,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Pr_zenieś kontakty do..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Move selected contacts to another folder"
 msgstr "Przenosi wybrane kontakty do innego katalogu..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -21350,12 +20689,14 @@ msgstr "Przenosi kontakty z wtbranego katalogu do innego katalogu"
 msgid "Move to Folder..."
 msgstr "Przenieś do katalogu..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Wklej"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Wkleja zawartość schowka"
 
@@ -21380,14 +20721,16 @@ msgid "Save as VCard..."
 msgstr "Zapisz jako VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+msgid "Save selected contacts as a VCard"
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Zapisuje kontakty z wybranego katalogu w formacie VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
@@ -21400,7 +20743,8 @@ msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts"
 msgstr "Wysyła wiadomość do wybranych kontaktów."
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -21408,7 +20752,8 @@ msgid "Send message to contact"
 msgstr "Wyślij wiadomość do kontaktu"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+msgid "Send selected contacts to another person"
 msgstr "Wysyła zaznaczone kontakty do innej osoby."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -21431,7 +20776,8 @@ msgstr "Zatrzymuje wczytywanie"
 msgid "View the current contact"
 msgstr "Wyświetla bieżący kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Akcje"
@@ -21460,7 +20806,8 @@ msgstr "_Przenieś kontakt do..."
 msgid "_Move Folder Contacts To"
 msgstr "P_rzenieś katalog kontaktów do"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nowy"
 
@@ -21520,7 +20867,8 @@ msgstr "Lista"
 msgid "Month"
 msgstr "Miesiąc"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Następny"
@@ -21529,7 +20877,8 @@ msgstr "Następny"
 msgid "Previews the calendar to be printed"
 msgstr "Wyświetla podgląd kalendarza w postaci przygotowanej do druku"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Poprzedni"
@@ -21538,7 +20887,8 @@ msgstr "Poprzedni"
 msgid "Print this calendar"
 msgstr "Drukuje zawartość kalendarza"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Opróżn_ij"
 
@@ -21587,14 +20937,24 @@ msgid "View the current appointment"
 msgstr "Wyświetla bieżące spotkanie"
 
 #: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Proszę otworzyć konsolę debug aby odczytać wpisy dziennika"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Tydzień"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Tydzień roboczy"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "Dziennik _debugowania"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Otwórz spotkanie"
 
@@ -21626,7 +20986,8 @@ msgstr "Pobiera wiadomości z kont/katalogów zaznaczonych do trybu offline"
 msgid "Empty _Trash"
 msgstr "Opróżnij śmie_tnik"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "_Katalog"
 
@@ -21661,13 +21022,7 @@ msgstr "Wyświetla podgląd wiadomości w wydzielonej części okna"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Pozwala za zasubskrybowanie lub odsubskrybowanie katalogów na zdalnych "
-"serwerach"
-
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Proszę otworzyć konsolę debug aby odczytać wpisy dziennika"
+msgstr "Pozwala za zasubskrybowanie lub odsubskrybowanie katalogów na zdalnych serwerach"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -21677,10 +21032,6 @@ msgstr "Widok _klasyczny"
 msgid "_Copy Folder To..."
 msgstr "S_kopiuj katalog do..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Dziennik _debugowania"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Pobierz wiadomości do trybu offline"
@@ -21705,7 +21056,7 @@ msgstr "_Podgląd"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "_Subskrypcje..."
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21762,11 +21113,8 @@ msgid "Hide _Read Messages"
 msgstr "Ukryj prz_eczytane wiadomości"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Ukrywa wiadomości oznaczone do usunięcia, zamiast wyświetlania ich z "
-"przekreśleniem"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Ukrywa wiadomości oznaczone do usunięcia, zamiast wyświetlania ich z przekreśleniem"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -21788,10 +21136,6 @@ msgstr "Trwale usuwa z bieżącego katalogu wiadomości oznaczone do usunięcia"
 msgid "Permanently remove this folder"
 msgstr "Trwale usuwa dany katalog"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "O_dśwież"
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Odświeżanie katalogu"
@@ -21810,8 +21154,7 @@ msgstr "_Zaznacz wszystkie wiadomości"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-"Zaznacza wszystkie wiadomości (i tylko te), które obecnie nie są zaznaczone"
+msgstr "Zaznacza wszystkie wiadomości (i tylko te), które obecnie nie są zaznaczone"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -21849,7 +21192,8 @@ msgstr "Przełącza grupowanie wiadomości w wątki"
 msgid "_Group By Threads"
 msgstr "_Grupuj według wątków"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "Wia_domość"
@@ -22018,8 +21362,7 @@ msgstr "Przesyła zaznaczoną wiadomość do innej osoby w treści nowej wiadomo
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"Przesyła zaznaczoną wiadomość do innej osoby zacytowany jak przy odpowiedzi"
+msgstr "Przesyła zaznaczoną wiadomość do innej osoby zacytowany jak przy odpowiedzi"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
@@ -22178,7 +21521,8 @@ msgstr "Zaznacz _cały tekst"
 msgid "Select all the text in a message"
 msgstr "Zaznacza cały tekst we wiadomości"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Ustala ustawienia strony bieżącej drukarki"
 
@@ -22309,7 +21653,8 @@ msgstr "Po_większ"
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Główny pasek narzędziowy"
 
@@ -22523,8 +21868,7 @@ msgstr "Wysyła zgłoszenie błędu za pomocą Bug Buddy"
 
 #: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
-msgstr ""
-"Przełącza pomiędzy trybami pracy z podłączeniem i bez podłączenia do sieci."
+msgstr "Przełącza pomiędzy trybami pracy z podłączeniem i bez podłączenia do sieci."
 
 #: ../ui/evolution.xml.h:36
 msgid "Tool_bar Style"
@@ -22598,7 +21942,8 @@ msgstr "Według _firmy"
 msgid "_Address Cards"
 msgstr "Karty _adresowe"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Widok _listy"
 
@@ -22689,12 +22034,10 @@ msgstr "Lista rozwijana stref czasowych"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Za pomocą lewego przycisku myszy można powiększyć fragment mapy i wybrać "
-"strefę czasową.\n"
+"Za pomocą lewego przycisku myszy można powiększyć fragment mapy i wybrać strefę czasową.\n"
 "Przyciśnięcie prawego przycisku przywraca zwykłe powiększenie."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
@@ -22719,7 +22062,7 @@ msgid "Define Views for \"%s\""
 msgstr "Definicja widoków dla \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
@@ -22742,42 +22085,42 @@ msgid "_Replace existing view"
 msgstr "_Zamień istniejący widok"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Własny widok"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Zapis własnego widoku"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Zdefiniuj widoki..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "_Bieżący widok"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Widok: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Bieżący widok jest zmodyfikowany"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Zapisz zmodyfikowany widok..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Zapisz bieżący widok"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Tworzy lub modyfikuje widoki"
 
@@ -22801,17 +22144,20 @@ msgstr "Typ widoku"
 msgid "Type of view:"
 msgstr "Typ widoku:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Pasek załącznika"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290
+#: ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590
+#: ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie można załączyć pliku %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298
+#: ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie można załączyć pliku %s: to nie jest zwykły plik"
@@ -22841,76 +22187,83 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Kalendarz miesięczny"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455
 #: ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Kolor wypełnienia"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469
+#: ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652
 #: ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "Kolor wypełnienia GDK"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476
 #: ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Wypełnienie kropkowane"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91
+#: ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Szerokość minimalna"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Szerokość minimalna"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-canvas-vbox.c:103
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Odstępy"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Teraz"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Czas musi być podany w formacie: %s"
 
-#: ../widgets/misc/e-cell-percent.c:78
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Wartość procentowa musi się zawierać w przedziale od 0 do 100 włącznie"
 
@@ -22970,13 +22323,16 @@ msgstr "Zachodnioeuropejski"
 msgid "Western European, New"
 msgstr "Zachodnioeuropejski, nowy"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Uproszczony"
 
@@ -23009,93 +22365,93 @@ msgstr "Inny..."
 msgid "Ch_aracter Encoding"
 msgstr "_Kodowanie znaków"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Data i czas"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Pole tekstowe do wprowadzenia daty"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Kliknij przycisk by wyświetlić kalendarz"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Pole rozwijane do wyboru czasu"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "_Teraz"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_Dziś"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Nieprawidłowa data"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Nieprawidłowy czas"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Rozwinięty"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Określa, czy element rozwijający jest rozwinięty"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Tekst etykiety elementu rozwijającego"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Użycie podkreślenia"
 
-#: ../widgets/misc/e-expander.c:197
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Określa, czy pokreślenie jest używane w tekście w roli znacznika, który "
-"poprzedza znak akceleratora."
+#: ../widgets/misc/e-expander.c:199
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgstr "Określa, czy pokreślenie jest używane w tekście w roli znacznika, który poprzedza znak akceleratora."
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Przestrzeń pomiędzy etykietą a potomkiem"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Widget etykiety"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "Widget wyświetlany w miejscu zwykłej etykiety elementu rozwijającego"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Rozmiar elementu rozwijającego"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:224
+#: ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Rozmiar strzałki rozwijającej drzewo"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Odstępy wskaźnika"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Przestrzeń dokoła strzałki rozwijającej"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+#: ../widgets/misc/e-filter-bar.c:126
+#: ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307
+#: ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr " Wyszukiwanie zaawansowane"
 
@@ -23112,15 +22468,18 @@ msgstr "_Wyszukiwania"
 msgid "Searches"
 msgstr "Wyszukiwania"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Zapisz wyszukiwanie..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "Z_modyfikuj zapisane wyszukiwania"
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "_Wyszukiwanie zaawansowane..."
 
@@ -23149,13 +22508,8 @@ msgid "World Map"
 msgstr "Mapa świata"
 
 #: ../widgets/misc/e-map.c:629
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Obsługiwana myszą interaktywna kontrolka mapy świata do wyboru strefy "
-"czasowej. Użytkownicy klawiatury powinni wybrać strefę czasową z poniższej "
-"rozwijanej listy."
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Obsługiwana myszą interaktywna kontrolka mapy świata do wyboru strefy czasowej. Użytkownicy klawiatury powinni wybrać strefę czasową z poniższej rozwijanej listy."
 
 #: ../widgets/misc/e-online-button.c:106
 msgid "Online"
@@ -23177,24 +22531,29 @@ msgstr "Prywatne rekordy synchronizacji:"
 msgid "Sync Categories:"
 msgstr "Kategorie synchronizacji:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439
+#: ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Pusta wiadomość"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Model przeformatowania"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Szerokość kolumny"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:337
+#: ../widgets/misc/e-search-bar.c:470
 #: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:337
+#: ../widgets/misc/e-search-bar.c:470
 #: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Kliknięcie - zmiana typu wyszukiwania"
@@ -23215,8 +22574,9 @@ msgstr "Wy_czyść"
 msgid "Item ID"
 msgstr "ID pozycji"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872
 #: ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Tekst"
 
@@ -23390,19 +22750,19 @@ msgid "_When opened:"
 msgstr "Po ot_warciu:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Kliknij, aby przejść do adresu"
 
@@ -23442,23 +22802,23 @@ msgstr "Kolumna aktywna"
 msgid "Unselected Column"
 msgstr "Kolumna niezaznaczona"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Kolumna przekreślona"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Kolumna podkreślona"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Kolumna pogrubiona"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Kolumna kolorowa"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Kolumna koloru tła"
 
@@ -23466,11 +22826,13 @@ msgstr "Kolumna koloru tła"
 msgid "State"
 msgstr "Stan"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Rosnąco)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Malejąco)"
 
@@ -23496,7 +22858,7 @@ msgid "A_vailable Fields:"
 msgstr "Do_stępne pola:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Rosnąco"
 
@@ -23509,7 +22871,7 @@ msgid "Clear _All"
 msgstr "_Wyczyść wszystko"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Malejąco"
 
@@ -23572,14 +22934,14 @@ msgstr "_Sortuj..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:633
 #: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Kod DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:640
 #: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Pełny nagłówek"
 
@@ -23619,7 +22981,8 @@ msgstr[2] "%s (%d elementów)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Podmienianie kolorów wierszy"
 
@@ -23627,8 +22990,10 @@ msgstr "Podmienianie kolorów wierszy"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Pozioma siatka rysowania"
 
@@ -23636,8 +23001,10 @@ msgstr "Pozioma siatka rysowania"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Pionowa siatka rysowania"
 
@@ -23646,8 +23013,10 @@ msgstr "Pionowa siatka rysowania"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Rysowanie skupienia"
 
@@ -23655,7 +23024,8 @@ msgstr "Rysowanie skupienia"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Tryb kursora"
 
@@ -23663,7 +23033,8 @@ msgstr "Tryb kursora"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Model wyboru"
 
@@ -23671,8 +23042,10 @@ msgstr "Model wyboru"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326
+#: ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Próg długości"
@@ -23681,8 +23054,10 @@ msgstr "Próg długości"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:3097
+#: ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Ujednolicona wysokość wiersza"
@@ -23694,103 +23069,108 @@ msgstr "Ujednolicona wysokość wiersza"
 msgid "Frozen"
 msgstr "Zamrożone"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Dopasowanie bieżącego widoku"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Sortuj _rosnąco"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Sortuj _malejąco"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Bez sortowania"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "_Grupowanie według tego pola"
 
 # FIXME - bo box to jest przerywana linia dookoła elementów
 # tak mi się wydaje
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Grupowanie według o_bramowania"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Usuń tę k_olumnę"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Dodaj _kolumnę..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "Wyrów_nanie"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "N_ajlepsze dopasowanie"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Formatuj kolum_ny..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Dopasuj bi_eżący widok..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Sortuj wg"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Własny"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Opis czcionki"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Informacje o sortowaniu"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Drzewo"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Główka tabeli"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Wzór tabeli"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Wiersz kursora"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3340
+#: ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Wyszukiwanie ciągłe"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Użycie kliknięcia w celu dodania"
 
 # FIXME - może być tak?
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Łącznik tabeli EDrzewa"
 
@@ -23802,258 +23182,366 @@ msgstr "Wygląd staroświecki"
 msgid "Draw lines and +/- expanders."
 msgstr "Rysowanie linii oraz elementów rozwijających +/-."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Metody wejściowe"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Pocesor zdarzeń"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Przekreślenie"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Zakotwiczenie"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Justyfikacja"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Szerokość przycięcia"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Wysokość przycięcia"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Przycięcie"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Wypełnienie prostokąta przycięcia"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "Przesunięcie X"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Przesunięcie Y"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Szerokość tekstu"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Wysokość tesktu"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Użycie elipsy"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Elipsa"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Zawijanie wierszy"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Znaki przerywające"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Maksymalna ilość linii"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Rysowanie krawędzi"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Zezwalanie na nowe linie"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Rysowanie tła"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Rysowanie przycisku"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Pozycja kursora"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781
+#: ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "Kontekst IM"
 
 # FIXME - albo uchwyt menu podręcznego?
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789
+#: ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Menu podręczne uchwytu"
 
+#~ msgctxt "New"
+#~ msgid "_Contact"
+#~ msgstr "_Kontakt"
+#~ msgctxt "New"
+#~ msgid "Contact _List"
+#~ msgstr "_Listę kontaktów"
+#~ msgctxt "New"
+#~ msgid "Address _Book"
+#~ msgstr "Książkę _adresową"
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Test edytora stylu drukowania kontaktu"
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Powinno to przetestować widget edytora stylu drukowania kontaktu"
+#~ msgid "Contact Print Test"
+#~ msgstr "Test drukowania kontaktów"
+#~ msgid "This should test the contact print code"
+#~ msgstr "Powinno to przetestować kod drukowania kontaktu"
+#~ msgctxt "New"
+#~ msgid "_Appointment"
+#~ msgstr "_Spotkanie"
+#~ msgctxt "New"
+#~ msgid "M_eeting"
+#~ msgstr "Ze_branie"
+#~ msgctxt "New"
+#~ msgid "All Day A_ppointment"
+#~ msgstr "Spotkanie _całodniowe"
+#~ msgctxt "New"
+#~ msgid "Cale_ndar"
+#~ msgstr "Kal_endarz"
+#~ msgid "Updated"
+#~ msgstr "Aktualizacja"
+#~ msgid "Refresh"
+#~ msgstr "Odśwież"
+#~ msgid "Counter-proposal"
+#~ msgstr "Kontrpropozycja"
+#~ msgctxt "New"
+#~ msgid "Mem_o"
+#~ msgstr "N_otatkę"
+#~ msgctxt "New"
+#~ msgid "_Shared memo"
+#~ msgstr "Notatkę _współdzieloną"
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Listę n_otatek"
+#~ msgctxt "New"
+#~ msgid "_Task"
+#~ msgstr "_Zadanie"
+#~ msgctxt "New"
+#~ msgid "Assigne_d Task"
+#~ msgstr "Przypisane za_danie"
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Lis_tę zadań"
+#~ msgctxt "folder-display"
+#~ msgid "%s (%u)"
+#~ msgstr "%s (%u)"
+#~ msgctxt "New"
+#~ msgid "_Mail Message"
+#~ msgstr "_Wiadomość"
+#~ msgctxt "New"
+#~ msgid "Mail _Folder"
+#~ msgstr "Katalog wiado_mości"
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Błąd podczas otwierania witryny FAQ."
+#~ msgctxt "New"
+#~ msgid "_Test"
+#~ msgstr "_Test"
+#~ msgid ""
+#~ "We were unable to open this address book.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
+#~ "niepoprawnego adresu URI lub niedostępnością serwera LDAP."
+#~ msgid "Business"
+#~ msgstr "Służbowy"
+#~ msgid "Competition"
+#~ msgstr "Konkurencja"
+#~ msgid "Favourites"
+#~ msgstr "Ulubione"
+#~ msgid "Gifts"
+#~ msgstr "Upominki"
+#~ msgid "Goals/Objectives"
+#~ msgstr "Cele/zamierzenia"
+#~ msgid "Holiday"
+#~ msgstr "Święta"
+#~ msgid "Holiday Cards"
+#~ msgstr "Kartki świąteczne"
+#~ msgid "Hot Contacts"
+#~ msgstr "Ważne kontakty"
+#~ msgid "Ideas"
+#~ msgstr "Pomysły"
+#~ msgid "International"
+#~ msgstr "Międzynarodowe"
+#~ msgid "Key Customer"
+#~ msgstr "Kluczowy klient"
+#~ msgid "Miscellaneous"
+#~ msgstr "Różne"
+#~ msgid "Next 7 days"
+#~ msgstr "Następne 7 dni"
+#~ msgid "Phone Calls"
+#~ msgstr "Telefony"
+#~ msgid "Strategies"
+#~ msgstr "Strategie"
+#~ msgid "Suppliers"
+#~ msgstr "Dostawcy"
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Czas i wydatki"
+#~ msgid "VIP"
+#~ msgstr "VIP"
+#~ msgid "Waiting"
+#~ msgstr "Oczekujące"
+#~ msgid "Next 7 Days"
+#~ msgstr "Następne 7 dni"
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "_Dodaj regułę filtru"
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Pogoda: Częściowe zachmurzenie"
+#~ msgid "Please enter user name first."
+#~ msgstr "Proszę wprowadzić najpierw nazwę użytkownika."
+#~ msgid "Mark calendar offline"
+#~ msgstr "Oznacz kalendarz jako offline"
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Oznacza wybrnay kalendarz do przeglądania w trybie offline"
+#~ msgid "Select Importers"
+#~ msgstr "Wybór importerów"
+#~ msgid "Re_fresh..."
+#~ msgstr "O_dśwież"
 #~ msgid "Permission Denied."
 #~ msgstr "Brak uprawnień."
-
 #~ msgid "_Properties..."
 #~ msgstr "_Właściwości..."
-
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Wyświetlanie</b>"
-
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Informacje o serwerze</b>"
-
 #~ msgid "D_escription:"
 #~ msgstr "Op_is:"
-
 #~ msgid "De_scription:"
 #~ msgstr "Opi_s:"
-
 #~ msgid "Updating query"
 #~ msgstr "Aktualizowanie zapytania"
-
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Najbliższe spotkania"
-
 #~ msgid "Unknown reason"
 #~ msgstr "Nieznana przyczyna"
-
 #~ msgid "Open File"
 #~ msgstr "Otwarcie pliku"
-
 #~ msgid "_Save Message"
 #~ msgstr "_Zapisz wiadomość"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Nie można otworzyć pliku &quot;{0}&quot;."
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
 #~ msgid "Attach original message"
 #~ msgstr "Załączenie oryginalnej wiadomości"
-
 #~ msgid "Do not quote original message"
 #~ msgstr "Bez cytowania oryginalnej wiadomości"
-
 #~ msgid "Quote original message"
 #~ msgstr "Cytowanie oryginalnej wiadomości"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Proszę określić nazwę tego podpisu."
-
 #~ msgid "Name:"
 #~ msgstr "Nazwa:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "Czy na pewno trwale usunąć wiadomości oznaczone do usunięcia z folderu "
 #~ "&quot;{0}&quot;?"
-
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "Usunąć &quot;{0}&quot;?"
-
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
 #~ msgstr "Usunąć wiadomości z folderu wyszukiwania &quot;{0}&quot;?"
-
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Czy przeprowadzić operację także w podfolderach?"
-
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr "Oznaczyć wszystkie wiadomości w podfolderach jako przeczytane?"
-
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Tylko w _bieżącym folderze"
-
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "Włącza wtyczkę przypominania o załącznikach"
-
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "Włącza wtyczkę przypominania o załącznikach."
-
 #~ msgid "Remind _missing attachments"
 #~ msgstr "Przypominanie o _brakujących załącznikach"
-
 #~ msgid "_Refresh:"
 #~ msgstr "_Odświeżanie:"
-
 #~ msgid "button-user"
 #~ msgstr "button-user"
-
 #~ msgid "There is no configuration option for this plugin."
 #~ msgstr "Brak opcji konfiguracyjnych dla tej wtyczki."
-
 #~ msgid "Gives an option to print from the composer."
 #~ msgstr "Pozwala drukować wiadomości z okna tworzenia"
-
 #~ msgid "Print Message"
 #~ msgstr "Wydrukuj wiadomość"
-
 #~ msgid "Prints the message"
 #~ msgstr "Drukuje wiadomość"
-
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Wtyczka asystenta ustawień początkowych."
-
 #~ msgid "Startup wizard"
 #~ msgstr "Ustawienia początkowe"
-
 #~ msgid "A string description of the current printer settings."
 #~ msgstr "Tekstowy opis bieżących ustawień drukarki."
-
 #~ msgid "Decides whether the crash detection should be run or not."
 #~ msgstr "Określa, czy wykrywanie awarii powinno być uruchomione."
-
 #~ msgid "Skip recovery warning dialog"
 #~ msgstr "Pominięcie ostrzegawczego okna przywracania"
-
 #~ msgid "Whether crash detection should be done or not"
 #~ msgstr "Określa, czy wykrywanie awarii ma być włączone"
-
 #~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
 #~ msgstr ""
 #~ "Określa, czy okno ostrzegające przywracaniu danych Evolution będzie "
 #~ "wyświetlane."
-
 #~ msgid "No folder name specified."
 #~ msgstr "Nie podano nazwy folderu."
-
 #~ msgid "Folder name cannot contain the Return character."
 #~ msgstr "Nazwa folderu nie może zawierać znaku końca wiersza."
-
 #~ msgid "Folder name cannot contain the character \"/\"."
 #~ msgstr "Nazwa folderu nie może zawierać znaku \"/\"."
-
 #~ msgid "Folder name cannot contain the character \"#\"."
 #~ msgstr "Nazwa folderu nie może zawierać znaku \"#\"."
-
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "\".\" oraz \"..\" są zarezerwowanymi nazwami folderów."
-
 #~ msgid "Evolution Crash Detection"
 #~ msgstr "Wykrywanie awarii Evolution"
-
 #~ msgid "Ig_nore"
 #~ msgstr "Zig_noruj"
-
 #~ msgid ""
 #~ "Evolution appears to have exited unexpectedly the last time it was\n"
 #~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
@@ -24062,245 +23550,161 @@ msgstr "Menu podręczne uchwytu"
 #~ "Program Evolution prawdopodobnie zakończył się nieprawidłowo.\n"
 #~ "Dla bezpieczeństwa wszystkie pola podglądu zostaną ukryte. Można je\n"
 #~ "przywrócić za  pomocą opcji w menu \"Widok\".\n"
-
 #~ msgid "_Do not show this message again"
 #~ msgstr "_Nie pokazuj tego komunikatu w przyszłości"
-
 #~ msgid "Copy selection to clipboard"
 #~ msgstr "Kopiuje zaznaczony tekst do schowka"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "Wycina zaznaczony tekst do schowka"
-
 #~ msgid "Paste from clipboard"
 #~ msgstr "Wkleja zawartość schowka"
-
 #~ msgid "I_nsert"
 #~ msgstr "W_staw"
-
 #~ msgid "All Day Event"
 #~ msgstr "Całodniowe"
-
 #~ msgid "Send _Options"
 #~ msgstr "_Opcje wysyłania"
-
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Wyświetla wiadomości w zwykły sposób"
-
 #~ msgid "Delete all but signature"
 #~ msgstr "Czyści wszystko za wyjątkiem podpisu"
-
 #~ msgid "For_mat"
 #~ msgstr "_Format"
-
 #~ msgid "HT_ML"
 #~ msgstr "_HTML"
-
 #~ msgid "Open a file"
 #~ msgstr "Otwiera plik"
-
 #~ msgid "PGP Encrypt"
 #~ msgstr "Szyfrowanie PGP"
-
 #~ msgid "PGP Sign"
 #~ msgstr "Podpis PGP"
-
 #~ msgid "S/MIME Encrypt"
 #~ msgstr "Szyfrowanie S/MIME"
-
 #~ msgid "S/MIME Sign"
 #~ msgstr "Podpis S/MIME"
-
-#~ msgid "Save As"
-#~ msgstr "Zapisz jako"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Zapisz w folderze..."
-
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "Zapisuje wiadomość w podanym folderze"
-
 #~ msgid "Send"
 #~ msgstr "Wyślij"
-
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Określa, czy wiadomość powinna zostać wysłana w formacie HTML"
-
 #~ msgid "_Delete all"
 #~ msgstr "_Usuń wszystko"
-
 #~ msgid "_Open..."
 #~ msgstr "_Otwórz..."
-
 #~ msgid "C_lose"
 #~ msgstr "Zam_knij"
-
 #~ msgid "H_TML"
 #~ msgstr "_HTML"
-
 #~ msgid "Save and _Close"
 #~ msgstr "_Zapisz i zamknij"
-
 #~ msgid "Save the current file and close the window"
 #~ msgstr "Zapisuje bieżący plik i zamyka okno"
-
 #~ msgid "Refresh List"
 #~ msgstr "Odśwież listę"
-
 #~ msgid "Refresh List of Folders"
 #~ msgstr "Odświeża listę folderów"
-
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Usuwa folder z listy zasubskrybowanych folderów"
-
 #~ msgid "Subscribe"
 #~ msgstr "Zapisz"
-
 #~ msgid "Unsubscribe"
 #~ msgstr "Wypisz"
-
 #~ msgid "_Invert Selection"
 #~ msgstr "_Odwróć zaznaczenie"
-
 #~ msgid "Status Details"
 #~ msgstr "Szczegóły stanu"
-
 #~ msgid "Time Zone"
 #~ msgstr "Strefa czasowa"
-
 #~ msgid "TimeZone Combobox"
 #~ msgstr "Lista stref czasowych"
-
 #~ msgid "_Categories..."
 #~ msgstr "Ka_tegorie..."
-
 #~ msgid "Select color for label..."
 #~ msgstr "Kolor dla etykiety..."
-
 #~ msgid ""
 #~ "It disables the feature where repeated prompts to ask if delete messages "
 #~ "from search folder."
 #~ msgstr ""
 #~ "Wyłącza pytanie w przypadku usuwania wiadomości z folderu wyszukiwania."
-
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">Etykiety i kolory</span>"
-
 #~ msgid "C_olor"
 #~ msgstr "K_olor"
-
 #~ msgid "Colors"
 #~ msgstr "Kolory"
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Wybór folderu szkiców"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Wybór folderu wysłanych"
-
 #~ msgid "Notify messages in Inbox only."
 #~ msgstr "Powiadamianie o nowej poczcie tylko dla folderu Odebrane."
-
 #~ msgid "New Mail Notification"
 #~ msgstr "Powiadomienia o nowych wiadomościach"
-
 #~ msgid "\n"
 #~ msgstr "\n"
-
 #~ msgid "Add an email to the List"
 #~ msgstr "Dodaje adres e-mail do listy"
-
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Wstaw adresy e-mail z książki adresowej"
-
 #~ msgid "Members"
 #~ msgstr "Członkowie"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Usuwa adres e-mail z listy"
-
 #~ msgid "_Select"
 #~ msgstr "Wybie_rz"
-
 #~ msgid "Or_ganiser:"
 #~ msgstr "Organiza_tor:"
-
 #~ msgid "Task sort"
 #~ msgstr "Porządek zadań"
-
 #~ msgid "Memo sort"
 #~ msgstr "Sortowanie notatek"
-
 #~ msgid "SMTWTFS"
 #~ msgstr "NPWŚCPS"
-
 #~ msgid "Post To:"
 #~ msgstr "Wyślij do:"
-
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "Evolution - klient poczty i PIM "
-
 #~ msgid "_Search name:"
 #~ msgstr "_Nazwa wyszukiwania:"
-
 #~ msgid "Di_sable"
 #~ msgstr "Wyłą_cz"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "Plik dźwięku powiadamiania o nowej poczcie"
-
 #~ msgid "New Mail Notify type"
 #~ msgstr "Rodzaj powiadamiania o nowej poczcie"
-
 #~ msgid "Specifies the type of New Mail Notification the user wishes to use."
 #~ msgstr ""
 #~ "Określa rodzaj powiadamiania o nowej poczcie, jakiego chce użyć "
 #~ "użytkownik."
-
 #~ msgid "<span weight=\"bold\">New Mail Notification</span>"
 #~ msgstr "<span weight=\"bold\">Powiadamianie o nowej poczcie</span>"
-
 #~ msgid "HTML Mail"
 #~ msgstr "HTML"
-
 #~ msgid "Se_lect..."
 #~ msgstr "Wy_bierz..."
-
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "_Dźwięk po otrzymaniu nowej wiadomości"
-
 #~ msgid "_Do not notify me when new mail arrives"
 #~ msgstr "_Bez powiadamiania o nadejściu nowej wiadomości"
-
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "Preferencje przypominania o załącznikach"
-
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "Proszę wybrać obraz png (48x48, < 720B)"
-
 #~ msgid "_Contacts..."
 #~ msgstr "_Kontakty..."
-
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr ""
 #~ "Wyświetla powiadomienie libnotify za każdym razem, gdy otrzymano nową "
 #~ "wiadomość."
-
 #~ msgid "Make the status icon blink"
 #~ msgstr "Mruganie ikoną stanu"
-
 #~ msgid "When the new-mail status icon is visible, make it blink."
 #~ msgstr "Mruga ikoną nowej wiadomości, gdy jest ona widoczna."
-
 #~ msgid "System error: %s"
 #~ msgstr "Błąd systemu: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Nie można wysłać e-maila z konta."
-
 #~ msgid "No store available"
 #~ msgstr "Brak nośnika"
-
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
@@ -24309,234 +23713,163 @@ msgstr "Menu podręczne uchwytu"
 # FIXME - upewnić się
 #~ msgid "Mail Remote"
 #~ msgstr "Zdalny"
-
 #~ msgid "Configure"
 #~ msgstr "Skonfiguruj"
-
 #~ msgid "Download messages for offline"
 #~ msgstr "Pobieranie wiadomości dla trybu offline"
-
 #~ msgid "MTWTFSS"
 #~ msgstr "PWŚCPSN"
-
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Usuń"
-
 #~ msgid "Sh_ow these fields in order:"
 #~ msgstr "P_okaż pola w porządku:"
-
 #~ msgid "_Add ->"
 #~ msgstr "_Dodaj ->"
-
 #~ msgid "Emulate label resize"
 #~ msgstr "Emuluj zmianę rozmiaru etykiety"
-
 #~ msgid "A Folder with this name already exists"
 #~ msgstr "Folder o tej nazwie już istnieje"
-
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
 #~ "Folder zawiera już kontakt o tej samej nazwie lub adresie e-mail.\n"
 #~ "Czy pomimo tego chcesz go dodać?"
-
 #~ msgid "Valid signature, cannot verify sender"
 #~ msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
-
 #~ msgid ""
 #~ "All information in these journal entries will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Wszystkie informacje w tych wpisach dziennika zostaną bezpowrotnie "
 #~ "usunięte."
-
 #~ msgid ""
 #~ "All information on this journal entry will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Wszystkie informacje o tym wpisie dziennika zostaną bezpowrotnie usunięte."
-
 #~ msgid "Are you sure you want to delete the journal entry '{0}'?"
 #~ msgstr "Czy na pewno usunąć wpis dziennika \"{0}\"?"
-
 #~ msgid "Are you sure you want to delete these {0} journal entries?"
 #~ msgstr "Czy na pewno usunąć {0} wpis(y) dziennika?"
-
 #~ msgid "Are you sure you want to delete this journal entry?"
 #~ msgstr "Czy na pewno usunąć ten wpis dziennika?"
-
 #~ msgid ""
 #~ "If you do not send a cancelation notice, the other participants may not "
 #~ "know the journal has been deleted."
 #~ msgstr ""
 #~ "Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą "
 #~ "się nie dowiedzieć, że wpis dziennika został usunięty."
-
 #~ msgid "This journal entry has been deleted."
 #~ msgstr "Wpis dziennika został usunięty."
-
 #~ msgid "This journal entry has been changed."
 #~ msgstr "Wpis dziennika został zmieniony."
-
 #~ msgid "Journal entry - %s"
 #~ msgstr "Wpis dziennika - %s"
-
 #~ msgid "The journal entry could not be deleted due to a corba error"
 #~ msgstr "Nie można usunąć wpisu dziennika na skutek błędu mechanizmu CORBA"
-
 #~ msgid "The journal entry could not be deleted because permission was denied"
 #~ msgstr "Nie można usunąć wpisu dziennika na skutek braku uprawnień"
-
 #~ msgid "The journal entry could not be deleted due to an error"
 #~ msgstr "Nie można usunąć wpisu dziennika na skutek błędu"
-
 #~ msgid ""
 #~ "You are modifying a recurring journal entry. What would you like to "
 #~ "modify?"
 #~ msgstr "Modyfikowany jest okresowy wpis dziennika. Co zmodyfikować?"
-
 #~ msgid "Journal information"
 #~ msgstr "Informacja dziennika"
-
 #~ msgid "Unable to find this journal entry in any journal"
 #~ msgstr "Nie znaleziono tego wpisu w żadnym dzienniku."
-
 #~ msgid "_Address: "
 #~ msgstr "_Adres:"
-
 #~ msgid "Print cards"
 #~ msgstr "Wizytówki"
-
 #~ msgid "Organization"
 #~ msgstr "Organizacja"
-
 #~ msgid "E-mail"
 #~ msgstr "E-mail"
-
 #~ msgid "GTK Tree View"
 #~ msgstr "Widok drzewiasty GTK"
-
 #~ msgid "Print envelope"
 #~ msgstr "Wydrukuj kopertę"
-
 #~ msgid "Print contacts"
 #~ msgstr "Wydrukuj kontakty"
-
 #~ msgid "Print contact"
 #~ msgstr "Wydrukuj kontakt"
-
 #~ msgid "Error loading default addressbook."
 #~ msgstr "Błąd przy odczycie domyślnej książki adresowej."
-
 #~ msgid "Input File"
 #~ msgstr "Plik wejściowy"
-
 #~ msgid "Add Calendar"
 #~ msgstr "Dodawanie kalendarza"
-
 #~ msgid "Add Task List"
 #~ msgstr "Dodawanie listy zadań"
-
 #~ msgid "_Add Calendar"
 #~ msgstr "_Dodaj kalendarz"
-
 #~ msgid "_Add Task List"
 #~ msgstr "_Dodaj listę zadań"
-
 #~ msgid "<b>Calendar options</b>"
 #~ msgstr "<b>Opcje kalendarza</b>"
-
 #~ msgid "Add New Calendar"
 #~ msgstr "Dodanie nowego kalendarza"
-
 #~ msgid "Calendar Group"
 #~ msgstr "Grupa kalendarza"
-
 #~ msgid "Calendar Location"
 #~ msgstr "Położenie kalendarza"
-
 #~ msgid "Calendar Name"
 #~ msgstr "Nazwa kalendarza"
-
 #~ msgid "<b>Task List Options</b>"
 #~ msgstr "<b>Opcje listy zadań</b>"
-
 #~ msgid "Add New Task List"
 #~ msgstr "Dodanie nowej listy zadań"
-
 #~ msgid "Task List Group"
 #~ msgstr "Grupa listy zadań"
-
 #~ msgid "Task List Name"
 #~ msgstr "Nazwa listy zadań"
-
 #~ msgid "<b>Free/Busy C_alendars</b>"
 #~ msgstr "<b>K_alendarze zajętości</b>"
-
 #~ msgid "<b>Publishing Frequency</b>"
 #~ msgstr "<b>Częstotliwość publikacji</b>"
-
 #~ msgid "<b>Publishing _Location</b>"
 #~ msgstr "<b>Położenie pub_likacji</b>"
-
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "Ustawienia publikacji informacji o zajętości"
-
 #~ msgid "_Daily"
 #~ msgstr "Co_dziennie"
-
 #~ msgid "_Manual"
 #~ msgstr "_Ręcznie"
-
 #~ msgid "_Weekly"
 #~ msgstr "_Co tydzień"
-
 #~ msgid "Enter the password for %s"
 #~ msgstr "Wprowadź hasło dla %s"
-
 #~ msgid "Selected day (%a %b %d %Y)"
 #~ msgstr "Wybrany dzień (%a %d %b %Y)"
-
 #~ msgid "%a %b %d"
 #~ msgstr "%a %d %b"
-
 #~ msgid "%a %d %Y"
 #~ msgstr "%a %d %Y"
-
 #~ msgid "%a %b %d %Y"
 #~ msgstr "%a %d %b %Y"
-
 #~ msgid "Selected week (%s - %s)"
 #~ msgstr "Wybrany tydzień (%s - %s)"
-
 #~ msgid "Selected month (%b %Y)"
 #~ msgstr "Wybrany miesiąc (%b %Y)"
-
 #~ msgid "Selected year (%Y)"
 #~ msgstr "Wybrany rok (%Y)"
-
 #~ msgid "Print Item"
 #~ msgstr "Wydruk elementu"
-
 #~ msgid "%.0fK"
 #~ msgstr "%.0fK"
-
 #~ msgid "%.0fM"
 #~ msgstr "%.0fM"
-
 #~ msgid "%.0fG"
 #~ msgstr "%.0fG"
-
 #~ msgid "No, Do not Change Status"
 #~ msgstr "Nie, nie zmieniaj stanu"
-
 #~ msgid "<b>Receiving Email</b>"
 #~ msgstr "<b>Odbieranie poczty</b>"
-
 #~ msgid "<b>Sending Email:</b>"
 #~ msgstr "<b>Wysyłanie wiadomości:</b>"
-
 #~ msgid ""
 #~ "<small>This page allows you to choose if you want to be notified via a "
 #~ "read receipt when a message you\n"
@@ -24547,45 +23880,34 @@ msgstr "Menu podręczne uchwytu"
 #~ "o przeczytaniu przez odbiorcę wysłanej wiadomości, oraz określenie\n"
 #~ "zachowania programu Evolution gdy ktoś prześle żądanie potwierdzenia\n"
 #~ "przeczytania od użytkownika."
-
 #~ msgid "Ask me if I want to send back a read receipt"
 #~ msgstr "Prośba o odsyłanie potwierdzeń przeczytania"
-
 #~ msgid "Never send back a read receipt"
 #~ msgstr "Potwierdzenia przeczytania nigdy nie są odsyłane"
-
 #~ msgid "Read Receipts"
 #~ msgstr "Potwierdzenia przeczytania"
-
 #~ msgid "Request a read receipt for all messages I send"
 #~ msgstr ""
 #~ "Żądanie potwierdzenia przeczytania dla wszystkich wysyłanych wiadomości"
-
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
 #~ msgstr ""
 #~ "Do momentu gdy wiadomośc jest wysyłana na listę a nie osobiście do "
 #~ "użytkownika"
-
 #~ msgid ""
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 #~ msgstr ""
 #~ "Jak powinien zachować się Evolution gdy zostanie otrzymana wiadomość z "
 #~ "żądaniem potwierdzenia jej przeczytania?"
-
 #~ msgid "The orientation of the tray."
 #~ msgstr "Położenie tacki."
-
 #~ msgid "Enable"
 #~ msgstr "Aktywne"
-
 #~ msgid "<b>Then</b>"
 #~ msgstr "<b>Wtedy</b>"
-
 #~ msgid "Priority Filter \"%s\""
 #~ msgstr "Filtr priorytetu \"%s\""
-
 #~ msgid ""
 #~ "Some of your Netscape email filters are based on\n"
 #~ "email priorities, which are not used in Evolution.\n"
@@ -24610,7 +23932,6 @@ msgstr "Menu podręczne uchwytu"
 #~ "punktację Evolution, zatem zmodyfikowane filtry używają\n"
 #~ "punktacji zamiast priorytetów. Sprawdź zaimportowane\n"
 #~ "filtry, aby upewnić się, że wszystko działa jak powinno."
-
 #~ msgid ""
 #~ "Some of your Netscape email filters use\n"
 #~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -24621,7 +23942,6 @@ msgstr "Menu podręczne uchwytu"
 #~ "używają własności \"Ignoruj wątek\" lub \"Śledź wątek\".\n"
 #~ "Nie jest ona obsługiwana przez Evolution, więc\n"
 #~ "zawierające ją filtry zostaną porzucone."
-
 #~ msgid ""
 #~ "Some of your Netscape email filters test the\n"
 #~ "body of emails for (in)equality to a given string,\n"
@@ -24634,230 +23954,159 @@ msgstr "Menu podręczne uchwytu"
 #~ "Własność ta nie jest obsługiwana przez Evolution, więc\n"
 #~ "zawierające ją filtry zostaną przekształcone, tak, aby\n"
 #~ "sprawdzać, czy podany napis stanowi część treści wiadomości."
-
 #~ msgid "Evolution is importing your old Netscape data"
 #~ msgstr "Evolution importuje stare dane Netscape'a"
-
 #~ msgid "Importing Netscape data"
 #~ msgstr "Importowanie danych Netscape"
-
 #~ msgid "Settings"
 #~ msgstr "Ustawienia"
-
 #~ msgid "Mail Filters"
 #~ msgstr "Filtry wiadomości"
-
 #~ msgid ""
 #~ "Evolution has found Netscape mail files.\n"
 #~ "Would you like them to be imported into Evolution?"
 #~ msgstr ""
 #~ "Odnaleziono pliki pocztowe programu Netscape.\n"
 #~ "Czy chcesz zaimportować je do Evolution?"
-
 #~ msgid "<span weight=\"bold\">Filter Options</span>"
 #~ msgstr "<span weight=\"bold\">Opcje filtrów</span>"
-
 #~ msgid "Mark as _Read"
 #~ msgstr "O_znacz jako przeczytane"
-
 #~ msgid "_Do not Mark as Read"
 #~ msgstr "_Nie oznaczaj jako przeczytane"
-
 #~ msgid "<b>Junk Mail Settings</b>"
 #~ msgstr "<b>Ustawienia niechcianej poczty</b>"
-
 #~ msgid "<b>Subject</b> :"
 #~ msgstr "<b>Temat</b>"
-
 #~ msgid "<b>From</b> :"
 #~ msgstr "<b>Od</b>"
-
 #~ msgid "<b>Recipients </b>"
 #~ msgstr "<b>Odbiorcy</b>"
-
 #~ msgid "<b>Action</b>"
 #~ msgstr "<b>Akcja</b>"
-
 #~ msgid "<b>Date and Time</b>"
 #~ msgstr "<b>Data i czas</b>"
-
 #~ msgid ""
 #~ "The output directory was not found on iPod! Please ensure that iPod has "
 #~ "been correctly set up and try again."
 #~ msgstr ""
 #~ "Nie znaleziono katalogu docelowego na urządzeniu iPod. Proszę sprawdzić "
 #~ "ustawienia i spróbowac ponownie."
-
 #~ msgid "Could not export data!"
 #~ msgstr "Nie można wyeksportować danych."
-
 #~ msgid "Exporting data failed."
 #~ msgstr "Eksport danych zakończony niepowodzeniem"
-
 #~ msgid "Could not open addressbook!"
 #~ msgstr "Nie można otworzyć książki adresowej."
-
 #~ msgid "Could not open the Evolution addressbook to export data."
 #~ msgstr "Nie można otworzyć książki adresowej Evolution dla eksportu."
-
 #~ msgid "Could not open calendar/todo!"
 #~ msgstr "Nie można otworzyć kalendarza/listy."
-
 #~ msgid "Could not open the Evolution calendar/todo list to export data."
 #~ msgstr ""
 #~ "Nie można otworzyć kalendarza/listy zadań Evolution do eksportu danych."
-
 #~ msgid "New mail notify"
 #~ msgstr "Powiadomienie o nowej poczcie"
-
 #~ msgid "(Untitled)"
 #~ msgstr "(Bez nazwy)"
-
 #~ msgid "An attachment to add."
 #~ msgstr "Dodawany załącznik."
-
 #~ msgid "Content type of the attachment."
 #~ msgstr "Typ zawartości załącznika."
-
 #~ msgid "The filename to display in the mail."
 #~ msgstr "Nazwa pliku wyświetlana w treści wiadomości."
-
 #~ msgid "Description of the attachment."
 #~ msgstr "Opis załącznika."
-
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr "Oznaczenie domyślnego wyświetlenia załącznika jako treści."
-
 #~ msgid "_Edit..."
 #~ msgstr "_Edytuj..."
-
 #~ msgid "..."
 #~ msgstr "..."
-
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"
-
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
-
 #~ msgid "Minicard Test"
 #~ msgstr "Test minicard"
-
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
-
 #~ msgid "This should test the minicard canvas item"
 #~ msgstr "Powinno to przetestować element minicard canvas"
-
 #~ msgid "_Send New Message To ..."
 #~ msgstr "_Wyślij nową wiadomość do..."
-
 #~ msgid "Importing ..."
 #~ msgstr "Importowanie ..."
-
 #~ msgid "Su_mmary"
 #~ msgstr "Pod_sumowanie"
-
 #~ msgid "_Memo Content:"
 #~ msgstr "_Treść notatki:"
-
 #~ msgid "Print Preview"
 #~ msgstr "Podgląd wydruku"
-
 #~ msgid ""
 #~ "A file by that name already exists.\n"
 #~ "Overwrite it?"
 #~ msgstr ""
 #~ "Plik o tej nazwie już istnieje.\n"
 #~ "Nadpisać go?"
-
 #~ msgid "Fo_rward"
 #~ msgstr "P_rzekaż"
-
 #~ msgid "Filtering Folder"
 #~ msgstr "Filtrowanie folderu"
-
 #~ msgid "Printer settings"
 #~ msgstr "Ustawienia drukarki"
-
 #~ msgid "Fontset"
 #~ msgstr "Zestaw czcionek"
-
 #~ msgid "Font"
 #~ msgstr "Czcionka"
-
 #~ msgid "GDKFont"
 #~ msgstr "GDKFont"
-
 #~ msgid "*"
 #~ msgstr "*"
-
 #~ msgid "Video Conferencing"
 #~ msgstr "Konferencje wideo"
-
 #~ msgid "work"
 #~ msgstr "praca"
-
 #~ msgid "WWW"
 #~ msgstr "WWW"
-
 #~ msgid "personal"
 #~ msgstr "osobiste"
-
 #~ msgid "The calendar you have selected is read-only"
 #~ msgstr "Wybrany kalendarz jest tylko do odczytu"
-
 #~ msgid "Locat_ion:"
 #~ msgstr "_Miejsce:"
-
 #~ msgid "Memo:"
 #~ msgstr "Notatka:"
-
 #~ msgid "%P %%"
 #~ msgstr "%P %%"
-
 #~ msgid "date-end"
 #~ msgstr "data-początkowa"
-
 #~ msgid "date-start"
 #~ msgstr "data-końcowa"
-
 #~ msgid "_Memo"
 #~ msgstr "_Notatka"
-
 #~ msgid "      "
 #~ msgstr "      "
-
 #~ msgid "_Subscribe"
 #~ msgstr "_Zasubskrybuj"
-
 #~ msgid "Mark all messages as read in the selected folder"
 #~ msgstr "Oznacz wszystkie wiadomości w folderze jako przeczytane"
-
 #~ msgid "Original Location"
 #~ msgstr "Oryginalne położenie"
-
 #~ msgid "Search Type"
 #~ msgstr "Rodzaj wyszukiwania"
-
 #~ msgid "Subitem ID"
 #~ msgstr "ID podpozycji"
-
 #~ msgid "Find _Now"
 #~ msgstr "Znajdź _teraz"
-
 #~ msgid "C_lassification"
 #~ msgstr "K_lasyfikacja"
-
 #~ msgid "%s : %s (%d items)"
 #~ msgstr "%s : %s (%d elementów)"
-
 #~ msgid "%s (%d items)"
 #~ msgstr "%s (%d elementów)"
-
 #~ msgid "Addressbook"
 #~ msgstr "Książka adresowa"
-
 #~ msgid ""
 #~ "Selecting this option means that Evolution will only try to use SSL/TLS "
 #~ "if you are in a insecure environment. For example, if you and your LDAP "
@@ -24869,44 +24118,29 @@ msgstr "Menu podręczne uchwytu"
 #~ "środowiskach. Na przykład, jeśli program i twój serwer LDAP znajdują się "
 #~ "za działającą zaporą sieciową, wówczas Evolution nie musi wykorzystywać "
 #~ "protokołów SSL/TLS, gdyż połączenie jest już bezpieczne."
-
 #~ msgid "Advanced..."
 #~ msgstr "Zaawansowane..."
-
 # FIXME - albo wybierz
 #~ msgid "Select target addressbook."
 #~ msgstr "Wybór docelowej książki adresowej."
-
 #~ msgid "(none)"
 #~ msgstr "(brak)"
-
 #~ msgid "Primary Email"
 #~ msgstr "Główny e-mail"
-
 #~ msgid "Select an Action"
 #~ msgstr "Wybór czynności"
-
 #~ msgid "Create a new contact \"%s\""
 #~ msgstr "Utwórz nowy kontakt \"%s\""
-
 #~ msgid "Add address to existing contact \"%s\""
 #~ msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
-
 #~ msgid "Merge E-Mail Address"
 #~ msgstr "Dołączenie adresu e-mail"
-
 #~ msgid "Discard Changes"
 #~ msgstr "Porzuć zmiany"
-
 #~ msgid "description of appointment"
 #~ msgstr "opis terminu"
-
-#~ msgid "Dismiss"
-#~ msgstr "Zamknij"
-
 #~ msgid "Dismiss All"
 #~ msgstr "Zamknij wszystko"
-
 #~ msgid ""
 #~ "Alarm on %s\n"
 #~ "%s\n"
@@ -24917,191 +24151,133 @@ msgstr "Menu podręczne uchwytu"
 #~ "%s\n"
 #~ "Rozpoczęcie o %s\n"
 #~ "Zakończenie o %s"
-
 #~ msgid "Remove"
 #~ msgstr "Usuń"
-
 #~ msgid "Don't Remove"
 #~ msgstr "Nie usuwaj"
-
 #~ msgid "05 minutes"
 #~ msgstr "05 minut"
-
 #~ msgid "10 minutes"
 #~ msgstr "10 minut"
-
 #~ msgid "15 minutes"
 #~ msgstr "15 minut"
-
 #~ msgid "30 minutes"
 #~ msgstr "30 minut"
-
 #~ msgid "60 minutes"
 #~ msgstr "60 minut"
-
 #~ msgid "<b>Default Free/Busy Server</b>"
 #~ msgstr "<b>Domyślny serwer informacji o zajętości</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>Główne</b>"
-
 #~ msgid "<b>Publishing</b>"
 #~ msgstr "<b>Publikacja</b>"
-
 #~ msgid "<b>Task List</b>"
 #~ msgstr "<b>Lista zadań</b>"
-
 #~ msgid "<b>Time</b>"
 #~ msgstr "<b>Czas</b>"
-
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "<b>Tydzień pracy</b>"
-
 #~ msgid "Calendar and Tasks Settings"
 #~ msgstr "Ustawienia kalendarza i zadań"
-
 #~ msgid "Color for overdue tasks"
 #~ msgstr "Kolor zaległych zadań"
-
 #~ msgid "Color for tasks due today"
 #~ msgstr "Kolor dzisiejszych zadań"
-
 #~ msgid "Days"
 #~ msgstr "Dni"
-
 #~ msgid "Hours"
 #~ msgstr "Godzin"
-
 #~ msgid "Minutes"
 #~ msgstr "Minut"
-
 #~ msgid "_Add URL"
 #~ msgstr "Dodaj _adres URL"
-
 #~ msgid "option menu to choose reminder units"
 #~ msgstr "opcja menu do wyboru jednostek przypominania"
-
 #~ msgid "option menu to choose time units"
 #~ msgstr "opcja menu do wyboru jednostek czasu"
-
 #, fuzzy
 #~ msgid "_Attachment Bar (drop attachments here)"
 #~ msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
-
 #~ msgid "Scheduling"
 #~ msgstr "Planowanie"
-
 #~ msgid "Invitations"
 #~ msgstr "Powiadomienia"
-
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Podstawowe</b>"
-
 #~ msgid "A_ll day event"
 #~ msgstr "Wydarzenie całodni_owe"
-
 #~ msgid "Cale_ndar:"
 #~ msgstr "Kale_ndarz:"
-
 #~ msgid "Classi_fication:"
 #~ msgstr "K_lasyfikacja:"
-
 #~ msgid "This appointment has customized alarms"
 #~ msgstr "Ten termin ma własne alarmy"
 
 #, fuzzy
 #~ msgid "<b>Dele_gatees</b>"
 #~ msgstr "<b>Podp_isy</b>"
-
 #~ msgid "Assignment"
 #~ msgstr "Przyporządkowanie"
-
 #~ msgid "Task Table"
 #~ msgstr "Tabela zadania"
-
 #~ msgid "_Publish Free/Busy Information"
 #~ msgstr "_Opublikuj informację o zajętości"
-
 #~ msgid "Removal Complete"
 #~ msgstr "Usunięcie zakończone"
-
 #~ msgid "Timezone Button"
 #~ msgstr "Przycisk strefy czasowej"
-
 #~ msgid "The Evolution Groupware Suite"
 #~ msgstr "Pakiet do pracy grupowej Evolution"
-
 #~ msgid "%a %m/%d/%Y %I:%M %p"
 #~ msgstr "%a %d/%m/%Y %I:%M %p"
-
 #~ msgid "%a %m/%d/%Y %H:%M"
 #~ msgstr "%a %d/%m/%Y %H:%M"
-
 #~ msgid "%a %m/%d/%Y %I %p"
 #~ msgstr "%a %d/%m/%Y %I %p"
-
 #~ msgid "%a %m/%d/%Y %H"
 #~ msgstr "%a %d/%m/%Y %H"
-
 #~ msgid "%m/%d/%Y %I:%M:%S %p"
 #~ msgstr "%d/%m/%Y %I:%M:%S %p"
-
 #~ msgid "%m/%d/%Y %H:%M:%S"
 #~ msgstr "%d/%m/%Y %H:%M:%S"
-
 #~ msgid "%m/%d/%Y %I:%M %p"
 #~ msgstr "%d/%m/%Y %I:%M %p"
-
 #~ msgid "%m/%d/%Y %H:%M"
 #~ msgstr "%d/%m/%Y %H:%M"
-
 #~ msgid "%m/%d/%Y %I %p"
 #~ msgstr "%d/%m/%Y %I %p"
-
 #~ msgid "%m/%d/%Y %H"
 #~ msgstr "%d/%m/%Y %H"
-
 #~ msgid "%I:%M:%S %p"
 #~ msgstr "%I:%M:%S %p"
-
 #~ msgid "%H:%M:%S"
 #~ msgstr "%H:%M:%S"
-
 #~ msgid "%I %p"
 #~ msgstr "%I %p"
 
 #, fuzzy
 #~ msgid "If"
 #~ msgstr "I"
-
 #~ msgid "Execute actions"
 #~ msgstr "Wykonywanie czynności"
 
 #, fuzzy
 #~ msgid "Mail Accounts Table"
 #~ msgstr "Konta pocztowe"
-
 #~ msgid "Attachment Button"
 #~ msgstr "Przycisk załącznika"
-
 #~ msgid "Filters"
 #~ msgstr "Filtry"
-
 #~ msgid "Execute Command..."
 #~ msgstr "Wykonanie polecenia..."
-
 #~ msgid "T_erminal Font:"
 #~ msgstr "_Czcionka terminala:"
-
 #~ msgid "_Show animated images"
 #~ msgstr "Wyświetlanie _animowanych obrazów"
-
 #~ msgid "Server: %s, Type: %s"
 #~ msgstr "Serwer: %s, Typ: %s"
-
 #~ msgid "Path: %s, Type: %s"
 #~ msgstr "Ścieżka: %s, Typ: %s"
-
 #~ msgid "Type: %s"
 #~ msgstr "Typ: %s"
 
@@ -25120,42 +24296,34 @@ msgstr "Menu podręczne uchwytu"
 #, fuzzy
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Wiadomość z tematem \"{0}\" nie została dostarczona."
-
 #~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
 #~ msgstr "<span weight=\"bold\">Kontakty automatyczne</span>"
-
 #~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 #~ msgstr "<span weight=\"bold\">Kontakty komunikatorów</span>"
 
 #, fuzzy
 #~ msgid "Automatic contacts"
 #~ msgstr "Kontakty automatyczne"
-
 #~ msgid "dialog1"
 #~ msgstr "dialog1"
-
 #~ msgid "Meetings and Tasks"
 #~ msgstr "Spotkania i zadania"
-
 #~ msgid "<span weight=\"bold\">Conflict Search</span>"
 #~ msgstr "<span weight=\"bold\">Wyszukiwanie konfliktów</span>"
 
 #, fuzzy
 #~ msgid "Plugin manager"
 #~ msgstr "Menedżer wtyczek"
-
 #~ msgid "Id"
 #~ msgstr "Id"
-
 #~ msgid "Path"
 #~ msgstr "Ścieżka"
-
 #~ msgid ""
 #~ "The suggested filename extension of this filetype (%s) is unused in the "
 #~ "chosen filename. Do you want to continue?"
 #~ msgstr ""
 #~ "Sugerowane rozszerzenie nazwy pliku typu (%s) nie jest używane w wybranej "
 #~ "nazwie pliku. Czy chcesz kontynuować?"
-
 #~ msgid "Evolution Settings"
 #~ msgstr "Ustawienia Evolution"
+
diff --git a/shell/main.c b/shell/main.c
index b57ef0777d..6272b6ad18 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -327,6 +327,14 @@ idle_cb (gchar **uris)
 	}
 #endif
 
+	/* This must be done after Bonobo has created all the components. For 
+	 * example the mail component makes the global variable `session` which
+	 * is being used by several EPlugins */
+
+	if (!disable_eplugin) {
+		e_plugin_load_plugins_with_missing_symbols ();
+	}
+
 	return FALSE;
 }