113 files changed, 50655 insertions, 43274 deletions

diff --git a/ChangeLog b/ChangeLog
index c115e635f1..ef69d990d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2009-01-29  Tor Lillqvist  <tml@novell.com>
+
+	Cross-compilation from Linux to Windows support by Fridrich Strba.
+
+	* configure.in: Check for <sys/wait.h>. Don't look for socklen_t
+	on Windows.
+
+	If cross-compiling, we obviously can't run the test to find out
+	the preferred formats for charset names of iconv(). We know them a
+	priori for Windows, though. For cross-compilation to other
+	platforms more change is needed.
+
+	* win32/Makefile.am: Use $(DLLTOOL) instead of hardcoding name.
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* tools/killev.c: Added another pattern to killev.
+
+2009-01-19  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.25.5 release
+
 2009-10-19  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
diff --git a/NEWS b/NEWS
index 728656c1ce..0fa3b65862 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,63 @@
+Evolution 2.25.5 2009-01-19
+---------------------------
+
+Updated Translations:
+	Andre Klapper  (de)
+	David Planella (ca)
+	Hendrik Richter  (de)
+	Jorge Gonzalez  (es)
+	Kjartan Maraas  (nb)
+	Luca Ferretti  (it)
+	Wadim Dziedzic  (pl)
+
+Bug Fixes:
+	#208426 : Added support for importing .pst files into Evolution (Bharath Acharya  )
+	#245156 : Helper functions to make it easier. (Milan Crha)
+	#246313 : Added ability to show all event in one-day view, but show only up to 6 columns in a multi-day view. (Milan Crha)
+	#303738 : Forget password on AuthFailed or AuthRequired and try to reopen on AuthFailed status, which will ask for a password again. Show "Authentication Required" on such status returned. Do not free memory which hold ECal. Also always forget password for calendar with the URL key. (Milan Crha)
+	#310844 : Transfer master object instead of the instance for recurring events. (Milan Crha)
+	#339879 : Have two types of code expression, one "code", which adds also a "match-all" into the expression, and a "rawcode" without it. (Milan Crha)
+	#360813 : RFC 2445 - CREATED/DTSTAMP/LAST-MODIFIED always in UTC. (Milan Crha)
+	#443544 (bugzilla.novell.com) : Handle E_MEETING_FREE_BUSY_FREE. (Suman Manjunath)
+	#458968 (bugzilla.novell.com) : Don't warn the user about changes being lost if he is trying to delegate the meeting. (Suman Manjunath)
+	#462372 (bnc) : Add supported URI format. (Ashish Shrivastava)
+	#489437 : Check whether the 'until' date is in the future, and report error if not. (Milan Crha)
+	#554454 : Do not crash when received 'modified' event for something not in a model. And a leak fix. (Milan Crha)
+	#555310 : Localize strings properly. (Milan Crha)
+	#563364 : Manage the second day zone in a Preferences dialog. (Milan Crha)
+	#563867 : Unescape "&amp;" when passing the link to browsers. (Felix Riemann)
+	#565376 : Support storing folder uri in a camel's way. Compiler warning fix. (Milan Crha)
+	#565376 : Bump eds requirement to 2.25.5 because of new functionality. (Milan Crha)
+	#565681 : EPlugins must be loaded after Bonobo init, else variables like `session` are not available for plugin's initialization functions (Philip Van hoof)
+	#566011 : Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and add bindtextdomain(). (Takao Fujiwara)
+	#566572 : Fix typos.  (Andre Klapper)
+	#566599 : Add translator comments and gettext context for meeting mail subject prefixes. (Matthew Barnes)
+	#566653 : Fix a leaked info (Srinivasa Ragavan)
+	#567031 : Hide also label of the combo. (Milan Crha)
+	#567045 : Escalate scroll event's to a scrolled window, to let mouse wheel work over data too. (Milan Crha)
+	#567129 : Add <default> tag in C locale to localize the value. Add gettext. (Takao Fujiwara)
+	#567148 : Use a labelled button to bring up the timezone selector widget.  (Matthew Barnes)
+	#567270 : Remove already-disabled use of gnome_about_new(). (Matthew Barnes)
+	#567276 : Remove unneeded #include <libgnomeui/gnome-dialog-util.h>. Removed unused function calendar_config_check_timezone_set(). (Matthew Barnes)
+	#567280 : Remove unneeded #include <libgnomeui/gnome-pixmap.h>. (Matthew Barnes)
+	#567281 : Remove unneeded #include <libgnomeui/gnome-messagebox.h>. (Matthew Barnes)
+	#567282 : Remove unrequired #include of <libgnomeui/gnome-href.h>. (Andre Klapper)
+	#567285 : Remove unneeded #include <libgnomeui/gnome-popup-menu.h>. (Matthew Barnes)
+	#567409 : Remove redundancy; split up strings (Andre Klapper)
+	#567687 : Force text/html part only when choosing between text/plain and it. (Milan Crha)
+	#567744 : Comment attribute in property tag should be plural. e.g. <property comments="...">  (Matthew Barnes)
+
+Other contributions:
+	Call e_show_uri() instead of gnome_url_show().  (Matthew Barnes)
+	<gmodule.h> API instead of <dlfcn.h> API.  (Tor Lillqvist)
+	Add support for category syncing. Also, retain an existing given/first name split if it exists in the pilot record. (Matt Davey)
+	B & W version of our new logo to replace the old Ximian logo. Regenerate the Quick Reference PDFs with the new logo. (Matthew Barnes)
+	Call e_display_help() instead of gnome_url_show(). New convenience function calls gtk_show_uri() and displays an error dialog if the URI cannot be shown. (Matthew Barnes)
+	Now that we require GTK 2.14, use gtk_show_uri() instead of gnome_help_display(). (Matthew Barnes)
+	Updated screenshots.  ( pc radhika )
+	Remove explicit mentioning of some translators. (Andre Klapper)
+	Add cast to avoid warning.  (Tor Lillqvist)
+
 Evolution 2.25.4 2009-01-05
 ---------------------------
 
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2255936197..84d5a3f9ca 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-26  Matthew Barnes  <mbarnes@redhat.com>
+
+	* printing/test-print.c:
+	* printing/test-contact-print-style-editor.c:
+	Migrate the test programs off libgnomeui/libbonobo.
+
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/component/addressbook-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/widgets/eab-contact-display.c (eab_uri_popup_link_open),
diff --git a/addressbook/gui/component/e-book-shell-module.c b/addressbook/gui/component/e-book-shell-module.c
index 139f55ffd4..9903c762fd 100644
--- a/addressbook/gui/component/e-book-shell-module.c
+++ b/addressbook/gui/component/e-book-shell-module.c
@@ -74,6 +74,7 @@ book_module_ensure_sources (EShellModule *shell_module)
 	ESource *personal;
 	GSList *groups, *iter;
 	const gchar *data_dir;
+	const gchar *name;
 	gchar *base_uri;
 	gchar *filename;
 
@@ -120,10 +121,15 @@ book_module_ensure_sources (EShellModule *shell_module)
 			on_ldap_servers = source_group;
 	}
 
+	name = _("On This Computer");
+
 	if (on_this_computer != NULL) {
 		GSList *sources;
 		const gchar *group_base_uri;
 
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_this_computer, name);
+
 		sources = e_source_group_peek_sources (on_this_computer);
 		group_base_uri = e_source_group_peek_base_uri (on_this_computer);
 
@@ -159,34 +165,38 @@ book_module_ensure_sources (EShellModule *shell_module)
 
 	} else {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On This Computer");
 		source_group = e_source_group_new (name, base_uri);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
 	}
 
+	name = _("Personal");
+
 	if (personal == NULL) {
 		ESource *source;
-		const gchar *name;
 
 		/* Create the default Personal address book. */
-		name = _("Personal");
 		source = e_source_new (name, PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
 		e_source_set_property (source, "completion", "true");
 		g_object_unref (source);
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (personal, name);
 	}
 
+	name = _("On LDAP Servers");
+
 	if (on_ldap_servers == NULL) {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On LDAP Servers");
 		source_group = e_source_group_new (name, LDAP_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (on_ldap_servers, name);
 	}
 
 	g_free (base_uri);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f9ae4f0b26..a52a0faeb6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,191 @@
+2009-01-30  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #450554 (bugzilla.novell.com)
+
+	* gui/dialogs/event-editor.c (event_editor_edit_comp):
+	* gui/dialogs/event-page.c (event_page_remove_all_attendees):
+	* gui/dialogs/event-page.h:
+	Remove all attendees from the list-view and name-selector before
+	populating it on 'event_changed' callback.
+	* gui/e-meeting-list-view.c
+	(e_meeting_list_view_remove_attendee_from_name_selector),
+	(e_meeting_list_view_remove_all_attendees_from_name_selector):
+	Fix the GtkTreePath when iterating over the attendee list. It used
+	to cause a mis-match between the model and the view (critical)
+	* gui/e-meeting-list-view.h:
+	* gui/e-meeting-store.c (e_meeting_store_remove_all_attendees):
+	New function added.
+
+2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #463602 (bnc)
+	* calendar/gui/e-day-view-main-item.c: Align the summary
+	so that it does not intercept with time.
+
+2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #450535 (bnc)
+	* calendar/gui/e-calendar-view.c: If multiple days are
+	selected in month view, show same selected times in the
+	editor also.
+
+2009-01-30  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #347287
+	* calendar/gui/e-cal-model.c:
+	* calendar/gui/gnome-cal.c: Increased the number of tries
+	to 10 and wait to 500 micro seconds.
+
+2009-01-27  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #318003
+
+	* gui/memos-component.c: (selector_tree_data_dropped):
+	* gui/tasks-component.c: (selector_tree_data_dropped):
+	* gui/calendar-component.c: (selector_tree_data_dropped),
+	(create_component_view):
+	* gui/comp-util.h: (cal_comp_process_source_list_drop):
+	* gui/comp-util.c: (update_single_object), (update_objects),
+	(cal_comp_process_source_list_drop):
+	Support move of the event in day view when dropped over the source
+	list. Use the same function for events/tasks/memos.
+
+	* gui/e-day-view.c: (e_day_view_on_drag_data_get):
+	Encode string data same as memos and tasks do, with a source UID.
+
+	* gui/e-calendar-table.c: (e_calendar_table_copy_clipboard):
+	* gui/e-memo-table.c: (e_memo_table_copy_clipboard):
+	Removed inappropriate comments.
+
+2009-01-27  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #463597, bug #463594, bug#463599 (BNC) and 
+	**	   bug #567824(BGO)
+
+	* gui/print.c (titled_box), (print_day_background),
+	(print_day_view), (print_week_view), (print_month_view): Fix all header
+	related bugs in calendar printing.
+
+	Bug reports:
+	1) Daily Printouts Display Hour In Wrong Spot :
+	When you print your daily calendar, it prints the hours in the left 
+	column below the :30 time slot
+
+	2) Font Problems On Printout, Days Of Week
+
+	3) Calendar Heading Printout Problems, Overlapping Fonts
+	In print preview, short week day names in the header of the page are 
+	overlapped.
+
+	Fixes all header issues mentioned at 
+	http://www.go-evolution.org/CalendarPrintoutLove
+
+2009-01-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #559604
+
+	* gui/itip-utils.h: (itip_organizer_is_user_ex):
+	* gui/itip-utils.c: (itip_organizer_is_user_ex),
+	(itip_organizer_is_user):
+	* gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info):
+	Let the feature work with Groupwise too.
+
+2009-01-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #442869
+
+	* gui/dialogs/task-page.c: (attendee_added_cb):
+	* gui/dialogs/event-page.c: (attendee_added_cb): Do not work
+	with NULL delegator and do not set 'delfrom' with two MAILTO.
+	* gui/e-meeting-list-view.c: (name_selector_dialog_close_cb):
+	Delete attendee only if we have enough rights for it.
+
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/tasks-component.c: (ensure_sources):
+	* gui/memos-component.c: (ensure_sources):
+	* gui/calendar-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* gui/dialogs/e-send-options-utils.c
+	(e_sendoptions_utils_fill_component):
+	* gui/e-cal-model.c (search_by_id_and_client):
+	* gui/e-calendar-table.c (copy_row_cb),
+	(e_calendar_table_copy_clipboard):
+	* gui/e-calendar-view.c (e_calendar_view_copy_clipboard),
+	(transfer_item_to), (icalcomp_contains_category):
+	* gui/e-day-view.c (update_row), (model_comps_deleted_cb),
+	(e_day_view_find_event_from_uid), (e_day_view_reshape_day_events),
+	(e_day_view_on_drag_data_get):
+	* gui/e-itip-control.c (update_item):
+	* gui/e-memo-table.c (copy_row_cb), (e_memo_table_copy_clipboard):
+	* gui/e-memos.c (obtain_list_of_components):
+	* gui/e-tasks.c (obtain_list_of_components):
+	* gui/e-week-view.c (update_row), (model_comps_deleted_cb),
+	(e_week_view_reshape_events), (e_week_view_find_event_from_uid):
+	* gui/gnome-cal.c (gnome_calendar_purge):
+	* gui/itip-utils.c (comp_limit_attendees), (itip_send_comp),
+	(reply_to_calendar_comp), (itip_publish_comp):
+
+2009-01-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #353460
+
+	* gui/gnome-cal.c: (setup_widgets):
+	Do not allow shrinking of Tasks/Memos components in calendar view.
+
+2009-01-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #568331
+
+	* gui/dialogs/comp-editor.c: (classification_changed_cb),
+	(comp_editor_init): Notify changes of the classification.
+	* gui/dialogs/comp-editor.c: (fill_widgets): Block classification
+	change signal when filling widgets with values from a component.
+
 2009-01-19  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #567850
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5b8f40a1b8..f7f91080f8 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -352,6 +352,88 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
 }
 
 static void
+<<<<<<< .working
+=======
+impl_upgradeFromVersion (PortableServer_Servant servant,
+			 CORBA_short major,
+			 CORBA_short minor,
+			 CORBA_short revision,
+			 CORBA_Environment *ev)
+{
+	GError *err = NULL;
+	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
+
+	if (!migrate_calendars (calendar_component, major, minor, revision, &err)) {
+		GNOME_Evolution_Component_UpgradeFailed *failedex;
+
+		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
+		failedex->what = CORBA_string_dup(_("Failed upgrading calendars."));
+		failedex->why = CORBA_string_dup(err->message);
+		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
+	}
+
+	if (err)
+		g_error_free(err);
+}
+
+static gboolean
+selector_tree_data_dropped (ESourceSelector *selector,
+                            GtkSelectionData *data,
+                            ESource *destination,
+                            GdkDragAction action,
+                            guint info,
+			    CalendarComponent *component)
+{
+	gboolean success = FALSE;
+	ECal *client;
+
+	client = auth_new_cal_from_source (destination, E_CAL_SOURCE_TYPE_EVENT);
+
+	if (!client || !e_cal_open (client, TRUE, NULL)) {
+		if (client)
+			g_object_unref (client);
+
+		return FALSE;
+	}
+
+	if (data->data) {
+		icalcomponent *icalcomp = NULL;
+		char *comp_str; /* do not free this! */
+
+		/* data->data is "source_uid\ncomponent_string" */
+		comp_str = strchr ((char *)data->data, '\n');
+		if (comp_str) {
+			comp_str [0] = 0;
+			comp_str++;
+
+			icalcomp = icalparser_parse_string (comp_str);
+
+			if (icalcomp) {
+				success = cal_comp_process_source_list_drop (client, icalcomp, action, (char *)data->data, component->priv->source_list);
+				icalcomponent_free (icalcomp);
+			}
+		}
+	}
+
+	return success;
+}
+
+static void
+control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
+{
+	CalendarComponentView *component_view = data;
+
+	if (activate) {
+		BonoboUIComponent *uic;
+		uic = bonobo_control_get_ui_component (component_view->view_control);
+
+		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
+	}
+}
+
+
+static void
+>>>>>>> .merge-right.r37199
 config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	CalendarComponent *calendar_component = data;
@@ -475,6 +557,16 @@ create_component_view (CalendarComponent *calendar_component)
 	/* Create sidebar selector */
 	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
 
+<<<<<<< .working
+=======
+	g_signal_connect (
+		component_view->source_selector, "data-dropped",
+		G_CALLBACK (selector_tree_data_dropped), calendar_component);
+
+	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
+			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+>>>>>>> .merge-right.r37199
 	gtk_widget_show (component_view->source_selector);
 
 	/* Set up the "new" item handler */
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 9504c7bda7..9a58a8cf6b 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -33,6 +33,7 @@
 #include "dialogs/delete-comp.h"
 #include <libecal/e-cal-component.h>
 #include "e-util/e-categories-config.h"
+#include "common/authentication.h"
 
 
 
@@ -607,3 +608,191 @@ cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalCo
 
 	e_cal_component_free_datetime (&olddate);
 }
+
+static gboolean
+update_single_object (ECal *client, icalcomponent *icalcomp, gboolean fail_on_modify)
+{
+	const char *uid;
+	char *tmp;
+	icalcomponent *tmp_icalcomp;
+	gboolean res;
+
+	uid = icalcomponent_get_uid (icalcomp);
+
+	if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL)) {
+		if (fail_on_modify)
+			return FALSE;
+
+		return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
+	}
+
+	tmp = NULL;
+	res = e_cal_create_object (client, icalcomp, &tmp, NULL);
+
+	g_free (tmp);
+
+	return res;
+}
+
+static gboolean
+update_objects (ECal *client, icalcomponent *icalcomp)
+{
+	icalcomponent *subcomp;
+	icalcomponent_kind kind;
+
+	kind = icalcomponent_isa (icalcomp);
+	if (kind == ICAL_VTODO_COMPONENT || 
+	    kind == ICAL_VEVENT_COMPONENT ||
+	    kind == ICAL_VJOURNAL_COMPONENT)
+		return update_single_object (client, icalcomp, kind == ICAL_VJOURNAL_COMPONENT);
+	else if (kind != ICAL_VCALENDAR_COMPONENT)
+		return FALSE;
+
+	subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
+	while (subcomp) {
+		gboolean success;
+
+		kind = icalcomponent_isa (subcomp);
+		if (kind == ICAL_VTIMEZONE_COMPONENT) {
+			icaltimezone *zone;
+
+			zone = icaltimezone_new ();
+			icaltimezone_set_component (zone, subcomp);
+
+			success = e_cal_add_timezone (client, zone, NULL);
+			icaltimezone_free (zone, 1);
+			if (!success)
+				return success;
+		} else if (kind == ICAL_VTODO_COMPONENT ||
+			   kind == ICAL_VEVENT_COMPONENT ||
+			   kind == ICAL_VJOURNAL_COMPONENT) {
+			success = update_single_object (client, subcomp, kind == ICAL_VJOURNAL_COMPONENT);
+			if (!success)
+				return success;
+		}
+
+		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
+	}
+
+	return TRUE;
+}
+
+/**
+ * cal_comp_process_source_list_drop:
+ * Processes the drop signal over the ESourceList.
+ * @param destination Where to put the component.
+ * @param comp Component to move/copy.
+ * @param action What to do.
+ * @param source_uid Where the component comes from; used when moving.
+ * @param source_list The ESourceList over which the event was called.
+ * @return Whether was the operation successful.
+ **/
+gboolean
+cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list)
+{
+	const char * uid;
+	char *old_uid = NULL;
+	icalcomponent *tmp_icalcomp = NULL;
+	GError *error = NULL;
+	gboolean success = FALSE;
+
+	g_return_val_if_fail (destination != NULL, FALSE);
+	g_return_val_if_fail (comp != NULL, FALSE);
+	g_return_val_if_fail (source_uid != NULL, FALSE);
+	g_return_val_if_fail (source_list != NULL, FALSE);
+
+	/* FIXME deal with GDK_ACTION_ASK */
+	if (action == GDK_ACTION_COPY) {
+		char *tmp;
+
+		old_uid = g_strdup (icalcomponent_get_uid (comp));
+		tmp = e_cal_component_gen_uid ();
+
+		icalcomponent_set_uid (comp, tmp);
+		g_free (tmp);
+	}
+
+	uid = icalcomponent_get_uid (comp);
+	if (!old_uid)
+		old_uid = g_strdup (uid);
+
+	if (!e_cal_get_object (destination, uid, NULL, &tmp_icalcomp, &error)) {
+		if ((error != NULL) && (error->code != E_CALENDAR_STATUS_OBJECT_NOT_FOUND)) {
+			switch (e_cal_get_source_type (destination)) {
+			case E_CAL_SOURCE_TYPE_EVENT:
+				g_message ("Failed to search the object in destination event list: %s", error->message);
+				break;
+			case E_CAL_SOURCE_TYPE_TODO:
+				g_message ("Failed to search the object in destination task list: %s", error->message);
+				break;
+			case E_CAL_SOURCE_TYPE_JOURNAL:
+				g_message ("Failed to search the object in destination memo list: %s", error->message);
+				break;
+			default:
+				break;
+			}
+		} else {
+			/* this will report success by last item, but we don't care */
+			success = update_objects (destination, comp);
+
+			if (success && action == GDK_ACTION_MOVE) {
+				/* remove components rather here, because we know which has been moved */
+				ESource *source_source;
+				ECal *source_client;
+
+				source_source = e_source_list_peek_source_by_uid (source_list, source_uid);
+
+				if (source_source && !E_IS_SOURCE_GROUP (source_source) && !e_source_get_readonly (source_source)) {
+					source_client = auth_new_cal_from_source (source_source, e_cal_get_source_type (destination));
+
+					if (source_client) {
+						gboolean read_only = TRUE;
+
+						e_cal_is_read_only (source_client, &read_only, NULL);
+
+						if (!read_only && e_cal_open (source_client, TRUE, NULL))
+							e_cal_remove_object (source_client, old_uid, NULL);
+						else if (!read_only) {
+							switch (e_cal_get_source_type (destination)) {
+							case E_CAL_SOURCE_TYPE_EVENT:
+								g_message ("Cannot open source client to remove old event");
+								break;
+							case E_CAL_SOURCE_TYPE_TODO:
+								g_message ("Cannot open source client to remove old task");
+								break;
+							case E_CAL_SOURCE_TYPE_JOURNAL:
+								g_message ("Cannot open source client to remove old memo");
+								break;
+							default:
+								break;
+							}
+						}
+
+						g_object_unref (source_client);
+					} else {
+						switch (e_cal_get_source_type (destination)) {
+						case E_CAL_SOURCE_TYPE_EVENT:
+							g_message ("Cannot create source client to remove old event");
+							break;
+						case E_CAL_SOURCE_TYPE_TODO:
+							g_message ("Cannot create source client to remove old task");
+							break;
+						case E_CAL_SOURCE_TYPE_JOURNAL:
+							g_message ("Cannot create source client to remove old memo");
+							break;
+						default:
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		g_clear_error (&error);
+	} else
+		icalcomponent_free (tmp_icalcomp);
+
+	g_free (old_uid);
+
+	return success;
+}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index e4e200217e..3225557a5e 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -57,4 +57,6 @@ GSList *cal_comp_selection_get_string_list (GtkSelectionData *data);
 void cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
 void cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
 
+gboolean cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list);
+
 #endif
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index fde53ca336..52f73aed02 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -192,7 +192,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 			icaltimezone *zone = calendar_config_get_icaltimezone ();
 			temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone);
 
-			str = icaltime_as_ical_string (temp);
+			str = icaltime_as_ical_string_r (temp);
 			prop = icalproperty_new_x (str);
 			g_free (str);
 			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY");
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 620600369e..e2ca71c5cb 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -568,6 +568,8 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 		}
 
 		if (!(delegate && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY))) {
+			event_page_remove_all_attendees (priv->event_page);
+
 			for (l = attendees; l != NULL; l = l->next) {
 				ECalComponentAttendee *ca = l->data;
 				EMeetingAttendee *ia;
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 53707432d9..2faed38a39 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1820,27 +1820,28 @@ attendee_added_cb (EMeetingListView *emlv,
 	client = comp_editor_get_client (editor);
 	flags = comp_editor_get_flags (editor);
 
-	if (flags & COMP_EDITOR_DELEGATE) {
-	   if (existing_attendee (ia, priv->comp))
-		   e_meeting_store_remove_attendee (priv->model, ia);
-	   else {
-		   if (!e_cal_get_static_capability (client,
-					   CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
-			   const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
-			   EMeetingAttendee *delegator;
+	if (!(flags & COMP_EDITOR_DELEGATE))
+		return;
+
+	if (existing_attendee (ia, priv->comp)) {
+		e_meeting_store_remove_attendee (priv->model, ia);
+	} else {
+		if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
+			const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
+			EMeetingAttendee *delegator;
 
-			   delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
-			   e_meeting_attendee_set_delto (delegator,
-					   g_strdup (e_meeting_attendee_get_address (ia)));
+			delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
 
-			   e_meeting_attendee_set_delfrom (ia, g_strdup_printf ("MAILTO:%s", delegator_id));
-			   gtk_widget_set_sensitive (priv->invite, FALSE);
-			   gtk_widget_set_sensitive (priv->add, FALSE);
-			   gtk_widget_set_sensitive (priv->edit, FALSE);
-		   }
-	   }
-}
+			g_return_if_fail (delegator != NULL);
 
+			e_meeting_attendee_set_delto (delegator, g_strdup (e_meeting_attendee_get_address (ia)));
+
+			e_meeting_attendee_set_delfrom (ia, g_strdup (delegator_id));
+			gtk_widget_set_sensitive (priv->invite, FALSE);
+			gtk_widget_set_sensitive (priv->add, FALSE);
+			gtk_widget_set_sensitive (priv->edit, FALSE);
+		}
+	}
 }
 
 /* Callbacks for list view*/
@@ -3250,3 +3251,23 @@ event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee)
 	e_meeting_store_add_attendee (priv->model, attendee);
 	e_meeting_list_view_add_attendee_to_name_selector (E_MEETING_LIST_VIEW (priv->list_view), attendee);
 }
+
+/**
+ * event_page_remove_all_attendees
+ * Removes all attendees from the meeting store and name selector.
+ * @param epage EventPage.
+ **/
+void
+event_page_remove_all_attendees (EventPage *epage)
+{
+	EventPagePrivate *priv;
+
+	g_return_if_fail (epage != NULL);
+	g_return_if_fail (IS_EVENT_PAGE (epage));
+	
+	priv = epage->priv;
+
+	e_meeting_store_remove_all_attendees (priv->model);
+	e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view));
+}
+
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 7c868f1d3d..63c0bd2306 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -108,6 +108,7 @@ void		event_page_set_view_rvsp	(EventPage *epage,
 ENameSelector *	event_page_get_name_selector	(EventPage *epage);
 void		event_page_add_attendee		(EventPage *epage,
 						 EMeetingAttendee *attendee);
+void 		event_page_remove_all_attendees (EventPage *epage);
 
 G_END_DECLS
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 7d674d20a0..b81119c5cf 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1155,8 +1155,11 @@ attendee_added_cb (EMeetingListView *emlv,
 			EMeetingAttendee *delegator;
 
 			delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
+
+			g_return_if_fail (delegator != NULL);
+
 			e_meeting_attendee_set_delto (delegator,
-				   g_strdup (e_meeting_attendee_get_address (ia)));
+				g_strdup (e_meeting_attendee_get_address (ia)));
 
 			gtk_widget_set_sensitive (priv->invite, FALSE);
 			gtk_widget_set_sensitive (priv->add, FALSE);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 850807ed05..7ead19cc06 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1338,7 +1338,7 @@ search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalCompone
 			gboolean has_rid = (id->rid && *id->rid);
 
 			uid = icalcomponent_get_uid (comp_data->icalcomp);
-			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+			rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
 
 			if (uid && *uid) {
 				if ((!client || comp_data->client == client) && !strcmp (id->uid, uid)) {
@@ -1677,10 +1677,10 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
 
 try_again:		
 	if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, &error)) {
-		if (error->code == E_CALENDAR_STATUS_BUSY && tries != 3) {
+		if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) {
 			tries++;
 			/*TODO chose an optimal value */
-			g_usleep (50);
+			g_usleep (500);
 			g_clear_error (&error);
 			goto try_again;	
 		}	
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e82a62216e..74d22efe29 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1298,7 +1298,7 @@ copy_row_cb (int model_row, gpointer data)
 	e_cal_util_add_timezones_from_component (cal_table->tmp_vcal, comp_data->icalcomp);
 
 	/* add the new component to the VCALENDAR component */
-	comp_str = icalcomponent_as_ical_string (comp_data->icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
 	child = icalparser_parse_string (comp_str);
 	if (child) {
 		icalcomponent_add_component (cal_table->tmp_vcal,
@@ -1328,13 +1328,12 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
 
 	etable = e_calendar_table_get_table (cal_table);
 	e_table_selected_row_foreach (etable, copy_row_cb, cal_table);
-	comp_str = icalcomponent_as_ical_string (cal_table->tmp_vcal);
+	comp_str = icalcomponent_as_ical_string_r (cal_table->tmp_vcal);
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (cal_table), clipboard_atom);
 	if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
 					 clipboard_get_calendar_cb,
 					 NULL, comp_str)) {
-		/* do not free this pointer, it owns libical */
-		/* g_free (comp_str); */
+		/* no-op */
 	} else {
 		gtk_clipboard_set_can_store (clipboard, target_types + 1, n_target_types - 1);
 	}
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e24cb6230a..938593a9a6 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -742,7 +742,7 @@ e_calendar_view_copy_clipboard (ECalendarView *cal_view)
 
 	/* copy the VCALENDAR to the clipboard */
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (cal_view), GDK_SELECTION_CLIPBOARD);
-	comp_str = icalcomponent_as_ical_string (vcal_comp);
+	comp_str = icalcomponent_as_ical_string_r (vcal_comp);
 
 	if (!gtk_clipboard_set_with_data (clipboard, target_types, n_target_types,
 					  clipboard_get_calendar_cb,
@@ -1367,7 +1367,7 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 			struct icaltimetype recur_id = icalcomponent_get_recurrenceid (event->comp_data->icalcomp);
 
 			if (!icaltime_is_null_time (recur_id))
-				rid = icaltime_as_ical_string (recur_id);
+				rid = icaltime_as_ical_string_r (recur_id);
 
 			e_cal_remove_object_with_mod (event->comp_data->client, uid, rid, CALOBJ_MOD_ALL, NULL);
 			g_free (rid);
@@ -1922,7 +1922,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day,
 
 	/* We either need rounding or don't want to set all_day for this, we will rather use actual */
 	/* time in this cases; dtstart should be a midnight in this case */
-	if (do_rounding || (!all_day && (dtend - dtstart) % (60 * 60 * 24) == 0)) {
+	if (do_rounding || (!all_day && (dtend - dtstart) == (60 * 60 * 24))) {
 		struct tm local = *localtime (&now);
 		int time_div = calendar_config_get_time_divisions ();
 		int hours, mins;
@@ -2168,7 +2168,7 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
 	char *res = NULL;
 	int i;
 
-	if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user (comp, client))
+	if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user_ex (comp, client, TRUE))
 		return NULL;
 
 	e_cal_component_get_attendee_list (comp, &attendees);
@@ -2409,7 +2409,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category)
 	for (property = icalcomponent_get_first_property (icalcomp, ICAL_CATEGORIES_PROPERTY);
 	     property != NULL;
 	     property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) {
-		char *value = icalproperty_get_value_as_string (property);
+		char *value = icalproperty_get_value_as_string_r (property);
 
 		if (value && strcmp (category, value) == 0){
 			g_free (value);
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 76529d9533..f96e6cc5ed 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -602,7 +602,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	GdkGC *gc;
 	GdkColor bg_color;
 	ECalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
+	gint num_icons, icon_x, icon_y, icon_x_inc = 0, icon_y_inc = 0;
 	gint max_icon_w, max_icon_h;
 	gboolean draw_reminder_icon, draw_recurrence_icon, draw_timezone_icon, draw_meeting_icon;
 	gboolean draw_attach_icon;
@@ -995,92 +995,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	else if (bar_y2 < scroll_flag)
 		event->end_minute -= day_view->mins_per_row;
 
-	if (!short_event)
-	{
-		if (event->start_minute % day_view->mins_per_row != 0
-			|| (day_view->show_event_end_times
-		    	&& event->end_minute % day_view->mins_per_row != 0)) {
-				offset = day_view->first_hour_shown * 60
-				+ day_view->first_minute_shown;
-				show_span = TRUE;
-			} else {
-				offset = 0;
-		}
-		start_minute = offset + event->start_minute;
-		end_minute = offset + event->end_minute;
-
-		format_time = (((end_minute - start_minute)/day_view->mins_per_row) >= 2) ? TRUE : FALSE;
-
-		start_hour = start_minute / 60;
-		start_minute = start_minute % 60;
-
-		end_hour = end_minute / 60;
-		end_minute = end_minute % 60;
-
-		e_day_view_convert_time_to_display (day_view, start_hour,
-						    &start_display_hour,
-						    &start_suffix,
-						    &start_suffix_width);
-		e_day_view_convert_time_to_display (day_view, end_hour,
-						    &end_display_hour,
-						    &end_suffix,
-						    &end_suffix_width);
-
-		if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
-			if (day_view->show_event_end_times && show_span) {
-				/* 24 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i-%2i:%02i",
-					 start_display_hour, start_minute,
-					 end_display_hour, end_minute);
-			} else {
-				if (format_time) {
-				/* 24 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i",
-					 start_display_hour, start_minute);
-				}
-			}
-		} else {
-			if (day_view->show_event_end_times && show_span) {
-				/* 12 hour format with end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s-%2i:%02i%s",
-					 start_display_hour, start_minute,
-					 start_suffix,
-					 end_display_hour, end_minute, end_suffix);
-			} else {
-				/* 12 hour format without end time. */
-				text = g_strdup_printf
-					("%2i:%02i%s",
-					 start_display_hour, start_minute,
-					 start_suffix);
-			}
-		}
-
-		cairo_save (cr);
-		cairo_rectangle (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 1.75, item_y + 2.75,
-			item_w - E_DAY_VIEW_BAR_WIDTH - 4.5,
-			14);
-		cairo_clip (cr);
-		cairo_new_path (cr);
-		if (resize_flag)
-			cairo_move_to (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 10, item_y + 13);
-		else
-			cairo_move_to (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 14, item_y + 13);
-		if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-			cairo_set_source_rgb (cr, 0, 0, 0);
-		else
-			cairo_set_source_rgb (cr, 1, 1, 1);
-		cairo_set_font_size (cr, 14.0);
-		cairo_set_font_options (cr, font_options);
-		cairo_show_text (cr, text);
-		cairo_close_path (cr);
-		cairo_restore (cr);
-	}
-
-	if (font_options)
-		cairo_font_options_destroy (font_options);
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -1298,6 +1212,98 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 		e_cal_component_free_categories_list (categories_list);
 	}
 
+	if (!short_event)
+	{
+		if (event->start_minute % day_view->mins_per_row != 0
+			|| (day_view->show_event_end_times
+		    	&& event->end_minute % day_view->mins_per_row != 0)) {
+				offset = day_view->first_hour_shown * 60
+				+ day_view->first_minute_shown;
+				show_span = TRUE;
+			} else {
+				offset = 0;
+		}
+		start_minute = offset + event->start_minute;
+		end_minute = offset + event->end_minute;
+
+		format_time = (((end_minute - start_minute)/day_view->mins_per_row) >= 2) ? TRUE : FALSE;
+
+		start_hour = start_minute / 60;
+		start_minute = start_minute % 60;
+
+		end_hour = end_minute / 60;
+		end_minute = end_minute % 60;
+
+		e_day_view_convert_time_to_display (day_view, start_hour,
+						    &start_display_hour,
+						    &start_suffix,
+						    &start_suffix_width);
+		e_day_view_convert_time_to_display (day_view, end_hour,
+						    &end_display_hour,
+						    &end_suffix,
+						    &end_suffix_width);
+
+		if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
+			if (day_view->show_event_end_times && show_span) {
+				/* 24 hour format with end time. */
+				text = g_strdup_printf
+					("%2i:%02i-%2i:%02i",
+					 start_display_hour, start_minute,
+					 end_display_hour, end_minute);
+			} else {
+				if (format_time) {
+				/* 24 hour format without end time. */
+				text = g_strdup_printf
+					("%2i:%02i",
+					 start_display_hour, start_minute);
+				}
+			}
+		} else {
+			if (day_view->show_event_end_times && show_span) {
+				/* 12 hour format with end time. */
+				text = g_strdup_printf
+					("%2i:%02i%s-%2i:%02i%s",
+					 start_display_hour, start_minute,
+					 start_suffix,
+					 end_display_hour, end_minute, end_suffix);
+			} else {
+				/* 12 hour format without end time. */
+				text = g_strdup_printf
+					("%2i:%02i%s",
+					 start_display_hour, start_minute,
+					 start_suffix);
+			}
+		}
+
+		cairo_save (cr);
+		cairo_rectangle (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 1.75, item_y + 2.75,
+			item_w - E_DAY_VIEW_BAR_WIDTH - 4.5,
+			14);
+
+		cairo_clip (cr);
+		cairo_new_path (cr);
+
+		if (icon_x_inc == 0)
+			icon_x += 14;
+
+		if (resize_flag)
+			cairo_move_to (cr, item_x + E_DAY_VIEW_BAR_WIDTH + 10, item_y + 13);
+		else
+			cairo_move_to (cr, icon_x, item_y + 13);
+		if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
+			cairo_set_source_rgb (cr, 0, 0, 0);
+		else
+			cairo_set_source_rgb (cr, 1, 1, 1);
+		cairo_set_font_size (cr, 14.0);
+		cairo_set_font_options (cr, font_options);
+		cairo_show_text (cr, text);
+		cairo_close_path (cr);
+		cairo_restore (cr);
+	}
+
+	if (font_options)
+		cairo_font_options_destroy (font_options);
+
 	g_free (text);
 	g_object_unref (comp);
 	cairo_destroy (cr);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 9391f48ced..5bb7850020 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -565,7 +565,7 @@ update_row (EDayView *day_view, int row)
 
 		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
 		if (prop)
-			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+			rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
 	}
 
 	if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
@@ -659,7 +659,7 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 
 			prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
 			if (prop)
-				rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+				rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
 		}
 
 		if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
@@ -1994,7 +1994,7 @@ e_day_view_find_event_from_uid (EDayView *day_view,
 			u = icalcomponent_get_uid (event->comp_data->icalcomp);
 			if (u && !strcmp (uid, u)) {
 				if (rid && *rid) {
-					r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
+					r = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
 					if (!r || !*r)
 						continue;
 					if (strcmp (rid, r) != 0) {
@@ -4589,7 +4589,7 @@ e_day_view_reshape_day_events (EDayView *day_view,
 
 		e_day_view_reshape_day_event (day_view, day, event_num);
 		event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
-		current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
+		current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
 		if (day_view->last_edited_comp_string == NULL) {
 			g_free (current_comp_string);
 			continue;
@@ -7373,10 +7373,20 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 		e_cal_util_add_timezones_from_component (vcal, event->comp_data->icalcomp);
 		icalcomponent_add_component (vcal, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-		comp_str = icalcomponent_as_ical_string (vcal);
+		comp_str = icalcomponent_as_ical_string_r (vcal);
 		if (comp_str) {
+			ESource *source = e_cal_get_source (event->comp_data->client);
+			const char *source_uid = e_source_peek_uid (source);
+			char *tmp;
+
+			if (!source_uid)
+				source_uid = "";
+
+			tmp = g_strconcat (source_uid, "\n", comp_str, NULL);
 			gtk_selection_data_set (selection_data, selection_data->target,
-						8, (unsigned char *)comp_str, strlen (comp_str));
+						8, (unsigned char *)tmp, strlen (tmp));
+
+			g_free (tmp);
 		}
 
 		icalcomponent_free (vcal);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ff6aeb92ba..03001cc3d9 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1950,7 +1950,7 @@ update_item (EItipControl *itip)
 	 * and you then look at it in Outlook).
 	 */
 	stamp = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
-	str = icaltime_as_ical_string (stamp);
+	str = icaltime_as_ical_string_r (stamp);
 	prop = icalproperty_new_x (str);
 	g_free (str);
 	icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 95bdcdff19..78f87c23f5 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -296,10 +296,8 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 			}
 		} else {
 			attendee = e_destination_get_email (des);
-
 			if (madd && attendee && g_str_equal (madd, attendee)) {
-			attendee = e_destination_get_email (des);
-			e_destination_store_remove_destination (destination_store, des);
+				e_destination_store_remove_destination (destination_store, des);
 			}
 		}
 	}
@@ -307,6 +305,49 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 	g_list_free (destinations);
 }
 
+void
+e_meeting_list_view_remove_all_attendees_from_name_selector (EMeetingListView *view)
+{
+	ENameSelectorModel *name_selector_model;
+	EMeetingListViewPrivate *priv;
+	guint i;
+
+	priv = view->priv;
+
+	name_selector_model = e_name_selector_peek_model (priv->name_selector);
+
+	for (i = 0; sections[i] != NULL; i++) {
+		EDestinationStore *destination_store = NULL;
+		GList             *destinations = NULL, *l = NULL;
+
+		e_name_selector_model_peek_section (name_selector_model, sections[i],
+						    NULL, &destination_store);
+		if (!destination_store) {
+			g_warning ("destination store is NULL\n");
+			continue;
+		}
+
+		destinations = e_destination_store_list_destinations (destination_store);
+		for (l = destinations; l; l = g_list_next (l)) {
+			EDestination *des = l->data;
+
+			if (e_destination_is_evolution_list (des)) {
+				GList *m, *dl;
+
+				dl = (GList *)e_destination_list_get_dests (des);
+
+				for (m = dl; m; m = m->next) {
+					g_object_unref (m->data);
+					m = g_list_remove (m, l->data);
+				}
+			} else {
+				e_destination_store_remove_destination (destination_store, des);
+			}
+		}
+		g_list_free (destinations);
+	}
+}
+
 static void
 attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *addresses, GList *names, GtkTreeView *view)
 {
@@ -898,8 +939,12 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
 
 		ma = e_meeting_store_find_attendee (store, email, &i);
 
-		if (ma)
-			e_meeting_store_remove_attendee (store, ma);
+		if (ma) {
+			if (e_meeting_attendee_get_edit_level (ma) != E_MEETING_ATTENDEE_EDIT_FULL)
+				g_warning ("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address (ma));
+			else
+				e_meeting_store_remove_attendee (store, ma);
+		}
 	}
 
 	g_slist_free (la);
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index b1ed367257..12deb8a25d 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -64,6 +64,8 @@ void       e_meeting_list_view_edit (EMeetingListView *emlv, EMeetingAttendee *a
 
 void       e_meeting_list_view_invite_others_dialog (EMeetingListView *emlv);
 void	   e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, EMeetingAttendee *ma);
+void	   e_meeting_list_view_remove_all_attendees_from_name_selector (EMeetingListView *view);
+
 void       e_meeting_list_view_add_attendee_to_name_selector (EMeetingListView *view, EMeetingAttendee *ma);
 void       e_meeting_list_view_set_editable (EMeetingListView *lview, gboolean set);
 ENameSelector * e_meeting_list_view_get_name_selector (EMeetingListView *lview);
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 663de70ba8..d320198ec3 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -780,7 +780,7 @@ e_meeting_store_remove_attendee (EMeetingStore *store, EMeetingAttendee *attende
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
 		gtk_tree_path_free (path);
 
-		g_ptr_array_remove_index (store->priv->attendees, row);		
+		g_ptr_array_remove_index (store->priv->attendees, row);
 		g_object_unref (attendee);
 	}
 }
@@ -788,22 +788,20 @@ e_meeting_store_remove_attendee (EMeetingStore *store, EMeetingAttendee *attende
 void
 e_meeting_store_remove_all_attendees (EMeetingStore *store)
 {
-	gint i;
-	GtkTreePath *path = gtk_tree_path_new ();
-
-	gtk_tree_path_append_index (path, 0);
-
-	for (i = 0; i < store->priv->attendees->len; i++) {
-		EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i);
-
+	gint i, j, k;
+
+	for (i = 0, j = e_meeting_store_count_actual_attendees (store), k = 0; i < j; i++) {
+	/* Always try to remove the attendee at index 0 since it is the only one that will
+	 * continue to exist until all attendees are removed. */
+		EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, k);
+		GtkTreePath *path = gtk_tree_path_new ();
+		gtk_tree_path_append_index (path, k);
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
-		gtk_tree_path_next (path);
+		gtk_tree_path_free (path);
 
+		g_ptr_array_remove_index (store->priv->attendees, k);
 		g_object_unref (attendee);
 	}
-
-	g_ptr_array_set_size (store->priv->attendees, 0);
-	gtk_tree_path_free (path);
 }
 
 EMeetingAttendee *
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 1fc947b7ea..490de9f919 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -1009,7 +1009,7 @@ copy_row_cb (int model_row, gpointer data)
 	e_cal_util_add_timezones_from_component (memo_table->tmp_vcal, comp_data->icalcomp);
 
 	/* add the new component to the VCALENDAR component */
-	comp_str = icalcomponent_as_ical_string (comp_data->icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
 	child = icalparser_parse_string (comp_str);
 	if (child) {
 		icalcomponent_add_component (memo_table->tmp_vcal,
@@ -1039,13 +1039,12 @@ e_memo_table_copy_clipboard (EMemoTable *memo_table)
 
 	etable = e_memo_table_get_table (memo_table);
 	e_table_selected_row_foreach (etable, copy_row_cb, memo_table);
-	comp_str = icalcomponent_as_ical_string (memo_table->tmp_vcal);
+	comp_str = icalcomponent_as_ical_string_r (memo_table->tmp_vcal);
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (memo_table), clipboard_atom);
 	if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
 					 clipboard_get_calendar_cb,
 					 NULL, comp_str)) {
-		/* do not free this pointer, it owns libical */
-		/* g_free (comp_str); */
+		/* no-op */
 	} else {
 		gtk_clipboard_set_can_store (clipboard, target_types + 1, n_target_types - 1);
 	}
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index ebf8c91df6..997eaee4da 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -189,7 +189,7 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 		e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
 		icalcomponent_add_component (vcal, icalcomponent_new_clone (comp_data->icalcomp));
 
-		comp_str = icalcomponent_as_ical_string (vcal);
+		comp_str = icalcomponent_as_ical_string_r (vcal);
 		if (comp_str) {
 			ESource *source = e_cal_get_source (comp_data->client);
 			const char *source_uid = e_source_peek_uid (source);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 7683f7a687..8614141b6e 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -351,7 +351,7 @@ update_row (EWeekView *week_view, int row)
 
 		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
 		if (prop)
-			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+			rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
 	}
 
 	if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
@@ -441,7 +441,7 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 
 			prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
 			if (prop)
-				rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+				rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
 		}
 
 		if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
@@ -2566,7 +2566,7 @@ e_week_view_reshape_events (EWeekView *week_view)
 							span_num);
 			if (week_view->last_edited_comp_string == NULL)
 				continue;
-			current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
+			current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
 			if (strncmp (current_comp_string, week_view->last_edited_comp_string,50) == 0) {
 				EWeekViewEventSpan *span;
 				span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
@@ -3718,7 +3718,7 @@ e_week_view_find_event_from_uid (EWeekView	  *week_view,
 		u = icalcomponent_get_uid (event->comp_data->icalcomp);
 		if (u && !strcmp (uid, u)) {
 			if (rid && *rid) {
-				r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
+				r = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
 				if (!r || !*r)
 					continue;
 				if (strcmp (rid, r) != 0) {
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 40b36aa154..d918c18a11 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -756,10 +756,10 @@ try_again:
 		old_query = NULL;
 		if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) {
 			/* If calendar is busy try again for 3 times. */
-			if (error->code == E_CALENDAR_STATUS_BUSY && tries != 3) {
+			if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) {
 				tries++;
 				/*TODO chose an optimal value */
-				g_usleep (50);
+				g_usleep (500);
 				
 				g_clear_error (&error);
 				goto try_again;	
@@ -3162,7 +3162,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 					struct icaltimetype recur_id = icalcomponent_get_recurrenceid (m->data);
 
 					if (!icaltime_is_null_time (recur_id) )
-						rid = icaltime_as_ical_string (recur_id);
+						rid = icaltime_as_ical_string_r (recur_id);
 
 					e_cal_remove_object_with_mod (client, uid, rid, CALOBJ_MOD_ALL, &error);
 					g_free (rid);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 17a5d97fb5..6b481d4a49 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -82,13 +82,13 @@ itip_addresses_get_default (void)
 }
 
 gboolean
-itip_organizer_is_user (ECalComponent *comp, ECal *client)
+itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test)
 {
 	ECalComponentOrganizer organizer;
 	const char *strip;
 	gboolean user_org = FALSE;
 
-	if (!e_cal_component_has_organizer (comp) || e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))
+	if (!e_cal_component_has_organizer (comp) || (!skip_cap_test && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)))
 		return FALSE;
 
 	e_cal_component_get_organizer (comp, &organizer);
@@ -116,6 +116,12 @@ itip_organizer_is_user (ECalComponent *comp, ECal *client)
 }
 
 gboolean
+itip_organizer_is_user (ECalComponent *comp, ECal *client)
+{
+	return itip_organizer_is_user_ex (comp, client, FALSE);
+}
+
+gboolean
 itip_sentby_is_user (ECalComponent *comp)
 {
 	ECalComponentOrganizer organizer;
@@ -858,7 +864,7 @@ comp_limit_attendees (ECalComponent *comp)
 			continue;
 		}
 
-		attendee = icalproperty_get_value_as_string (prop);
+		attendee = icalproperty_get_value_as_string_r (prop);
 		if (!attendee)
 			continue;
 
@@ -1254,7 +1260,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 	content_type = comp_content_type (comp, method);
 
 	top_level = comp_toplevel_with_zones (method, comp, client, zones);
-	ical_string = icalcomponent_as_ical_string (top_level);
+	ical_string = icalcomponent_as_ical_string_r (top_level);
 
 	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT) {
 		e_msg_composer_set_body (composer, ical_string, content_type);
@@ -1358,7 +1364,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	e_destination_freev (destinations);
 
 	top_level = comp_toplevel_with_zones (method, comp, client, zones);
-	ical_string = icalcomponent_as_ical_string (top_level);
+	ical_string = icalcomponent_as_ical_string_r (top_level);
 
 	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){
 
@@ -1668,7 +1674,7 @@ itip_publish_comp (ECal *client, gchar *uri, gchar *username,
 	}
 
 	soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
-	ical_string = icalcomponent_as_ical_string (toplevel);
+	ical_string = icalcomponent_as_ical_string_r (toplevel);
 	soup_message_set_request (msg, "text/calendar", SOUP_MEMORY_TEMPORARY,
 				  ical_string, strlen (ical_string));
 
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 3c84af929f..631c0a3430 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -51,6 +51,7 @@ EAccountList *itip_addresses_get (void);
 EAccount *itip_addresses_get_default (void);
 
 gboolean itip_organizer_is_user (ECalComponent *comp, ECal *client);
+gboolean itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test);
 gboolean itip_sentby_is_user (ECalComponent *comp);
 
 const gchar *itip_strip_mailto (const gchar *address);
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index ec9dc18571..803a784453 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -158,67 +158,6 @@ source_selection_changed_cb (ESourceSelector *selector, MemosComponentView *comp
 /* Evolution::Component CORBA methods */
 
 static gboolean
-update_single_object (ECal *client, icalcomponent *icalcomp, gboolean fail_on_modify)
-{
-	char *uid;
-	icalcomponent *tmp_icalcomp;
-
-	d(g_message("memos-component.c: update_single_object called");)
-
-	uid = (char *) icalcomponent_get_uid (icalcomp);
-
-	if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL)) {
-		if (fail_on_modify)
-			return FALSE;
-		else
-			return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
-	}
-
-	return e_cal_create_object (client, icalcomp, &uid, NULL);
-}
-
-static gboolean
-update_objects (ECal *client, icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp;
-	icalcomponent_kind kind;
-
-	d(g_message("memos-component.c: update_objects called");)
-
-	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VJOURNAL_COMPONENT)
-		return update_single_object (client, icalcomp, TRUE);
-	else if (kind != ICAL_VCALENDAR_COMPONENT)
-		return FALSE;
-
-	subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		gboolean success;
-
-		kind = icalcomponent_isa (subcomp);
-		if (kind == ICAL_VTIMEZONE_COMPONENT) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			icaltimezone_set_component (zone, subcomp);
-
-			success = e_cal_add_timezone (client, zone, NULL);
-			icaltimezone_free (zone, 1);
-			if (!success)
-				return success;
-		} else if (kind == ICAL_VJOURNAL_COMPONENT) {
-			success = update_single_object (client, subcomp, TRUE);
-			if (!success)
-				return success;
-		}
-
-		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-	}
-
-	return TRUE;
-}
-
-static gboolean
 selector_tree_data_dropped (ESourceSelector *selector,
                             GtkSelectionData *data,
                             ESource *destination,
@@ -238,11 +177,8 @@ selector_tree_data_dropped (ESourceSelector *selector,
 		goto  finish;
 
 	components = cal_comp_selection_get_string_list (data);
-	for (p = components; p; p = p->next) {
-		const char * uid;
-		char *old_uid = NULL;
-		icalcomponent *tmp_icalcomp = NULL;
-		GError *error = NULL;
+	success = components != NULL;
+	for (p = components; p && success; p = p->next) {
 		char *comp_str; /* do not free this! */
 
 		/* p->data is "source_uid\ncomponent_string" */
@@ -257,58 +193,10 @@ selector_tree_data_dropped (ESourceSelector *selector,
 		if (!icalcomp)
 			continue;
 
-		/* FIXME deal with GDK_ACTION_ASK */
-		if (action == GDK_ACTION_COPY) {
-			old_uid = g_strdup (icalcomponent_get_uid (icalcomp));
-			uid = e_cal_component_gen_uid ();
-			icalcomponent_set_uid (icalcomp, uid);
-		}
-
-		uid = icalcomponent_get_uid (icalcomp);
-		if (!old_uid)
-			old_uid = g_strdup (uid);
-
-		if (!e_cal_get_object (client, uid, NULL, &tmp_icalcomp, &error)) {
-			if ((error != NULL) && (error->code != E_CALENDAR_STATUS_OBJECT_NOT_FOUND))
-				g_message ("Failed to search the object in destination task list: %s",error->message);
-			else {
-				/* this will report success by last item, but we don't care */
-				success = update_objects (client, icalcomp);
-
-				if (success && action == GDK_ACTION_MOVE) {
-					/* remove components rather here, because we know which has been moved */
-					ESource *source_source;
-					ECal *source_client;
-
-					source_source = e_source_list_peek_source_by_uid (component->priv->source_list, p->data);
-
-					if (source_source && !E_IS_SOURCE_GROUP (source_source) && !e_source_get_readonly (source_source)) {
-						source_client = auth_new_cal_from_source (source_source, E_CAL_SOURCE_TYPE_JOURNAL);
-
-						if (source_client) {
-							gboolean read_only = TRUE;
-
-							e_cal_is_read_only (source_client, &read_only, NULL);
-
-							if (!read_only && e_cal_open (source_client, TRUE, NULL))
-								e_cal_remove_object (source_client, old_uid, NULL);
-							else if (!read_only)
-								g_message ("Cannot open source client to remove old memo");
-
-							g_object_unref (source_client);
-						} else
-							g_message ("Cannot create source client to remove old memo");
-					}
-				}
-			}
-
-			g_clear_error (&error);
-		} else
-			icalcomponent_free (tmp_icalcomp);
-
-		g_free (old_uid);
+		success = cal_comp_process_source_list_drop (client, icalcomp, action, p->data, component->priv->source_list);
 		icalcomponent_free (icalcomp);
 	}
+
 	g_slist_foreach (components, (GFunc)g_free, NULL);
 	g_slist_free (components);
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index f448b4704d..c4f42fe4bd 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -125,9 +125,9 @@ get_font_size (PangoFontDescription *font)
 
 /* The width of the small calendar months, the space from the right edge of
    the header rectangle, and the space between the months. */
-#define SMALL_MONTH_WIDTH	80
-#define SMALL_MONTH_PAD		4
-#define SMALL_MONTH_SPACING	12
+#define SMALL_MONTH_WIDTH	100
+#define SMALL_MONTH_PAD		5
+#define SMALL_MONTH_SPACING	20
 
 /* The minimum number of rows we leave space for for the long events in the
    day view. */
@@ -498,7 +498,7 @@ titled_box (GtkPrintContext *context, const char *text,
 	*x1 += 2;
 	*x2 -= 2;
 	*y2 += 2;
-	print_text (context, font, text, alignment, *x1, *x2, *y1, *y1 + size * 1.4);
+	print_text (context, font, text, alignment, *x1, *x2, *y1 + 1.0, *y1 + size * 1.4);
 	*y1 += size * 1.4;
 }
 
@@ -839,10 +839,10 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 		sprintf (buf, "%d", hour);
 		print_text (context, font_hour, buf, PANGO_ALIGN_RIGHT,
 			    left, hour_minute_x,
-			    y - yinc + yinc / 2, y - yinc + yinc / 2 + hour_font_size);
+			    y - yinc, y - yinc + hour_font_size);
 		print_text (context, font_minute, minute, PANGO_ALIGN_LEFT,
 			    hour_minute_x, left + width - 3,
-			    y - yinc + yinc / 2, y - yinc + yinc / 2 + minute_font_size);
+			    y - yinc, y - yinc + minute_font_size);
 
                 /* Draw the horizontal line between hours, across the entire
 		   width of the day view. */
@@ -2093,7 +2093,7 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 
 		/* Print the filled border around the header. */
 		print_border (context, 0.0, width,
-			      0.0, HEADER_HEIGHT + 2.0, 1.0, 0.9);
+			      0.0, HEADER_HEIGHT + 3.5, 1.0, 0.9);
 
 		/* Print the 2 mini calendar-months. */
 		l = width - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2  - SMALL_MONTH_SPACING;
@@ -2178,14 +2178,14 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	l = width - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
 		- SMALL_MONTH_SPACING;
 	print_month_small (context, gcal, when,
-			   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 30,
+			   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 10,
 			   DATE_MONTH | DATE_YEAR, when,
 			   time_add_week_with_zone (when, 1, zone), FALSE);
 
 	l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
 	print_month_small (context, gcal,
 			   time_add_month_with_zone (when, 1, zone),
-			   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 30,
+			   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 10,
 			   DATE_MONTH | DATE_YEAR, when,
 			   time_add_week_with_zone (when, 1, zone), FALSE);
 
@@ -2211,6 +2211,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	char buf[100];
 	gdouble width, height;
+	double l;
 
 	setup = gtk_print_context_get_page_setup (context);
 
@@ -2221,17 +2222,19 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	print_month_summary (context, gcal, date, 0.0, width, HEADER_HEIGHT, height);
 
 	/* Print the border around the header. */
-	print_border (context, 0.0, width, 0.0, HEADER_HEIGHT, 1.0, 0.9);
+	print_border (context, 0.0, width, 0.0, HEADER_HEIGHT + 10, 1.0, 0.9);
+
+	l = width - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH;
 
 	/* Print the 2 mini calendar-months. */
 	print_month_small (context, gcal,
 			   time_add_month_with_zone (date, 1, zone),
-			   width - width / 7 + 2, 4,
-			   width - 8, HEADER_HEIGHT,
+			   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4,
 			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
+
 	print_month_small (context, gcal,
 			   time_add_month_with_zone (date, -1, zone),
-			   8, 4, width / 7 - 2, HEADER_HEIGHT,
+			   8, 4, width / 7 + 20, HEADER_HEIGHT + 4,
 			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
 
 	/* Print the month, e.g. 'May 2001'. */
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index f61100c34f..cb7326e7d6 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -355,60 +355,6 @@ source_removed_cb (ETasks *tasks, ESource *source, TasksComponentView *component
 }
 
 static gboolean
-update_single_object (ECal *client, icalcomponent *icalcomp)
-{
-	char *uid;
-	icalcomponent *tmp_icalcomp;
-
-	uid = (char *) icalcomponent_get_uid (icalcomp);
-
-	if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL))
-		return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL);
-
-	return e_cal_create_object (client, icalcomp, &uid, NULL);
-}
-
-static gboolean
-update_objects (ECal *client, icalcomponent *icalcomp)
-{
-	icalcomponent *subcomp;
-	icalcomponent_kind kind;
-
-	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT)
-		return update_single_object (client, icalcomp);
-	else if (kind != ICAL_VCALENDAR_COMPONENT)
-		return FALSE;
-
-	subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		gboolean success;
-
-		kind = icalcomponent_isa (subcomp);
-		if (kind == ICAL_VTIMEZONE_COMPONENT) {
-			icaltimezone *zone;
-
-			zone = icaltimezone_new ();
-			icaltimezone_set_component (zone, subcomp);
-
-			success = e_cal_add_timezone (client, zone, NULL);
-			icaltimezone_free (zone, 1);
-			if (!success)
-				return success;
-		} else if (kind == ICAL_VTODO_COMPONENT ||
-			   kind == ICAL_VEVENT_COMPONENT) {
-			success = update_single_object (client, subcomp);
-			if (!success)
-				return success;
-		}
-
-		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
-	}
-
-	return TRUE;
-}
-
-static gboolean
 selector_tree_data_dropped (ESourceSelector *selector,
                             GtkSelectionData *data,
                             ESource *destination,
@@ -428,11 +374,8 @@ selector_tree_data_dropped (ESourceSelector *selector,
 		goto  finish;
 
 	components = cal_comp_selection_get_string_list (data);
-	for (p = components; p; p = p->next) {
-		const char * uid;
-		char *old_uid = NULL;
-		icalcomponent *tmp_icalcomp = NULL;
-		GError *error = NULL;
+	success = components != NULL;
+	for (p = components; p && success; p = p->next) {
 		char *comp_str; /* do not free this! */
 
 		/* p->data is "source_uid\ncomponent_string" */
@@ -447,56 +390,7 @@ selector_tree_data_dropped (ESourceSelector *selector,
 		if (!icalcomp)
 			continue;
 
-		/* FIXME deal with GDK_ACTION_ASK */
-		if (action == GDK_ACTION_COPY) {
-			old_uid = g_strdup (icalcomponent_get_uid (icalcomp));
-			uid = e_cal_component_gen_uid ();
-			icalcomponent_set_uid (icalcomp, uid);
-		}
-
-		uid = icalcomponent_get_uid (icalcomp);
-		if (!old_uid)
-			old_uid = g_strdup (uid);
-
-		if (!e_cal_get_object (client, uid, NULL, &tmp_icalcomp, &error)) {
-			if ((error != NULL) && (error->code != E_CALENDAR_STATUS_OBJECT_NOT_FOUND))
-				g_message ("Failed to search the object in destination task list: %s",error->message);
-			else {
-				/* this will report success by last item, but we don't care */
-				success = update_objects (client, icalcomp);
-
-				if (success && action == GDK_ACTION_MOVE) {
-					/* remove components rather here, because we know which has been moved */
-					ESource *source_source;
-					ECal *source_client;
-
-					source_source = e_source_list_peek_source_by_uid (component->priv->source_list, p->data);
-
-					if (source_source && !E_IS_SOURCE_GROUP (source_source) && !e_source_get_readonly (source_source)) {
-						source_client = auth_new_cal_from_source (source_source, E_CAL_SOURCE_TYPE_TODO);
-
-						if (source_client) {
-							gboolean read_only = TRUE;
-
-							e_cal_is_read_only (source_client, &read_only, NULL);
-
-							if (!read_only && e_cal_open (source_client, TRUE, NULL))
-								e_cal_remove_object (source_client, old_uid, NULL);
-							else if (!read_only)
-								g_message ("Cannot open source client to remove old task");
-
-							g_object_unref (source_client);
-						} else
-							g_message ("Cannot create source client to remove old task");
-					}
-				}
-			}
-
-			g_clear_error (&error);
-		} else
-			icalcomponent_free (tmp_icalcomp);
-
-		g_free (old_uid);
+		success = cal_comp_process_source_list_drop (client, icalcomp, action, p->data, component->priv->source_list);
 		icalcomponent_free (icalcomp);
 	}
 	g_slist_foreach (components, (GFunc)g_free, NULL);
diff --git a/calendar/modules/e-cal-shell-module.c b/calendar/modules/e-cal-shell-module.c
index 176b8d04bc..16f84e8f82 100644
--- a/calendar/modules/e-cal-shell-module.c
+++ b/calendar/modules/e-cal-shell-module.c
@@ -70,6 +70,7 @@ cal_module_ensure_sources (EShellModule *shell_module)
 	ESource *personal;
 	GSList *groups, *iter;
 	const gchar *data_dir;
+	const gchar *name;
 	gchar *base_uri;
 	gchar *filename;
 	gchar *property;
@@ -128,10 +129,15 @@ cal_module_ensure_sources (EShellModule *shell_module)
 			weather = source_group;
 	}
 
+	name = _("On This Computer");
+
 	if (on_this_computer != NULL) {
 		GSList *sources;
 		const gchar *group_base_uri;
 
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_this_computer, name);
+
 		sources = e_source_group_peek_sources (on_this_computer);
 		group_base_uri = e_source_group_peek_base_uri (on_this_computer);
 
@@ -167,21 +173,19 @@ cal_module_ensure_sources (EShellModule *shell_module)
 
 	} else {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On This Computer");
 		source_group = e_source_group_new (name, base_uri);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
 	}
 
+	name = _("Personal");
+
 	if (personal == NULL) {
 		ESource *source;
 		GSList *selected;
-		const gchar *name;
 		gchar *primary;
 
-		name = _("Personal");
 		source = e_source_new (name, PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
 		g_object_unref (source);
@@ -202,21 +206,32 @@ cal_module_ensure_sources (EShellModule *shell_module)
 		g_slist_foreach (selected, (GFunc) g_free, NULL);
 		g_slist_free (selected);
 		g_free (primary);
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (personal, name);
 	}
 
+	name = _("On The Web");
+
 	if (on_the_web == NULL) {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On The Web");
 		source_group = e_source_group_new (name, WEB_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
+	} else {
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_the_web, name);
 	}
 
+	name = _("Contacts");
+
 	if (contacts != NULL) {
 		GSList *sources;
 
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (contacts, name);
+
 		sources = e_source_group_peek_sources (contacts);
 
 		if (sources != NULL) {
@@ -239,9 +254,7 @@ cal_module_ensure_sources (EShellModule *shell_module)
 		}
 	} else {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("Contacts");
 		source_group = e_source_group_new (name, CONTACTS_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
@@ -258,6 +271,8 @@ cal_module_ensure_sources (EShellModule *shell_module)
 		e_source_group_set_property (contacts, "create_source", "no");
 	g_free (property);
 
+	name = _("Birthdays & Anniversaries");
+
 	if (birthdays == NULL) {
 		ESource *source;
 		const gchar *name;
@@ -269,6 +284,9 @@ cal_module_ensure_sources (EShellModule *shell_module)
 
 		/* This is now a borrowed reference. */
 		birthdays = source;
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (birthdays, name);
 	}
 
 	if (e_source_get_property (birthdays, "delete") == NULL)
@@ -277,14 +295,17 @@ cal_module_ensure_sources (EShellModule *shell_module)
 	if (e_source_peek_color_spec (birthdays) == NULL)
 		e_source_set_color_spec (birthdays, "#DDBECE");
 
+	name = _("Weather");
+
 	if (weather == NULL) {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("Weather");
 		source_group = e_source_group_new (name, WEATHER_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
+	} else {
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (weather, name);
 	}
 
 	g_free (base_uri);
diff --git a/calendar/modules/e-memo-shell-module.c b/calendar/modules/e-memo-shell-module.c
index 5e8f9a53bf..8c373f6604 100644
--- a/calendar/modules/e-memo-shell-module.c
+++ b/calendar/modules/e-memo-shell-module.c
@@ -63,6 +63,7 @@ memo_module_ensure_sources (EShellModule *shell_module)
 	ESource *personal;
 	GSList *groups, *iter;
 	const gchar *data_dir;
+	const gchar *name;
 	gchar *base_uri;
 	gchar *filename;
 
@@ -109,10 +110,15 @@ memo_module_ensure_sources (EShellModule *shell_module)
 			on_the_web = source_group;
 	}
 
+	name = _("On This Computer");
+
 	if (on_this_computer != NULL) {
 		GSList *sources;
 		const gchar *group_base_uri;
 
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_this_computer, name);
+
 		sources = e_source_group_peek_sources (on_this_computer);
 		group_base_uri = e_source_group_peek_base_uri (on_this_computer);
 
@@ -148,21 +154,19 @@ memo_module_ensure_sources (EShellModule *shell_module)
 
 	} else {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On This Computer");
 		source_group = e_source_group_new (name, base_uri);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
 	}
 
+	name = _("Personal");
+
 	if (personal == NULL) {
 		ESource *source;
 		GSList *selected;
-		const gchar *name;
 		gchar *primary;
 
-		name = _("Personal");
 		source = e_source_new (name, PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
 		g_object_unref (source);
@@ -183,16 +187,22 @@ memo_module_ensure_sources (EShellModule *shell_module)
 		g_slist_foreach (selected, (GFunc) g_free, NULL);
 		g_slist_free (selected);
 		g_free (primary);
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (personal, name);
 	}
 
+	name = _("On The Web");
+
 	if (on_the_web == NULL) {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On The Web");
 		source_group = e_source_group_new (name, WEB_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
+	} else {
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_the_web, name);
 	}
 
 	g_free (base_uri);
diff --git a/calendar/modules/e-task-shell-module.c b/calendar/modules/e-task-shell-module.c
index 76db5b056b..9c6258a156 100644
--- a/calendar/modules/e-task-shell-module.c
+++ b/calendar/modules/e-task-shell-module.c
@@ -63,6 +63,7 @@ task_module_ensure_sources (EShellModule *shell_module)
 	ESource *personal;
 	GSList *groups, *iter;
 	const gchar *data_dir;
+	const gchar *name;
 	gchar *base_uri;
 	gchar *filename;
 
@@ -109,10 +110,15 @@ task_module_ensure_sources (EShellModule *shell_module)
 			on_the_web = source_group;
 	}
 
+	name = _("On This Computer");
+
 	if (on_this_computer != NULL) {
 		GSList *sources;
 		const gchar *group_base_uri;
 
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_this_computer, name);
+
 		sources = e_source_group_peek_sources (on_this_computer);
 		group_base_uri = e_source_group_peek_base_uri (on_this_computer);
 
@@ -148,21 +154,20 @@ task_module_ensure_sources (EShellModule *shell_module)
 
 	} else {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On This Computer");
 		source_group = e_source_group_new (name, base_uri);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
 	}
 
+	name = _("Personal");
+
 	if (personal == NULL) {
 		ESource *source;
 		GSList *selected;
 		const gchar *name;
 		gchar *primary;
 
-		name = _("Personal");
 		source = e_source_new (name, PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
 		g_object_unref (source);
@@ -183,16 +188,22 @@ task_module_ensure_sources (EShellModule *shell_module)
 		g_slist_foreach (selected, (GFunc) g_free, NULL);
 		g_slist_free (selected);
 		g_free (primary);
+	} else {
+		/* Force the source name to the current locale. */
+		e_source_set_name (personal, name);
 	}
 
+	name = _("On The Web");
+
 	if (on_the_web == NULL) {
 		ESourceGroup *source_group;
-		const gchar *name;
 
-		name = _("On The Web");
 		source_group = e_source_group_new (name, WEB_BASE_URI);
 		e_source_list_add_group (source_list, source_group, -1);
 		g_object_unref (source_group);
+	} else {
+		/* Force the group name to the current locale. */
+		e_source_group_set_name (on_the_web, name);
 	}
 
 	g_free (base_uri);
diff --git a/configure.in b/configure.in
index 8018da60f8..69bab47bf7 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 
 m4_define([evo_major_version], [2])
 m4_define([evo_minor_version], [25])
-m4_define([evo_micro_version], [5])
+m4_define([evo_micro_version], [90])
 m4_define([evo_version],
           [evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],
@@ -215,29 +215,26 @@ have_iconv=no
 AC_ARG_WITH([libiconv],
 	    AC_HELP_STRING([--with-libiconv=PATH],
 			   [Prefix where libiconv is installed]))
-case $withval in
-/*)
+if test -d $withval; then
 	ICONV_CFLAGS="-I$withval/include"
 	ICONV_LIBS="-L$withval/lib"
-	;;
-esac
+fi
 
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
 CFLAGS="$CFLAGS $ICONV_CFLAGS"
 LIBS="$LIBS $ICONV_LIBS -liconv"
 AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv,
-	       AC_TRY_RUN([
+	       AC_TRY_LINK([
 #include <iconv.h>
-#include <stdlib.h>
-
+#include <stdlib.h>],[
 int main (int argc, char **argv)
 {
         iconv_t cd;
         cd = iconv_open ("UTF-8", "ISO-8859-1");
         exit (0);
 }
-], [ac_cv_libiconv=yes], [ac_cv_libiconv=no], [ac_cv_libiconv=no]))
+], [ac_cv_libiconv=yes], [ac_cv_libiconv=no]))
 
 if test $ac_cv_libiconv = yes; then
         ICONV_LIBS="$ICONV_LIBS -liconv"
@@ -290,34 +287,48 @@ int main (int argc, char **argv)
                 exit (1);
 
         exit (0);
-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv
-_libiconv_utf8=no; have_iconv=no]))
+}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=hopefully]))
 fi
 
 if test "$have_iconv" = no; then
-        AC_MSG_ERROR([You need to install a working iconv implementation, su
-ch as ftp://ftp.gnu.org/pub/gnu/libiconv])
+        AC_MSG_ERROR([You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv])
 fi
 AC_SUBST(ICONV_CFLAGS)
 AC_SUBST(ICONV_LIBS)
 
 CFLAGS="$CFLAGS -I$srcdir"
 
-AC_MSG_CHECKING(preferred charset formats for system iconv)
+AC_MSG_CHECKING(preferred charset name formats for system iconv)
 AC_TRY_RUN([
 #define CONFIGURE_IN
 #include "iconv-detect.c"
 ],[
         AC_MSG_RESULT(found)
 ],[
-        AC_MSG_RESULT(not found)
-        AC_WARN([
-        *** The iconv-detect program was unable to determine the
-        *** preferred charset formats recognized by your system
-        *** iconv library. It is suggested that you install a
-        *** working iconv library such as the one found at
-        *** ftp://ftp.gnu.org/pub/gnu/libiconv
-        ])
+	AC_MSG_RESULT(not found)
+	AC_WARN([
+	*** The iconv-detect program was unable to determine the
+	*** preferred charset name formats recognized by your
+	*** iconv library. It is suggested that you install a
+	*** working iconv library such as the one found at
+	*** ftp://ftp.gnu.org/pub/gnu/libiconv
+])],[
+	if test x$os_win32 = xyes; then
+		AC_MSG_RESULT([using known win32 result])
+		echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h
+		echo  >>iconv-detect.h
+		echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >>iconv-detect.h
+		echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
+		echo '#define ICONV_10646 "UCS-4BE"' >>iconv-detect.h
+	else
+		AC_MSG_RESULT(unknown)
+		AC_WARN([
+	*** We can't determine the preferred charset name formats
+	*** recognized by your iconv library. You are
+	*** cross-compiling and supposed to know what you are doing.
+	*** Please construct the iconv-detect.h file manually.
+		])
+	fi
 ])
 
 CFLAGS="$save_CFLAGS"
@@ -326,20 +337,25 @@ LIBS="$save_LIBS"
 dnl alloca()
 AC_CHECK_HEADERS(alloca.h)
 
-dnl check for socklen_t (in Unix98)
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-socklen_t x;
-],[],[AC_MSG_RESULT(yes)],[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-int accept (int, struct sockaddr *, size_t *);
-],[],[
-AC_MSG_RESULT(size_t)
-AC_DEFINE(socklen_t,size_t,[Define to appropriate type if socklen_t is not defined])], [
-AC_MSG_RESULT(int)
-AC_DEFINE(socklen_t,int)])])
+dnl waitpid() etc
+AC_CHECK_HEADERS(sys/wait.h)
+
+if test x$os_win32 != xyes; then
+	dnl check for socklen_t (in Unix98)
+	AC_MSG_CHECKING(for socklen_t)
+	AC_TRY_COMPILE([#include <sys/types.h>
+	#include <sys/socket.h>
+	socklen_t x;
+	],[],[AC_MSG_RESULT(yes)],[
+	AC_TRY_COMPILE([#include <sys/types.h>
+	#include <sys/socket.h>
+	int accept (int, struct sockaddr *, size_t *);
+	],[],[
+	AC_MSG_RESULT(size_t)
+	AC_DEFINE(socklen_t,size_t,[Define to appropriate type if socklen_t is not defined])], [
+	AC_MSG_RESULT(int)
+	AC_DEFINE(socklen_t,int)])])
+fi
 
 dnl
 dnl Purify support
diff --git a/help/ChangeLog b/help/ChangeLog
index 60da43a3fc..7536461138 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-24  Andre Klapper  <a9016009@gmx.de>
+
+	* de/de.po: Updated German translation.
+
 2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es/es.po: Updated Spanish translation.
diff --git a/help/de/de.po b/help/de/de.po
index ceb555e963..e6b4180921 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,13 +1,14 @@
 # translation of evolution manual to german
 # Andre Klapper <ak-47@gmx.net>, 2007, 2008, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-07 22:30+0000\n"
-"PO-Revision-Date: 2009-01-11 21:03+0100\n"
-"Last-Translator: \n"
-"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
+"PO-Revision-Date: 2009-01-24 18:11+0100\n"
+"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -749,7 +750,7 @@ msgstr "Weiterführende Einstellungen"
 
 #: C/evolution.xml:108(link) C/evolution.xml:7185(title)
 msgid "Synchronizing Your Handheld Device"
-msgstr "Mit tragbaren Geräten synchronisieren"
+msgstr "Mit tragbaren Geräten abgleichen"
 
 #: C/evolution.xml:111(link) C/evolution.xml:7242(title)
 msgid "Migration from Outlook to Evolution"
@@ -1465,7 +1466,7 @@ msgid ""
 "Select Automatically synchronize remote mail locally to download the "
 "messages to your local system."
 msgstr ""
-"Wählen Sie »Entfernte E-Mails automatisch lokal synchronisieren« um E-Mails "
+"Wählen Sie »Entfernte E-Mails automatisch lokal abgleichen« um E-Mails "
 "automatisch auf Ihre Festplatte herunterzuladen."
 
 #: C/evolution.xml:405(para) C/evolution.xml:496(para)
@@ -4072,7 +4073,7 @@ msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
 msgstr ""
-"Klicken Sie auf »Synchronisieren« um die Nachrichten in den Ordnern "
+"Klicken Sie auf »Abgleichen« um die Nachrichten in den Ordnern "
 "herunterzuladen, die für den Offline-Modus markiert wurden."
 
 #: C/evolution.xml:1546(para) C/evolution.xml:3900(para)
@@ -4084,7 +4085,7 @@ msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
 msgstr ""
-"Klicken Sie »Nicht synchronisieren« falls Sie sofort offline gehen möchten, "
+"Klicken Sie »Nicht abgleichen« falls Sie sofort offline gehen möchten, "
 "ohne zuvor die Nachrichten für die Offline-Nutzung herunterzuladen."
 
 #: C/evolution.xml:1548(para)
@@ -4094,7 +4095,7 @@ msgid ""
 msgstr ""
 "Wählen Sie »Diese Meldung nicht mehr anzeigen«, damit die Nachfrage in "
 "Zukunft nicht mehr angezeigt wird. Die Vorgabe-Einstellung ist es, beim "
-"Offline-Gehen nicht zu synchronisieren."
+"Offline-Gehen nicht abzugleichen."
 
 #: C/evolution.xml:1551(para)
 msgid ""
@@ -8820,7 +8821,7 @@ msgstr ""
 "Kontakt-Editor-Fenster zu erhalten. Evolution kann auch Kontakte von einem "
 "tragbaren Gerät während der HotSync*-Durchführung hinzufügen. Für weitere "
 "Informationen siehe <link linkend=\"config-sync\">Mit tragbaren Geräten "
-"synchronisieren</link>."
+"abgleichen</link>."
 
 #: C/evolution.xml:3765(para)
 msgid ""
@@ -10641,7 +10642,7 @@ msgstr ""
 
 #: C/evolution.xml:5095(title)
 msgid "Palm Synchronization:"
-msgstr ""
+msgstr "Palm-Datenabgleich:"
 
 #: C/evolution.xml:5096(para)
 msgid "Supported for Contacts and Calendars on Exchange."
@@ -14156,16 +14157,16 @@ msgid ""
 "only supports Palm OS devices like the PalmPilot* and the Handspring Visor. "
 "Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
-"Dieses Kapitel behandelt drei Themen: Erstens: Das Aktivieren der "
-"Synchronisation. Zweitens muss der Computer das tragbare Gerät erkennen und "
+"Dieses Kapitel behandelt drei Themen: Erstens: Das Aktivieren des "
+"Datenabgleichs. Zweitens muss der Computer das tragbare Gerät erkennen und "
 "darauf zugreifen können. Momentan unterstützt <trademark>Evolution</"
 "trademark> nur Geräte, auf den Palm OS läuft, wie zum Beispiel den "
 "PalmPilot* oder den Handspring Visor. Drittens müssen Sie entscheiden, was "
-"genau synchronisiert werden soll."
+"genau abgeglichen werden soll."
 
 #: C/evolution.xml:7189(link) C/evolution.xml:7200(title)
 msgid "Enabling Synchronization"
-msgstr "Aktivieren der Synchronisation"
+msgstr "Aktivieren des Datenabgleichs"
 
 #: C/evolution.xml:7192(link) C/evolution.xml:7205(title)
 msgid "Selecting Conduits"
@@ -14173,7 +14174,7 @@ msgstr "Conduits auswählen"
 
 #: C/evolution.xml:7195(link) C/evolution.xml:7228(title)
 msgid "Synchronizing Information"
-msgstr "Informationen synchronisieren"
+msgstr "Informationen abgleichen"
 
 #: C/evolution.xml:7201(para)
 msgid ""
@@ -14235,7 +14236,7 @@ msgstr "Nichts tun."
 
 #: C/evolution.xml:7213(title)
 msgid "Synchronize:"
-msgstr "Synchronisieren/Abgleichen:"
+msgstr "Abgleichen:"
 
 #: C/evolution.xml:7214(para)
 msgid ""
@@ -14245,7 +14246,7 @@ msgid ""
 msgstr ""
 "Kopiert neue Daten vom Computer auf das tragbare Geräte und vom tragbaren "
 "Gerät auf den Computer. Entfernt Elemente, die auf beiden Systemen waren "
-"aber seit der letzten Synchronisation auf einem System gelöscht wurden."
+"aber seit dem letzten Datenabgleich auf einem System gelöscht wurden."
 
 #: C/evolution.xml:7217(title)
 msgid "Copy From Pilot:"
@@ -14271,8 +14272,7 @@ msgid ""
 "not sure, use Synchronize."
 msgstr ""
 "Wählen Sie das gewünschte Verhalten für jedes Conduit, welches Sie benutzen "
-"wollen. Falls Sie sich nicht sicher sind, so benutzen Sie »Synchronisieren/"
-"Abgleichen«."
+"wollen. Falls Sie sich nicht sicher sind, so benutzen Sie »Abgleichen«."
 
 #: C/evolution.xml:7229(para)
 msgid ""
@@ -14288,7 +14288,7 @@ msgid ""
 "the <command>.evolution</command> directory inside your home directory."
 msgstr ""
 "Falls Sie eine Sicherheitskopie Ihrer Evolution-Daten machen möchten, bevor "
-"Sie synchronisieren, so kopieren Sie das <command>.evolution</command>-"
+"Sie abgleichen, so kopieren Sie das <command>.evolution</command>-"
 "Verzeichnis in Ihrem Heimatverzeichnis."
 
 #: C/evolution.xml:7233(para)
@@ -14307,14 +14307,14 @@ msgid ""
 msgstr ""
 "Falls Sie Palm OS Version 4.0 benutzen und der Passwortschutz aktiviert ist, "
 "so könnten Sie auf Probleme stoßen. Falls dies passiert, so stellen Sie den "
-"Passwortschutz für Ihr tragbares Gerät ab, synchronisieren Sie es mit dem "
-"Computer, und aktivieren Sie dann wieder den Passwortschutz."
+"Passwortschutz für Ihr tragbares Gerät ab, gleichen Sie dessen Daten mit dem "
+"Computer ab, und aktivieren Sie dann wieder den Passwortschutz."
 
 #: C/evolution.xml:7237(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
-msgstr "Nun sollte Ihr Palm-OS-Gerät Daten mit Evolution synchronisieren."
+msgstr "Nun sollte Ihr Palm-OS-Gerät Daten mit Evolution abgleichen."
 
 #: C/evolution.xml:7243(para)
 msgid ""
diff --git a/mail/ChangeLog b/mail/ChangeLog
index bad1191117..c65af1896a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,44 @@
+2009-01-30  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* message-list.c: (regen_list_exec): Fix compiler warnings
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* em-format-html-display.c: (efhd_update_bar),
+	(efhd_message_update_bar): Show attachment bar at all times. Seems
+	like the contents are missing at times.
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* em-format.c: (em_format_format_text): Handle empty messages well.
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #546637
+
+	* em-folder-view.c: (emfv_popup_source): Ensure uid for source view
+	also.
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #562449
+
+	* em-folder-view.c: (em_folder_view_mark_selected),
+	(emfv_delete_msg_response): Don't emit for vfolders.
+
+2009-01-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #567654
+
+	* message-list.c: (regen_list_exec): Don't free the reffable string.
+
+2009-01-27  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #561628
+
+	* em-format-html-print.c: (efhp_class_init):
+	Initialize 'parent_class' with its parent, not with itself.
+
 2009-01-19  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #204891
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index b87767654a..1bdbcbea0e 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -2353,7 +2353,8 @@ efhd_update_bar(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pob
 	EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)efh;
 	struct _EMFormatHTMLDisplayPrivate *priv = efhd->priv;
 
-	e_attachment_bar_refresh (E_ATTACHMENT_BAR (priv->attachment_bar));
+	if (priv->attachment_bar)
+		e_attachment_bar_refresh (E_ATTACHMENT_BAR (priv->attachment_bar));
 
 	return TRUE;
 }
@@ -2436,7 +2437,7 @@ efhd_message_update_bar(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 	EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *) emf;
 	const char *classid = "attachment-bar-refresh";
 
-	if (efhd->nobar || efhd->priv->updated || !efhd->priv->attachment_bar)
+	if (efhd->nobar || efhd->priv->updated)
 		return;
 
 	efhd->priv->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index c0d3573a3e..a903820ca3 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -52,7 +52,7 @@ efhp_finalize (GObject *o)
 static void
 efhp_class_init (GObjectClass *class)
 {
-	parent_class = g_type_class_ref(EM_TYPE_FORMAT_HTML_PRINT);
+	parent_class = g_type_class_peek_parent (class);
 	class->finalize = efhp_finalize;
 }
 
diff --git a/mail/em-format.c b/mail/em-format.c
index ef08d206ff..5b38f6cea3 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1109,7 +1109,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 	camel_object_unref(filter_stream);
 	camel_stream_reset (mem_stream);
 
-	if (max == -1 || size < (max * 1024) || emf->composer) {
+	if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) {
 		camel_stream_write_to_stream(mem_stream, (CamelStream *)stream);
 		camel_stream_flush((CamelStream *)stream);
 	} else {
diff --git a/mail/message-list.c b/mail/message-list.c
index b52ec71b82..921dc34c58 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -41,6 +41,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-thread.h>
 #include <camel/camel-vee-folder.h>
+#include <camel/camel-string-utils.h>
 
 #include <libedataserver/e-memory.h>
 
@@ -4060,7 +4061,7 @@ regen_list_exec (struct _regen_list_msg *m)
 				   on the flag whether we can view deleted messages or not. */
 
 				if (!was_deleted || (was_deleted && !m->hidedel))
-					g_ptr_array_add (uids, g_strdup (looking_for));
+					g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
 			}
 		}
 	}
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 4bea33f456..7413e0e564 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,23 @@
+2009-01-30  Milan Crha  <mcrha@redhat.com>
+
+	*  backup-restore.c: (sanity_check): Removed dangling '*/'.
+
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	Make it compile on Windows, by Fridrich Strbra. (Just compile;
+	little chance of it actually doing anything sensible on Windows at
+	this point...)
+
+	* Makefile.am: Use -no-undefined on Windows. Link with libeutil.
+
+	* backup.c: Remove unused <sys/wait.h>.
+
+	* backup-restore.c: Check HAVE_SYS_WAIT_H.
+	
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index eaa5963a4f..f93a3c7460 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES =						\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
 	-I$(top_srcdir)					\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SHELL_CFLAGS)					\
 	$(E_UTIL_CFLAGS)				
 
@@ -20,7 +21,8 @@ plugin_LTLIBRARIES = liborg-gnome-backup-restore.la
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_backup_restore_la_LIBADD =	\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_MAIL_LIBS) \
+	$(top_builddir)/e-util/libeutil.la
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 3486844cc3..400dd85898 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -18,9 +18,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -71,9 +78,13 @@ sanity_check (const char *filename)
 	result = system (command);
 	g_free (command);
 
+#ifdef HAVE_SYS_WAIT_H
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
 
 	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
+#else	
+	return result;
+#endif
 }
 
 static guint32
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 26c4fb958f..f7a42114aa 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index e4007d4525..b24ac0db6c 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined on Windows. Link with libeutil.
+
+	* bf-junk-filter.c: Tentative port to Windows even though this
+	plugin isn't even compiled on Windows for now. Just for
+	completeness.
+
 2008-12-15  srinivasa ragavan  <sragavan@novell.com>
 
 	* makefile.am:
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 886d60392d..24eb99fdd5 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -10,6 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la
 
 liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_bogo_junk_plugin_la_LIBADD =	\
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = bogo-junk-plugin.schemas.in
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index aca10643e8..848e4f4fb5 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
@@ -34,6 +33,13 @@
 #define G_LOG_DOMAIN "bf-junk-filter"
 
 #include <glib.h>
+
+#ifndef G_OS_WIN32
+#  include <sys/wait.h>
+#else
+#  include <windows.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <e-util/e-plugin.h>
@@ -163,6 +169,7 @@ retry:
 	camel_stream_close (stream);
 	camel_object_unref (stream);
 
+#ifndef G_OS_WIN32
 	waitres = waitpid (child_pid, &status, 0);
 	if (waitres < 0 && errno == EINTR) {
 		/* child process is hanging... */
@@ -181,13 +188,17 @@ retry:
 			g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating..."));
 	}
 
-	g_spawn_close_pid (child_pid);
-
 	if (waitres >= 0 && WIFEXITED (status)) {
 		res = WEXITSTATUS (status);
 	} else {
 		res = BOGOFILTER_ERROR;
 	}
+#else
+	WaitForSingleObject (child_pid, INFINITE);
+	GetExitCodeProcess (child_pid, &res);
+#endif
+
+	g_spawn_close_pid (child_pid);
 
 	if (res < 0 || res > 2) {
 		if (!only_once) {
diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog
index 694cd53c64..3bf30a612f 100644
--- a/plugins/external-editor/ChangeLog
+++ b/plugins/external-editor/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	Windows port by Fridrich Strba.
+
+	* Makefile.am: Use -no-undefined and link with more libraries on
+	Windows.
+
+	* external-editor.c: Check HAVE_SYS_WAIT_H.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 0c7c22ab8b..bae2c640a5 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,3 +1,11 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la \
+	$(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
@@ -25,7 +33,10 @@ plugin_LTLIBRARIES = liborg-gnome-external-editor.la
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
 
-liborg_gnome_external_editor_la_LDFLAGS = -module -avoid-version
+liborg_gnome_external_editor_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_external_editor_la_LIBADD = \
+	$(NO_UNDEFINED_REQUIRED_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 6f5b520465..5ba4ca7830 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -38,7 +38,9 @@
 #include <glib/gstdio.h>
 
 #include <sys/stat.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -151,7 +153,11 @@ async_external_editor (GArray *array)
 		return ;
 	}
 	
+#ifdef HAVE_SYS_WAIT_H
 	if (WEXITSTATUS (status) != 0) {
+#else
+	if (status) {
+#endif
 		d(printf ("\n\nsome problem here with external editor\n\n"));
 		return ;
 	} else {
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
index a59a5aad19..628455a523 100644
--- a/plugins/google-account-setup/ChangeLog
+++ b/plugins/google-account-setup/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #539467
+
+	* google-contacts-source.h: (manage_google_group):
+	* google-contacts-source.c: (manage_google_group),
+	(ensure_google_contacts_source_group),
+	(remove_google_contacts_source_group):
+	* google-source.c: (ensure_google_source_group):
+	Find group by its base uri, not by a localized name.
+
 2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fix for bug #559518
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index b33ac86856..f76b7e56ee 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -37,36 +37,64 @@
 
 #include "google-contacts-source.h"
 
-
-void
-ensure_google_contacts_source_group (void)
+/**
+ * manage_google_group:
+ * Searches for a 'Google' source group and ensures it has the correct
+ * name. If only_return is set to true, then only returns found group.
+ * Otherwise returns NULL.
+ **/
+ESourceGroup *
+manage_google_group (ESourceList *slist, gboolean only_return)
 {
-    ESourceList  *source_list;
-    ESourceGroup *group;
+	GSList *groups, *g;
+	ESourceGroup *group = NULL;
 
-    source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
+	g_return_val_if_fail (slist != NULL, NULL);
 
-    if (source_list == NULL) {
-        return;
-    }
+	groups = e_source_list_peek_groups (slist);
+	for (g = groups; g; g = g->next) {
+		group = E_SOURCE_GROUP (g->data);
 
-    group = e_source_list_peek_group_by_name (source_list, _("Google"));
+		if (group && e_source_group_peek_base_uri (group) &&
+		    g_ascii_strncasecmp ("google://", e_source_group_peek_base_uri (group), 9) == 0)
+			break;
 
-    if (group == NULL) {
-        gboolean res;
+		group = NULL;
+	}
 
-        group = e_source_group_new (_("Google"), "google://");
-        res = e_source_list_add_group (source_list, group, -1);
+	if (only_return)
+		return group;
 
-        if (res == FALSE) {
-            g_warning ("Could not add Google source group!");
-        } else {
-            e_source_list_sync (source_list, NULL);
-        }
+	if (group) {
+		e_source_group_set_name (group, _("Google"));
+	} else {
+		group = e_source_group_new (_("Google"), "google://");
 
-        g_object_unref (group);
-    }
-    g_object_unref (source_list);
+		if (!e_source_list_add_group (slist, group, -1)) {
+			g_warning ("Could not add Google source group!");
+		} else {
+			e_source_list_sync (slist, NULL);
+		}
+
+		g_object_unref (group);
+	}
+
+	return NULL;
+}
+
+void
+ensure_google_contacts_source_group (void)
+{
+	ESourceList  *source_list;
+
+	source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
+
+	if (source_list == NULL) {
+		return;
+	}
+
+	manage_google_group (source_list, FALSE);
+	g_object_unref (source_list);
 }
 
 void
@@ -81,7 +109,7 @@ remove_google_contacts_source_group (void)
         return;
     }
 
-    group = e_source_list_peek_group_by_name (source_list, _("Google"));
+    group = manage_google_group (source_list, TRUE);
 
     if (group) {
         GSList *sources;
diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h
index 54c21d18a6..b4fd5d6b77 100644
--- a/plugins/google-account-setup/google-contacts-source.h
+++ b/plugins/google-account-setup/google-contacts-source.h
@@ -28,4 +28,6 @@ void       ensure_google_contacts_source_group (void);
 
 void       remove_google_contacts_source_group (void);
 
+ESourceGroup *manage_google_group (ESourceList *slist, gboolean only_return);
+
 #endif
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index dd86d1723b..02f08da5e5 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -69,36 +69,17 @@ GtkWidget *      plugin_google               (EPlugin                    *epl,
 
 
 static void
-ensure_google_source_group ()
+ensure_google_source_group (void)
 {
 	ESourceList  *slist;
-	ESourceGroup *group;
-
 
 	if (!e_cal_get_sources (&slist, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
 		g_warning ("Could not get calendar source list from GConf!");
 		return;
 	}
 
-	group = e_source_list_peek_group_by_name (slist, _("Google"));
-
-	if (group == NULL)
-		 g_message ("\n Google Group Not found ");
-
-	if (group == NULL) {
-		gboolean res;
-		group = e_source_group_new (_("Google"), "Google://");
-		res = e_source_list_add_group (slist, group, -1);
-
-		if (res == FALSE) {
-			g_warning ("Could not add Google source group!");
-		} else {
-			e_source_list_sync (slist, NULL);
-		}
-
-		g_object_unref (group);
-		g_object_unref (slist);
-	}
+	manage_google_group (slist, FALSE);
+	g_object_unref (slist);
 }
 
 int
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 474e27d7ec..cde1135294 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-29  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #470474 (bugzilla.novell.com)
+
+	* groupwise-account-setup.c (set_esource_props): a corruption. Cleanup
+	unused strings.
+
 2008-11-11  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #440646 (bugzilla.novell.com)
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 5ca57d7c7f..fca171aab5 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -51,17 +51,9 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 {
 	ESourceList *list;
         GSList *groups;
-	char *old_relative_uri;
-	const char *poa_address;
-	CamelURL *url = camel_url_new (a->source->url, NULL);
 	
-	old_relative_uri =  g_strdup_printf ("%s@%s/", url->user, poa_address);
         list = e_source_list_new_for_gconf (client, path);
 	groups = e_source_list_peek_groups (list);
-	poa_address = url->host;
-
-	if (!poa_address || !*poa_address)
-		return;
 
 	for ( ; groups != NULL; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
@@ -87,9 +79,6 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 	e_source_list_sync (list, NULL);
 
 	g_object_unref (list);
-	g_free (old_relative_uri);
-	camel_url_free (url);
-
 }
 
 void
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 9db857dbcc..2afaec6080 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,45 @@
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* send-options.c (put_options_in_source):
+
 2009-01-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #567744
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 8a15d954dc..ed8e6093a2 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -454,7 +454,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		if (gopts->delay_enabled) {
 				tt = icaltime_today ();
 				icaltime_adjust (&tt, gopts->delay_until, 0, 0, 0);
-				val = icaltime_as_ical_string (tt);
+				val = icaltime_as_ical_string_r (tt);
 		} else
 			val = "none";
 		e_source_set_property (source, "delay-delivery", val);
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index 7dcf98134d..21a9408c9c 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am
index 7f7caf3a21..baded42123 100644
--- a/plugins/import-ics-attachments/Makefile.am
+++ b/plugins/import-ics-attachments/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/camel                           \
 	-I$(top_srcdir)/widgets/misc			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\"		\
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index e2fa79fb9c..be39031895 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,45 @@
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* ical-format.c (do_save_calendar_ical):
+
 2008-09-19  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index f6f96b1125..576c8651aa 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -89,7 +89,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 		stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error);
 
 		if (stream && !error) {
-			char *ical_str = icalcomponent_as_ical_string (top_level);
+			char *ical_str = icalcomponent_as_ical_string_r (top_level);
 
 			g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error);
 			g_output_stream_close (stream, NULL, NULL);
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 874875d906..7bd94c1240 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,46 @@
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* itip-formatter.c (find_attendee), (find_to_address),
+	(find_from_address), (update_item):
+
 2009-01-19  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #225712
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 83ea0036fb..6eebfdee92 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -169,7 +169,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 		char *attendee;
 		char *text;
 
-		attendee = icalproperty_get_value_as_string (prop);
+		attendee = icalproperty_get_value_as_string_r (prop);
 
 		 if (!attendee)
 			continue;
@@ -253,7 +253,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet
 				if (param)
 					pitip->to_name = g_strdup (icalparameter_get_cn (param));
 
-				text = icalproperty_get_value_as_string (prop);
+				text = icalproperty_get_value_as_string_r (prop);
 
 				pitip->to_address = g_strdup (itip_strip_mailto (text));
 				g_free (text);
@@ -309,7 +309,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet
 				if (param)
 					pitip->to_name = g_strdup (icalparameter_get_cn (param));
 
-				text = icalproperty_get_value_as_string (prop);
+				text = icalproperty_get_value_as_string_r (prop);
 
 				pitip->to_address = g_strdup (itip_strip_mailto (text));
 				g_free (text);
@@ -352,7 +352,7 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp)
 	if (!prop)
 		return;
 
-	organizer = icalproperty_get_value_as_string (prop);
+	organizer = icalproperty_get_value_as_string_r (prop);
 	if (organizer) {
 		organizer_clean = g_strdup (itip_strip_mailto (organizer));
 		organizer_clean = g_strstrip (organizer_clean);
@@ -992,7 +992,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response)
 	 * and you then look at it in Outlook).
 	 */
 	stamp = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
-	str = icaltime_as_ical_string (stamp);
+	str = icaltime_as_ical_string_r (stamp);
 	prop = icalproperty_new_x (str);
 	g_free (str);
 	icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 96c5abc9e4..ecbc34391d 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined and link with more libraries on
+	Windows.
+
 2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* mail-notification.c: Fix compilation error.
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 80b4fbcc98..8915fe92ad 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,3 +1,10 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS =				\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(GNOME_PLATFORM_LIBS)
+endif
+
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_MAIL_CFLAGS)		\
@@ -16,8 +23,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
-	-module -avoid-version			\
-	$(LIBNOTIFY_LIBS)			
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_notification_la_LIBADD = 	\
+	$(LIBNOTIFY_LIBS)			\
+	$(NO_UNDEFINED_REQUIRED_LIBS)
 
 if ENABLE_DBUS
 liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index ef2b70ea17..31fbc638a8 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/mail-to-meeting/Makefile.am b/plugins/mail-to-meeting/Makefile.am
index 5596678783..f3b8f44985 100644
--- a/plugins/mail-to-meeting/Makefile.am
+++ b/plugins/mail-to-meeting/Makefile.am
@@ -1,5 +1,6 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	$(EVOLUTION_CALENDAR_CFLAGS)	\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index ad020a8f0c..f3cfe042c6 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Remove a trailing space after the line continuation
+	backslash.
+
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
+
 2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index f4241c2fc3..42e1e6fb65 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
@@ -12,7 +13,7 @@ liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-	$(top_builddir)/mail/libevolution-mail.la			\ 
+	$(top_builddir)/mail/libevolution-mail.la			\
 	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(EVOLUTION_MAIL_LIBS)
 
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index ff07e79a0b..45b669ec56 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Suman Manjunath  <msuman@novell.com>
+
+	* mono-plugin.c: Include <mono/metadata/threads.h> to fix an implicit-
+	function-declaration compiler warning.
+
 2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #549025
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index 5c5182e378..18b113c614 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -28,6 +28,7 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/threads.h>
 #include <mono/jit/jit.h>
 
 #define d(x) (x)
diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog
index ca115fa827..0f031b508d 100644
--- a/plugins/pst-import/ChangeLog
+++ b/plugins/pst-import/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: On Windows use -no-undefined and link with all
+	required libraries. (Just throw in a bunch of libraries without
+	cherry-picking. Having "superfluous" ones just slows down the
+	linking a bit, but doesn't hurt at run-time.)
+
+	Use LIBPST_CFLAGS.
+
+	* pst-importer.c: Include <libpst/define.h> before the other
+	libpst headers. Otherwise we get compilation errors on Windows,
+	sigh.
+
 2009-01-15  Bharath Acharya  <abharath@novell.com>
 
 	Basic functionality implemented by 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 031b1b181e..9f3061e241 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,10 +1,19 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS =				\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_CALENDAR_LIBS)			\
+	$(EVOLUTION_MAIL_LIBS)
+endif
+
 INCLUDES =						\
 	-I$(EVOLUTION_SOURCE)				\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
 	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)			
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(LIBPST_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
@@ -12,8 +21,10 @@ plugin_DATA = org-gnome-pst-import.eplug
 plugin_LTLIBRARIES = liborg-gnome-pst-import.la
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
-liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version
-liborg_gnome_pst_import_la_LIBADD = \
+liborg_gnome_pst_import_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_pst_import_la_LIBADD =	\
+	$(NO_UNDEFINED_REQUIRED_LIBS)	\
 	$(LIBPST_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index acd84c1a67..8cbf80eb50 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -66,8 +66,8 @@
 #include <mail/mail-tools.h>
 #include <mail/em-utils.h>
 
-#include <libpst/libpst.h>
 #include <libpst/define.h>
+#include <libpst/libpst.h>
 #include <libpst/timeconv.h>
 
 typedef struct _PstImporter PstImporter;
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index ad18f9331a..afafa7790c 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,46 @@
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* publish-format-fb.c (write_calendar):
+	* publish-format-ical.c (write_calendar):
+
 2008-12-16  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #359010
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index f958fe5344..40d0258f8a 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -84,7 +84,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream)
 			objects = g_list_remove (objects, comp);
 		}
 
-		ical_string = icalcomponent_as_ical_string (top_level);
+		ical_string = icalcomponent_as_ical_string_r (top_level);
 		res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, &error);
 
 		g_free (ical_string);
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 87752e826e..f6dcc461c9 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -113,7 +113,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream)
 		g_hash_table_destroy (tdata.zones);
 		tdata.zones = NULL;
 
-		ical_string = icalcomponent_as_ical_string (top_level);
+		ical_string = icalcomponent_as_ical_string_r (top_level);
 		res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, &error);
 		g_free (ical_string);
 	}
diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog
index a5dede852e..9980fdf13d 100644
--- a/plugins/save-attachments/ChangeLog
+++ b/plugins/save-attachments/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined and link with more libs on
+	Windows.
+
 2008-09-19  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/save-attachments/Makefile.am b/plugins/save-attachments/Makefile.am
index e3ebc9f9e5..05c724a4e4 100644
--- a/plugins/save-attachments/Makefile.am
+++ b/plugins/save-attachments/Makefile.am
@@ -1,3 +1,11 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS =				\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
@@ -8,7 +16,12 @@ plugin_DATA = org-gnome-save-attachments.eplug org-gnome-save-attachments.xml
 plugin_LTLIBRARIES = liborg-gnome-save-attachments.la
 
 liborg_gnome_save_attachments_la_SOURCES = save-attachments.c
-liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version
+liborg_gnome_save_attachments_la_LDFLAGS = -module \
+	-avoid-version $(NO_UNDEFINED)
+
+liborg_gnome_save_attachments_la_LIBADD =	\
+	$(NO_UNDEFINED_REQUIRED_LIBS)
+
 
 EXTRA_DIST = 					\
 	org-gnome-save-attachments.eplug.xml	\
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index d8e69aac67..28e5ad77e1 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,45 @@
+2009-01-21  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #541209
+
+	** Adapt to the new APIs from upstream libical. Changes made include
+	using the "_r" counterpart for the following APIs:
+	+ icalproperty_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+	+ icalcomponent_as_ical_string ()
+	+ icalparameter_as_ical_string ()
+	+ icaldurationtype_as_ical_string ()
+	+ icalenum_reqstat_code ()
+	+ icallangbind_property_eval_string ()
+	+ icallangbind_quote_as_ical ()
+	+ icalmime_text_end_part ()
+	+ icalperiodtype_as_ical_string ()
+	+ icalproperty_enum_to_string ()
+	+ icalproperty_get_parameter_as_string ()
+	+ icalproperty_get_value_as_string ()
+	+ icalproperty_get_property_name ()
+	+ icalrecurrencetype_as_string ()
+	+ icaltime_as_ical_string ()
+	+ icalreqstattype_as_string ()
+	+ icalvalue_binary_as_ical_string ()
+	+ icalvalue_int_as_ical_string ()
+	+ icalvalue_utcoffset_as_ical_string ()
+	+ icalvalue_string_as_ical_string ()
+	+ icalvalue_recur_as_ical_string ()
+	+ icalvalue_text_as_ical_string ()
+	+ icalvalue_attach_as_ical_string ()
+	+ icalvalue_duration_as_ical_string ()
+	+ icalvalue_date_as_ical_string ()
+	+ icalvalue_datetime_as_ical_string ()
+	+ icalvalue_float_as_ical_string ()
+	+ icalvalue_geo_as_ical_string ()
+	+ icalvalue_datetimeperiod_as_ical_string ()
+	+ icalvalue_period_as_ical_string ()
+	+ icalvalue_trigger_as_ical_string ()
+	+ icalvalue_as_ical_string ()
+
+	* ical-format.c (do_save_calendar_ical):
+
 2008-09-16  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 1b7ccfb7b1..a537bf4641 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -136,7 +136,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 		stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error);
 
 		if (stream) {
-			char *ical_str = icalcomponent_as_ical_string (top_level);
+			char *ical_str = icalcomponent_as_ical_string_r (top_level);
 
 			g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error);
 			g_output_stream_close (stream, NULL, NULL);
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index 4d636b826a..2147b10a0a 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
+
 2008-09-19  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 551eb303a8..a8e4191ebf 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I .						\
 	-I$(top_srcdir)	                                \
 	-I$(top_builddir)/shell				\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index 6c2f54a396..b90faf0bf8 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined and link with more libraries on
+	Windows.
+
+	* tnef-plugin.c: Remove unused <sys/wait.h>.
+
 2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fixes bug #553479
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 7f52413306..809d1ed1f4 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,3 +1,11 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = 				\
+	$(EVOLUTION_MAIL_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
@@ -11,7 +19,10 @@ plugin_DATA = org-gnome-tnef-attachments.eplug
 plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
-liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef
+liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
+liborg_gnome_tnef_attachments_la_LIBADD = 		\
+	$(NO_UNDEFINED_REQUIRED_LIBS)			\
+	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
 
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index e7b5d624eb..f0152862f3 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog
index 38eabf364e..29e3e82796 100644
--- a/plugins/webdav-account-setup/ChangeLog
+++ b/plugins/webdav-account-setup/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #539467
+
+	* webdav-contacts-source.c: (find_webdav_group),
+	(ensure_webdav_contacts_source_group),
+	(remove_webdav_contacts_source_group):
+	Find group by its base uri, not by a localized name.
+
 2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fixes bug #553479
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index d85ffa79b6..2242b9050d 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -54,6 +54,28 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data);
 int
 e_plugin_lib_enable(EPluginLib *ep, int enable);
 
+static ESourceGroup *
+find_webdav_group (ESourceList *slist)
+{
+	GSList *groups, *g;
+	ESourceGroup *group = NULL;
+
+	g_return_val_if_fail (slist != NULL, NULL);
+
+	groups = e_source_list_peek_groups (slist);
+	for (g = groups; g; g = g->next) {
+		group = E_SOURCE_GROUP (g->data);
+
+		if (group && e_source_group_peek_base_uri (group) &&
+		    g_ascii_strncasecmp (BASE_URI, e_source_group_peek_base_uri (group), strlen (BASE_URI)) == 0)
+			break;
+
+		group = NULL;
+	}
+
+	return group;
+}
+
 static void
 ensure_webdav_contacts_source_group(void)
 {
@@ -66,7 +88,7 @@ ensure_webdav_contacts_source_group(void)
 		return;
 	}
 
-	group = e_source_list_peek_group_by_name(source_list, _("WebDAV"));
+	group = find_webdav_group (source_list);
 
 	if (group == NULL) {
 		gboolean res;
@@ -81,7 +103,10 @@ ensure_webdav_contacts_source_group(void)
 		}
 
 		g_object_unref(group);
+	} else {
+		e_source_group_set_name (group, _("WebDAV"));
 	}
+
 	g_object_unref(source_list);
 }
 
@@ -97,7 +122,7 @@ remove_webdav_contacts_source_group(void)
 		return;
 	}
 
-	group = e_source_list_peek_group_by_name(source_list, _("WebDAV"));
+	group = find_webdav_group (source_list);
 
 	if (group) {
 		GSList *sources;
diff --git a/po/ChangeLog b/po/ChangeLog
index c2838cc0f4..01c5defb62 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,76 @@
+2009-01-31  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-30  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+
+	* vi.po: Don't translate the gconf keys, #569508
+
+2009-01-30  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Don't translate the gconf keys. Closes
+	bug #569528
+
+2009-01-29  Jonh Wendell  <jwendell@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2009-01-29  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-29  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in: Added plugins/pst-import/pst-importer.c
+
+2009-01-29  Raivis Dejus  <orvils@gmail.com>
+
+	* lv.po: Updated latvian translation Bug 569534
+	
+2009-01-29  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Bug fix for #569517.
+
+2009-01-29  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Bug fix for #569526.
+
+2009-01-28  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian Translations (by Miloš Popović).
+
+2009-01-29  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2009-01-28  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-24  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2009-01-24  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-01-23  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2009-01-22  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Fixed bug 567778 in Polish translation
+
 2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 799209a73c..196b19a540 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -398,6 +398,7 @@ plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
 plugins/prefer-plain/prefer-plain.c
 plugins/profiler/org-gnome-evolution-profiler.eplug.xml
 plugins/pst-import/org-gnome-pst-import.eplug.xml
+plugins/pst-import/pst-importer.c
 plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
 plugins/publish-calendar/org-gnome-publish-calendar.xml
 plugins/publish-calendar/publish-calendar.c
diff --git a/po/de.po b/po/de.po
index 87e2605626..d78247fcf4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 20:14+0100\n"
-"PO-Revision-Date: 2009-01-16 20:15+0100\n"
-"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
+"POT-Creation-Date: 2009-01-23 10:08+0100\n"
+"PO-Revision-Date: 2009-01-24 17:40+0100\n"
+"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,12 +37,12 @@ msgid "evolution address book"
 msgstr "Evolution-Adressbuch"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -174,8 +174,8 @@ msgstr "%A, %d. %B %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -183,9 +183,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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -193,10 +193,10 @@ msgstr "%a, %d. %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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -206,8 +206,8 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1600
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d. %b"
@@ -618,10 +618,12 @@ msgstr "Zertifikate"
 msgid "Configure autocomplete here"
 msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -659,75 +661,96 @@ msgstr "Bedienelement zur Konfiguration von Evolution-Ordnern"
 msgid "Manage your S/MIME certificates here"
 msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "Auf diesem Computer"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persönlich"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adressb_uch"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Aktualisieren der Adressbucheinstellungen oder -ordner gescheitert."
 
@@ -751,7 +774,7 @@ msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2466
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
@@ -877,18 +900,18 @@ msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
 #: ../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
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
 #: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/calendar-component.c:681
 #: ../calendar/gui/e-calendar-table.c:1610
-#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
 #: ../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
@@ -897,9 +920,9 @@ msgid "_Delete"
 msgstr "_Löschen"
 
 #: ../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
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
 #: ../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"
@@ -977,7 +1000,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI des zuletzt im Namenswähler verwendeten Ordners."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste"
 
@@ -1443,7 +1466,7 @@ msgstr "_Geburtstag:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -2591,7 +2614,7 @@ msgstr "Privat"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Weitere"
 
@@ -2850,7 +2873,7 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
 #: ../calendar/gui/e-day-view-time-item.c:815
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
@@ -3022,9 +3045,9 @@ msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/dialogs/comp-editor.c:2090
 #: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1773 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
@@ -3080,7 +3103,7 @@ msgstr "_Ausschneiden"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:487
 #: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1780 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
 #: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
 #: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
@@ -3469,7 +3492,7 @@ msgstr "Video-Chat"
 #: ../addressbook/gui/widgets/eab-contact-display.c:628
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2496
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3505,12 +3528,12 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2534
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2535
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -3582,7 +3605,7 @@ msgstr "Protokoll nicht unterstützt"
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -4674,13 +4697,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1343
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4724,17 +4747,17 @@ msgstr "_Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:1025 ../calendar/gui/memos-control.c:350
 #: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:482
 #: ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
@@ -4793,7 +4816,7 @@ msgstr "Termine"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1614
 #: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "Location:"
 msgstr "Ort:"
 
@@ -4806,7 +4829,7 @@ msgid "_Dismiss"
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -5225,24 +5248,29 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-msgid "Show week numbers in date navigator"
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Show week numbers in date navigator"
+msgstr "Wochennummern im Datumsnavigator anzeigen"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Farbe heute fälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Aufgabenansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5252,7 +5280,7 @@ msgstr ""
 "wird durch den Benutzerteil der E-Mail-Adresse und »%d« durch die Domain "
 "ersetzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5260,11 +5288,11 @@ msgstr ""
 "Die Vorgabezeitzone zur Verwendung für Datum und Zeit im Kalender als "
 "unübersetzer Ort der Olsen-Zeitzonendatenbank, z.B. »Europe/Berlin«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "The second timezone for a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 #, fuzzy
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
@@ -5273,20 +5301,20 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Zeit der letzten Alarmauslösung im »time_t«-Format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5294,43 +5322,43 @@ msgstr ""
 "Transparenz der Ereignisse in der Kalenderansicht; ein Wert zwischen 0 "
 "(transparent) und 1 (deckend)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einheit für eine Vorgabeerinnerung (»minutes«, »hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit zur Festlegung, wann Aufgaben verborgen werden sollen (»minutes«, "
 "»hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Wochenanfang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "Wochentag von Sonntag (»0«) bis Sonnabend (»6«), mit dem die Woche beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Soll das Benachrichtigungsfeld für Alarmausgaben verwendet werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Soll beim Löschen von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Soll beim Säubern von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5338,97 +5366,102 @@ msgstr ""
 "Sollen Wochenenden in der Monatsansicht komprimiert werden, wobei die Tage "
 "Sonnabend und Sonntag im Raum eines einzelnen Wochentages enthalten sind?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Sollen die Endzeiten von Ereignissen in den Wochen- und Monatsansichten "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Soll eine Vorgabeerinnerung für Termine festgelegt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Soll das Kategoriefeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Soll das Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Soll das Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Sollen Zeiten im 24-Stunden- und nicht im »AM/PM«-Format angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Soll das Zeitzonenfeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Sollen die Wochennummern im Datumsnavigator angezeigt werden?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Sollen die Wochennummern im Datumsnavigator angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Legt fest, ob die Sommerzeit beim Anzeigen von Terminen beachtet wird."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Arbeitstage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Stunde, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minute, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Stunde, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "Sommerzeit"
 
@@ -5511,116 +5544,125 @@ msgstr "Ereignisse löschen älter als"
 msgid "days"
 msgstr "Tage"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../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
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../calendar/gui/calendar-component.c:658
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
 #: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
 msgid "_Make available for offline use"
 msgstr "Für Offline-_Benutzung verfügbar machen"
 
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "_Nicht im Offline-Modus verfügbar machen"
 
-#: ../calendar/gui/calendar-component.c:995
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1176
+#: ../calendar/gui/calendar-component.c:1194
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Besprechungen "
 "geöffnet werden"
 
-#: ../calendar/gui/calendar-component.c:1192
+#: ../calendar/gui/calendar-component.c:1210
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Es ist kein Kalender zum Anlegen von Ereignissen und Besprechungen verfügbar"
 
-#: ../calendar/gui/calendar-component.c:1305
+#: ../calendar/gui/calendar-component.c:1323
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../calendar/gui/calendar-component.c:1521
+#: ../calendar/gui/calendar-component.c:1539
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1522
+#: ../calendar/gui/calendar-component.c:1540
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../calendar/gui/calendar-component.c:1523
+#: ../calendar/gui/calendar-component.c:1541
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1529
+#: ../calendar/gui/calendar-component.c:1547
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1530
+#: ../calendar/gui/calendar-component.c:1548
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1531
+#: ../calendar/gui/calendar-component.c:1549
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../calendar/gui/calendar-component.c:1537
+#: ../calendar/gui/calendar-component.c:1555
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1538
+#: ../calendar/gui/calendar-component.c:1556
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1539
+#: ../calendar/gui/calendar-component.c:1557
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1563
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1564
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../calendar/gui/calendar-component.c:1547
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -5667,7 +5709,7 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Vertraulich"
@@ -5701,13 +5743,13 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
 #: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Öffentlich"
@@ -5902,8 +5944,8 @@ msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/event-page.c:2954
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
@@ -5917,14 +5959,14 @@ msgstr "Datei(en) beilegen"
 #: ../plugins/email-custom-header/email-custom-header.c:370
 #: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../plugins/itip-formatter/itip-formatter.c:2179
 #: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
 #: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Alarme"
 
@@ -6064,126 +6106,140 @@ msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "Eine _Erinnerung anzeigen"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Wochennummern im Datumsnavigator anzeigen"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten rückfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "M_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
@@ -6289,23 +6345,23 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "Fällig am "
 
@@ -6336,7 +6392,7 @@ msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
@@ -6346,210 +6402,210 @@ msgstr "Anlage"
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Keep original item?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Den in der Zwischenablage befindlichen Text einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1374
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1416 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1457
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1462
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1464
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1471
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1479
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1487
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1495
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1497
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1503
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1505
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../calendar/gui/dialogs/comp-editor.c:1828
 #: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "_Zuletzt geöffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../calendar/gui/dialogs/comp-editor.c:1847
 #: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1933
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anlage"
 msgstr[1] "<b>%d</b> Anlagen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1965
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1968
-#: ../calendar/gui/dialogs/comp-editor.c:2271
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2091
 #: ../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
@@ -6558,31 +6614,31 @@ msgstr "Anla_genleiste anzeigen"
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../calendar/gui/dialogs/comp-editor.c:2094
 #: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../calendar/gui/dialogs/comp-editor.c:2302
 #: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Durch Drücken der Leertaste wird die Anlagenleiste ein bzw. ausgeblendet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2439
-#: ../calendar/gui/dialogs/comp-editor.c:2487
-#: ../calendar/gui/dialogs/comp-editor.c:3333
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3362
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -6906,7 +6962,7 @@ msgstr "Ko_ntakte …"
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "Notiz"
 
@@ -7155,6 +7211,10 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -7181,7 +7241,7 @@ msgstr "<b>Status</b>"
 #: ../calendar/gui/e-calendar-table.c:237
 #: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -7199,7 +7259,7 @@ msgstr "Hoch"
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -7212,7 +7272,7 @@ msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
@@ -7222,7 +7282,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
@@ -7426,7 +7486,7 @@ msgstr "Fällig am:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1181
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Status:"
 msgstr "Status:"
 
@@ -7464,7 +7524,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:745
@@ -7472,7 +7532,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7480,7 +7540,7 @@ msgid "No"
 msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
 #: ../calendar/gui/e-meeting-list-view.c:166
@@ -7489,18 +7549,18 @@ msgstr "Nein"
 #: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
 #: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
 #: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Zugewiesen"
 
@@ -7518,7 +7578,7 @@ msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1774 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Speichern unter …"
@@ -7543,7 +7603,7 @@ msgstr "* Keine Zusammenfassung *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2395
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -7551,7 +7611,7 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
@@ -7609,23 +7669,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
 #: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
 #: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Speichern unter …"
 
 #: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
@@ -7634,20 +7694,20 @@ msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
 #: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1759 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Drucken …"
 
 #: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1779 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
 #: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1762
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
@@ -7717,7 +7777,7 @@ msgstr "Anfangsdatum"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2307
 #: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
@@ -7725,127 +7785,127 @@ msgstr "Anfangsdatum"
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1442
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1753
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1754
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1766
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1775
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1786
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1791 ../mail/em-folder-view.c:1327
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
 #: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1797 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
-#: ../calendar/gui/e-calendar-view.c:2250
+#: ../calendar/gui/e-calendar-view.c:2254
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:2192
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:2251
+#: ../calendar/gui/e-calendar-view.c:2255
 #: ../calendar/gui/e-itip-control.c:1194
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2132
+#: ../plugins/itip-formatter/itip-formatter.c:2198
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-calendar-view.c:2256
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-calendar-view.c:2253
+#: ../calendar/gui/e-calendar-view.c:2257
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../plugins/itip-formatter/itip-formatter.c:2201
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-calendar-view.c:2258
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2415 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2449
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -7889,23 +7949,29 @@ msgstr "Das Vorschaufeld anzeigen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
 #: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
 #: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "PM"
 
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Woche"
+
 #: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
@@ -8000,12 +8066,12 @@ msgstr "iCalendar-Fehler"
 
 #: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
@@ -8019,7 +8085,7 @@ msgstr ""
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
 #: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -8245,7 +8311,7 @@ msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
 #: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
@@ -8575,43 +8641,43 @@ msgstr "Zeitzone auswählen"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2621
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2622
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2627
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2879
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2888
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:3000
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3968
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8786,79 +8852,79 @@ msgstr "iCalendar-Informationen"
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/memos-component.c:499
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:582
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d gewählt"
 msgstr[1] ", %d gewählt"
 
-#: ../calendar/gui/memos-component.c:631
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Auffrischen der Notizen gescheitert."
 
-#: ../calendar/gui/memos-component.c:873
+#: ../calendar/gui/memos-component.c:882
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Die Notizliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/memos-component.c:886
+#: ../calendar/gui/memos-component.c:895
 msgid "There is no calendar available for creating memos"
 msgstr "Es ist kein Kalender zum Anlegen von Notizen verfügbar"
 
-#: ../calendar/gui/memos-component.c:996
+#: ../calendar/gui/memos-component.c:1005
 msgid "Memo Source Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1184
 msgid "New memo"
 msgstr "Neue Notiz"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1185
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Notiz"
 
-#: ../calendar/gui/memos-component.c:1177
+#: ../calendar/gui/memos-component.c:1186
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1192
 msgid "New shared memo"
 msgstr "Neue gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1193
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Ge_meinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1185
+#: ../calendar/gui/memos-component.c:1194
 msgid "Create a shared new memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1200
 msgid "New memo list"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:1192
+#: ../calendar/gui/memos-component.c:1201
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Noti_zliste"
 
-#: ../calendar/gui/memos-component.c:1193
+#: ../calendar/gui/memos-component.c:1202
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
@@ -9069,118 +9135,118 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2471
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2473
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2498
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2521
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2561
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2578
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2590
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2626
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: ../calendar/gui/tasks-component.c:490
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:573
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../calendar/gui/tasks-component.c:622
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Auffrischen der Aufgaben gescheitert."
 
-#: ../calendar/gui/tasks-component.c:861
+#: ../calendar/gui/tasks-component.c:870
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/tasks-component.c:874
+#: ../calendar/gui/tasks-component.c:883
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
-#: ../calendar/gui/tasks-component.c:985
+#: ../calendar/gui/tasks-component.c:994
 msgid "Task Source Selector"
 msgstr "Aufgabenquellenauswahl"
 
-#: ../calendar/gui/tasks-component.c:1239
+#: ../calendar/gui/tasks-component.c:1248
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1240
+#: ../calendar/gui/tasks-component.c:1249
 msgctxt "New"
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1241
+#: ../calendar/gui/tasks-component.c:1250
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1247
+#: ../calendar/gui/tasks-component.c:1256
 msgid "New assigned task"
 msgstr "Zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1248
+#: ../calendar/gui/tasks-component.c:1257
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Zuge_wiesene Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1255
+#: ../calendar/gui/tasks-component.c:1264
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:1256
+#: ../calendar/gui/tasks-component.c:1265
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Au_fgabenliste"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
@@ -9232,7 +9298,7 @@ msgstr "Termine und Besprechungen"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
@@ -12021,14 +12087,23 @@ msgstr "Signatur(en)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12036,7 +12111,7 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
@@ -12899,7 +12974,7 @@ msgstr "am %d. %b, %k:%M"
 
 #: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
-msgstr "_Inline (eingebettet) anzeigen"
+msgstr "_Eingebettet anzeigen"
 
 #: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
@@ -13970,7 +14045,7 @@ msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
-msgstr "Intervall für Abgleich mit Servern"
+msgstr "Intervall für Datenabgleich mit Servern"
 
 #: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
@@ -14782,7 +14857,7 @@ msgstr "Eingebettet"
 
 #: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
-msgstr "Inline (Outlook-Stil)"
+msgstr "Eingebettet (Outlook-Stil)"
 
 #: ../mail/mail-config.glade.h:99
 msgid "KB"
@@ -15485,26 +15560,26 @@ msgstr "Warten …"
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
@@ -16261,7 +16336,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
@@ -18715,124 +18790,124 @@ msgstr "Der Kalender »%s« konnte nicht geladen werden"
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein Termin im Kalender »%s« überschneidet sich mit dieser Besprechung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:748
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:827
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1054
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1066
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1075
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1080
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1174
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Delegaten %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1181
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Delegaten nicht zugestellt werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht "
 "aktualisiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1318
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1322
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1354
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung "
 "existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert "
 "nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18840,15 +18915,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1490
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-#: ../plugins/itip-formatter/itip-formatter.c:1600
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-#: ../plugins/itip-formatter/itip-formatter.c:1601
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18856,11 +18931,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1530
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1531
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18868,229 +18943,229 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2240
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2243
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2246
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2492
-#: ../plugins/itip-formatter/itip-formatter.c:2524
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2507
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Bitte antworten Sie im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Erhalten im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> hat folgende Besprechung an Sie delegiert:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -19099,7 +19174,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht, aktuelle Informationen zu folgender Besprechung "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -19107,82 +19182,82 @@ msgstr ""
 "<b>%s</b> wünscht, aktuelle Informationen zu folgender Besprechung zu "
 "erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> hat folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> hat folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -19191,7 +19266,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht aktuelle Informationen zu folgender zugewiesener "
 "Aufgabe zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -19200,7 +19275,7 @@ msgstr ""
 "<b>%s</b> wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -19208,23 +19283,23 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe "
 "geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -19232,143 +19307,152 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Änderungen an der Aufgabenzuweisung "
 "vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> hat die folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> hat folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> hat folgende gemeinsame Notiz gelöscht:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "Ab_lehnen"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "Ab_lehnen"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "An_nehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "A_ktualisieren"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Endzeit:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Anlagenerinnerung"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "Auf_gaben:"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Notizen:"
 
@@ -22628,7 +22712,7 @@ msgstr "Ansicht ver_kleinern"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
-msgstr "Beige_legt"
+msgstr "_Anhang"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
@@ -22660,7 +22744,7 @@ msgstr "_Wichtig"
 
 #: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
-msgstr "An Or_t und Stelle"
+msgstr "_Eingebettet"
 
 #: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
@@ -22998,7 +23082,7 @@ msgstr "Erscheinungsbild der _Schaltflächen"
 
 #: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr "S_ynchronisationsoptionen …"
+msgstr "_Datenabgleichsoptionen …"
 
 #: ../ui/evolution.xml.h:54
 msgid "_Text Only"
diff --git a/po/es.po b/po/es.po
index 9438188105..4ef60f0268 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-01-19 17:15+0000\n"
-"PO-Revision-Date: 2009-01-19 19:20+0100\n"
+"POT-Creation-Date: 2009-01-29 11:13+0000\n"
+"PO-Revision-Date: 2009-01-30 13:34+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"
@@ -33,12 +33,12 @@ msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
@@ -159,7 +159,7 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o más días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
@@ -170,7 +170,7 @@ msgstr "%A, %e de %b de %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:806
+#: ../calendar/gui/calendar-component.c:824
 #: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
@@ -179,9 +179,9 @@ msgstr "%a, %e de %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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -189,10 +189,10 @@ msgstr "%a, %e de %b de %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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -202,7 +202,7 @@ msgstr "%e de %B de %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:832
+#: ../calendar/gui/calendar-component.c:850
 #: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
@@ -612,10 +612,12 @@ msgstr "Certificados"
 msgid "Configure autocomplete here"
 msgstr "Configure el autocompletado aquí"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -653,75 +655,96 @@ msgstr "Control de configuración de preferencias de carpetas de Evolution"
 msgid "Manage your S/MIME certificates here"
 msgstr "Gestione sus certificados S/MIME aquí"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "En este equipo"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Privado"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Crea una libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
@@ -871,18 +894,18 @@ msgid "Save As vCard..."
 msgstr "Guardar como vCard…"
 
 #: ../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
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
 #: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-calendar-table.c:1610
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
 #: ../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
@@ -891,9 +914,9 @@ msgid "_Delete"
 msgstr "_Borrar"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2084
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
 #: ../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"
@@ -3019,9 +3042,9 @@ msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -3076,8 +3099,8 @@ msgstr "Cor_tar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
 #: ../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
@@ -3578,7 +3601,7 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -4636,8 +4659,8 @@ msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4679,8 +4702,8 @@ msgstr "_Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
 #: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notas"
@@ -4688,9 +4711,8 @@ msgstr "Notas"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
 #: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
-#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4705,8 +4727,9 @@ msgstr "Tareas"
 msgid "_Calendars"
 msgstr "_Calendarios"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
 
@@ -5187,7 +5210,6 @@ msgstr ""
 "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-#| msgid "Show week numbers in date navigator"
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Mostrar los números de las semanas en las Vistas diaria y Vista de la semana "
@@ -5378,7 +5400,6 @@ msgstr ""
 "reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indica si debe mostrar los números de la semana en la Vista diaria y en la "
@@ -5497,114 +5518,123 @@ msgstr "Purgar acontecimientos anteriores a"
 msgid "days"
 msgstr "días"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../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
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "En la web"
 
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Meteorología"
 
-#: ../calendar/gui/calendar-component.c:658
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
 #: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
 msgid "_Make available for offline use"
 msgstr "_Hacer esto disponible para su uso desconectado"
 
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "_No hacer esto disponible sin conexión"
 
-#: ../calendar/gui/calendar-component.c:995
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Falló al actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1176
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir el calendario «%s» para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1192
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1305
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1521
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1522
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1523
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1529
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1530
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1531
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1537
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1538
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1539
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1547
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5889,7 +5919,7 @@ msgstr "Adjuntar archivo(s)"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/event-page.c:2955
 #: ../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
@@ -6046,7 +6076,6 @@ msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#| msgid "Sh_ow a reminder"
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
@@ -6055,7 +6084,6 @@ 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:43
-#| msgid "Show week numbers in date navigator"
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la "
@@ -6290,23 +6318,23 @@ msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr "(Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
 msgid "Due "
 msgstr "Vence "
 
@@ -6337,7 +6365,7 @@ msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
 #: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
@@ -6524,65 +6552,65 @@ msgstr "Campo de _tipo"
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1820
+#: ../calendar/gui/dialogs/comp-editor.c:1828
 #: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1839
+#: ../calendar/gui/dialogs/comp-editor.c:1847
 #: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1934
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> adjunto"
 msgstr[1] "<b>%d</b> adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1966
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1969
-#: ../calendar/gui/dialogs/comp-editor.c:2272
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2094
 #: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../calendar/gui/dialogs/comp-editor.c:2302
 #: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2295
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../calendar/gui/dialogs/comp-editor.c:2488
-#: ../calendar/gui/dialogs/comp-editor.c:3334
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3363
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6720,7 +6748,7 @@ msgid "Appoint_ment"
 msgstr "_Cita"
 
 #: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2724
+#: ../calendar/gui/dialogs/event-page.c:2725
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
@@ -6782,45 +6810,45 @@ msgstr "Se requiere un organizador."
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Añadir"
 
-#: ../calendar/gui/dialogs/event-page.c:2600
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/event-page.c:2645
 #: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1803
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nombre de <b>%s</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes de la cita"
 msgstr[1] "%d días antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Personalizar"
 
@@ -6899,7 +6927,7 @@ msgstr "_Contactos…"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Nota"
 
@@ -7173,7 +7201,7 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-calendar-table.c:237
 #: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Terminado"
@@ -7191,7 +7219,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "En proceso"
 
@@ -7214,7 +7242,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
@@ -7275,7 +7303,7 @@ msgstr "Organi_zador:"
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1760
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -7508,8 +7536,8 @@ msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
 #: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Guardar _como…"
@@ -7604,76 +7632,76 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-table.c:1584
 #: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
 #: ../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 "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1606
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar tareas seleccionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1611
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1848
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7830,7 +7858,7 @@ msgid "Needs action"
 msgstr "Necesita una acción"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -7899,7 +7927,6 @@ msgstr "pm"
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
 #: ../calendar/gui/e-day-view.c:2322
 #, c-format
-#| msgid "Week"
 msgid "Week %d"
 msgstr "Semana %d"
 
@@ -8513,11 +8540,11 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Miembro"
 
-#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Borrar las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pulse aquí para añadir una nota"
 
@@ -8663,32 +8690,32 @@ msgstr "Septiembre"
 msgid "_Select Today"
 msgstr "_Seleccionar hoy"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Información del acontecimiento"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Información de la nota"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Información de calendario"
 
@@ -8696,7 +8723,7 @@ msgstr "Información de calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:668
+#: ../calendar/gui/itip-utils.c:674
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -8705,7 +8732,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:675
+#: ../calendar/gui/itip-utils.c:681
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -8717,7 +8744,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rehusado"
@@ -8726,7 +8753,7 @@ msgstr "Rehusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:689
+#: ../calendar/gui/itip-utils.c:695
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -8734,7 +8761,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:702
+#: ../calendar/gui/itip-utils.c:708
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -8742,7 +8769,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:709
+#: ../calendar/gui/itip-utils.c:715
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -8750,7 +8777,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:722
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -8758,97 +8785,97 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:723
+#: ../calendar/gui/itip-utils.c:729
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: ../calendar/gui/itip-utils.c:793
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:972
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:499
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../calendar/gui/memos-component.c:582
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionado"
 msgstr[1] ", %d seleccionados"
 
-#: ../calendar/gui/memos-component.c:631
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Fallo al actualizar las notas."
 
-#: ../calendar/gui/memos-component.c:873
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de notas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/memos-component.c:886
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "No hay un calendario disponible para crear notas"
 
-#: ../calendar/gui/memos-component.c:996
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Selector de origen de notas"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Nota nueva"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
-#: ../calendar/gui/memos-component.c:1177
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1185
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Crea una nota compartida nueva"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/memos-component.c:1192
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
-#: ../calendar/gui/memos-component.c:1193
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -9059,118 +9086,118 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2478
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2505
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2568
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2597
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2609
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2622
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2633
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasks-component.c:490
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../calendar/gui/tasks-component.c:573
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../calendar/gui/tasks-component.c:622
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: ../calendar/gui/tasks-component.c:861
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/tasks-component.c:874
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay un calendario disponible para crear tareas"
 
-#: ../calendar/gui/tasks-component.c:985
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Selector de origen de tareas"
 
-#: ../calendar/gui/tasks-component.c:1239
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1240
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/tasks-component.c:1241
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1247
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: ../calendar/gui/tasks-component.c:1248
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../calendar/gui/tasks-component.c:1255
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/tasks-component.c:1256
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de ta_reas"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -11877,6 +11904,7 @@ msgid "Network Preferences"
 msgstr "Preferencias de red"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "Co_rreo"
 
@@ -12526,6 +12554,7 @@ msgstr "Copiando «%s» a «%s»"
 #: ../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
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
@@ -14233,10 +14262,12 @@ msgid "Import mail from Elm."
 msgstr "Importar correo de Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
@@ -14252,7 +14283,10 @@ msgstr "Importador de carpetas en formato buzón de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
@@ -16370,28 +16404,28 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Complemento de sonido en línea"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution después del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution después de la restauración"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -16401,118 +16435,118 @@ msgstr ""
 "todos los correos, calendarios, tareas, notas, libreta de direcciones.\n"
 "También restaura su configuración personal, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Respaldar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Restaurar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Comprobar respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Reiniciar Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Con interfaz gráfica de usuario"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Cerrando Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Respaldar las cuentas y la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
 "notas)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Respaldo completado"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Reiniciando Evolution"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Respaldar los datos actuales de Evolution"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Extrayendo archivos del respaldo"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Carga la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Eliminando archivos temporales de respaldo"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Asegurando fuentes locales"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Respaldando a la carpeta %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Restaurador de Evolution"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Respaldando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mientras Evolution respalda sus datos."
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Restaurando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mientras Evolution restaura sus datos."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
@@ -16645,27 +16679,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocurrió un error al crear %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Falló la tubería hacia Bogofilter, código de error: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Convertir el texto del correo a _Unicode"
 
@@ -17936,11 +17970,11 @@ msgstr "Redactar en un editor _externo"
 msgid "Compose messages using an external editor"
 msgstr "Redactar mensajes usando un editor externo"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando que ejecutar para lanzar el editor: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -19241,7 +19275,6 @@ msgid "_Preserve my reminder"
 msgstr "Conser_var mi recordatorio"
 
 #: ../plugins/itip-formatter/itip-view.c:1141
-#| msgid "Attachment Reminder"
 msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
@@ -19818,6 +19851,29 @@ msgstr "Importador PST de Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+#| msgid "Address Book"
+msgid "_Address Book"
+msgstr "Libreta de _direcciones"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+#| msgid "Appointments"
+msgid "A_ppointments"
+msgstr "Ci_tas"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+#| msgid "Journal"
+msgid "_Journal entries"
+msgstr "Entradas del dia_rio"
+
+#: ../plugins/pst-import/pst-importer.c:352
+#| msgid "Importing Elm data"
+msgid "Importing Outlook data"
+msgstr "_Importando datos de Outlook"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Permite publicar calendarios en la web"
diff --git a/po/fi.po b/po/fi.po
index bea7bbc100..d5984ef138 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,21 +1,21 @@
 # Finnish messages for evolution
-# Copyright (C) 2000-2008 Free Software Foundation, Inc.
+# Copyright (C) 2000-2009 Free Software Foundation, Inc.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001,
 # Sami Pesonen <sampeson@iki.fi> 2001-2003,
-# Ilkka Tuohela <hile@iki.fi> 2003-2008.
+# Ilkka Tuohela <hile@iki.fi> 2003-2009.
 # Timo Jyrinki <timo.jyrinki@iki.fi> 2008.
 #
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
 #
-#: ../shell/main.c:594
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-09 15:23+0300\n"
-"PO-Revision-Date: 2008-12-15 14:36+0200\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
+"POT-Creation-Date: 2009-01-30 07:04+0300\n"
+"PO-Revision-Date: 2009-01-30 07:05+0300\n"
+"Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,12 +29,12 @@ msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
@@ -155,7 +155,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
@@ -166,8 +166,8 @@ msgstr "%A %d. %Bta %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:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1579
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -175,9 +175,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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -185,10 +185,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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -198,8 +198,8 @@ msgstr "%d. %Bta %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:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1595
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -418,7 +418,7 @@ msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -572,17 +572,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: ../addressbook/conduit/address-conduit.c:1321
-#: ../addressbook/conduit/address-conduit.c:1322
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "Osoitekirjaa ei voitu ladata"
 
-#: ../addressbook/conduit/address-conduit.c:1399
-#: ../addressbook/conduit/address-conduit.c:1402
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voi lukea"
 
@@ -603,10 +603,12 @@ msgstr "Varmenteet"
 msgid "Configure autocomplete here"
 msgstr "Määrittele automaattinen täydennys"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1215
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -644,75 +646,96 @@ msgstr "Evolution kansioasetusten määrittelyjen ohjain"
 msgid "Manage your S/MIME certificates here"
 msgstr "Hallitse S/Mime-varmenteita"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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:1518
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
@@ -731,18 +754,18 @@ msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2466
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Osoitekirja"
@@ -837,60 +860,60 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä \"%s\" uudestaan: "
 
-#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-view.c:952
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/component/addressbook-view.c:953
-#: ../calendar/gui/calendar-component.c:660
-#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
-#: ../mail/em-folder-tree.c:2115 ../ui/evolution-mail-list.xml.h:39
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../addressbook/gui/component/addressbook-view.c:956
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:663
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:681
 #: ../calendar/gui/e-calendar-table.c:1609
-#: ../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:2112 ../mail/em-folder-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
 #: ../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 "_Poista"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2045
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
-#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2121
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "_Ominaisuudet..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1225
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Yhteystietojen lähdevalinta"
 
@@ -911,7 +934,7 @@ msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/google-account-setup/google-source.c:422
 #: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -962,7 +985,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
@@ -1178,11 +1201,12 @@ msgstr ""
 "hakupohjastasi alaspäin."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-#, fuzzy
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com\"."
+msgstr ""
+"Tämä kenttä on LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com"
+"\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1193,13 +1217,12 @@ msgstr ""
 "asettaminen liian suureksi hidastaa osoitekirjaasi."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 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 ""
-"Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että tämä "
+"Tämä on menetelmä, jota evolution käyttää tunnistamiseesi. Huomaa, että "
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
@@ -1290,8 +1313,8 @@ msgstr "kortteja"
 #: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:671
-#: ../plugins/google-account-setup/google-contacts-source.c:338
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-contacts-source.c:366
 msgid "minutes"
 msgstr "minuutti"
 
@@ -1333,7 +1356,7 @@ msgstr "<b>Työ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1362,11 +1385,12 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Kuva"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1379,7 +1403,7 @@ msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
 #: ../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"
 
@@ -1397,10 +1421,10 @@ msgstr "Puhelin"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Työ"
@@ -1425,7 +1449,7 @@ msgstr "_Syntymäpäivä:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -1513,15 +1537,15 @@ msgstr "_Missä: "
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Osoite"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
@@ -1536,975 +1560,975 @@ msgstr "Osoite"
 msgid "Editable"
 msgstr "Muokattava"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../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 "Algeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikkalainen Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Etelämanner"
 
-#: ../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 ja Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: ../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 "Itävalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbaidzan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamasaaret"
 
-#: ../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 "Bangladesh"
 
-#: ../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 "Valko-Venäjä"
 
-#: ../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 "Bermudasaaret"
 
-#: ../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 "Bolivia"
 
-#: ../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 "Bosnia-Hertsegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvet-saari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../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 "Brittiläinen Intian valtameren alue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../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 "Kambodza"
 
-#: ../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 "Kap Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Caymansaaret"
 
-#: ../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 "Keski-Afrikan Tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tsad"
 
-#: ../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 "Kiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Joulusaaret"
 
-#: ../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 "Kookos(Keeling)-saaret"
 
-#: ../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 "Komorit"
 
-#: ../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 "Kongon demokraattinen tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cookinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Norsunluurannikko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tšekki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Tanska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Dominikaaninen Tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egypti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Päiväntasaajan Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Viro"
 
-#: ../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 "Falklandsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Färsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidzi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Ranska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Ranskan Guiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynesia"
 
-#: ../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 "Ranskan eteläiset alueet"
 
-#: ../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 "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../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 "Kreikka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grönlanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard ja McDonaldinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Pyhä meri"
 
-#: ../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 "Unkari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Intia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../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 "Irlanti"
 
-#: ../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 "Mansaari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japani"
 
-#: ../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 "Kazakstan"
 
-#: ../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 "Korean demokraattinen kansantasavalta"
 
-#: ../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 "Korean tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgisia"
 
-#: ../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 "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libya"
 
-#: ../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 "Liettua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: ../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 "Malesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Malediivit"
 
-#: ../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 "Marshallinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesia"
 
-#: ../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 "Moldova"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "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 "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Uusi 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 "Uusi-Seelanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolkinsaari"
 
-#: ../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 "Pohjois-Mariaanit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norja"
 
-#: ../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 "Palestiinalainen alue"
 
-#: ../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 Uusi-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: ../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 "Puola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Venäjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja 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 ja Grenadiinit"
 
-#: ../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 "São Tomé ja Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: ../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 ja Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychillit"
 
-#: ../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 "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Salomonsaaret"
 
-#: ../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 "Etelä-Afrikka"
 
-#: ../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 "Etelä-Georgia ja Eteläiset Sandwichsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../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 "Saint 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 ja Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard ja 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 "Swazimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syyria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadkistan"
 
-#: ../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 "Tansania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks- ja Caicossaaret"
 
-#: ../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 "Yhdistyneet arabiemiirikunnat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../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 "Yhdysvaltain pienet erillissaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "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 "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Brittiläiset Neitsytsaaret"
 
-#: ../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 "Yhdysvaltain Neitsytsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja 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 "Länsi-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "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
@@ -2516,41 +2540,41 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo -pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu -pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:61
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Palvelu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
@@ -2558,41 +2582,41 @@ msgstr "Palvelu"
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:529
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Muut"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "Groupwise"
 
@@ -2662,23 +2686,23 @@ msgstr "%s'%s' on tyhjä"
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -2831,6 +2855,9 @@ msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -2858,7 +2885,7 @@ msgstr "_Jäsenet"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2916,23 +2943,23 @@ msgstr "Yhdistä yhteystieto"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-#: ../addressbook/gui/widgets/eab-contact-display.c:601
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
 #: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Sähköposti"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../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 "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
@@ -2953,7 +2980,7 @@ msgstr[1] "%d yhteystietoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2976,114 +3003,114 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Lähde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2043
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2090
 #: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-calendar-view.c:1746 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Kopioi osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Siirrä osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:487
 #: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1753 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1327 ../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 "_Kopioi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "L_iitä"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../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 "Mikä tahansa luokka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
+#: ../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 "Täsmäämättömät"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -3113,7 +3140,7 @@ msgstr "Autopuhelin"
 
 #: ../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
@@ -3121,7 +3148,7 @@ msgid "Categories"
 msgstr "Ryhmät"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Yritys"
 
@@ -3170,22 +3197,22 @@ msgid "Journal"
 msgstr "Päiväkirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Huomautus"
 
@@ -3214,14 +3241,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 "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Puoliso"
 
@@ -3390,61 +3417,61 @@ msgstr "Valittu"
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2792
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2757
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Kopioi sähköpostiosoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:371
-#: ../addressbook/gui/widgets/eab-contact-display.c:373
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(kartta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:307
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
-#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:488
-#: ../addressbook/gui/widgets/eab-contact-display.c:848
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../calendar/gui/calendar-commands.c:94
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2499
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3456,48 +3483,48 @@ msgstr "Videokeskustelu"
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
-#: ../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 "Vapaa/Varattu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
-#: ../calendar/gui/e-calendar-view.c:2507
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
-#: ../calendar/gui/e-calendar-view.c:2508
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:902
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:910
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
@@ -3553,11 +3580,11 @@ msgstr "Protokolla ei ole tuettu"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3568,12 +3595,13 @@ msgstr "Ei voi perua"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
@@ -3609,7 +3637,6 @@ msgid "Unsupported authentication method"
 msgstr "Tunnistautumistapa ei ole tuettu"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-#, fuzzy
 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 "
@@ -3617,10 +3644,10 @@ msgid ""
 msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Joko tämä osoitekirja ei ole merkitty "
 "yhteydettömään käyttöön tai sitä ei ole vielä haettu yhteydettömään tilaan. "
-"Lataa osoitekirja kerran yhteydellisessä tilassa hakeaksesi sen sisällön."
+"Nouda osoitekirjan sisältö ollessasi yhteydellisessä tilassa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
@@ -3629,27 +3656,24 @@ msgstr ""
 "sinulla on oikeudet käyttää sitä."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:131
-#, fuzzy
 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 ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
-"tuen Evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
+"tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, fuzzy
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
-"Tätä osoitekirjaa ei voitu avata. Syötit joko virheellisen URIn tai "
+"Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
-#, fuzzy
 msgid "Detailed error message:"
-msgstr "Yksityiskohtainen virhe:"
+msgstr "Yksityiskohtainen virheviesti:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
@@ -3664,17 +3688,15 @@ msgstr ""
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
-#, fuzzy
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\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 ""
-"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen\n"
-"aikarajoitus, jonka olet asettanut tällä osoitekirjalle. Tarkenna\n"
-"hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
-"hakemistopalvelimen asetuksissa."
+"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen asetuksissa\n"
+"annettu aikaraja. Tarkenna hakuasi, tai pidennä palvelimen aikarajaa tämän "
+"osoitekirjan hakemistopalvelimen asetuksissa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
@@ -4066,27 +4088,6 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Yhteystiedon tulostustyylien muokkaimen testi"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Tekijänoikeudet (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Tämän pitäisi testata yhteystiedon tulostustyylin muokkaimen widgettiä"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Yhteystiedon tulostustesti"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Tämän pitäisi testata yhteystiedon tulostuksen koodia"
-
 #: ../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
@@ -4627,13 +4628,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4674,19 +4675,18 @@ msgid "Memo_s"
 msgstr "Mui_stilaput"
 
 #: ../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:1810 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1678 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4701,8 +4701,9 @@ msgstr "Tehtävät"
 msgid "_Calendars"
 msgstr "_Kalenterit"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
@@ -4723,8 +4724,8 @@ msgstr[1] "minuuttia"
 #: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:672
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "tunti"
@@ -4741,10 +4742,10 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -4757,7 +4758,7 @@ msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4777,31 +4778,32 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4813,7 +4815,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4830,7 +4832,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan"
 
@@ -4999,50 +5001,66 @@ msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti lokitetaan."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr "Luettelo äskettäin valituista toissijaisista aikavyöhykkeistä."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Osoitteet URLeista, joissa julkaistaan vapaa/varattu tietoja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-viiva"
 
-#: ../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 "Marcus Bains-viivan väri - päivänäkymä"
 
-#: ../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 "Marcus Bains-viivan väri - aikajana"
 
-#: ../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 ""
+"Enimmäismäärä äskettäin valittuja toissijaisia aikavyöhykkeitä avaimen "
+"\"day_second_zones\" luettelossa."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Kuinka monta äskettäin valittua aikavyöhykettä muistetaan."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuutti, jona työpäivä loppuu, väliltä 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Kuukausinäkymän vaakapanelin sijainti"
 
-#: ../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 "Kuukausinäkymän pystypaneelin sijainti"
 
-#: ../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 "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
 
-#: ../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 "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../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."
@@ -5050,7 +5068,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
 "välissä jos ei olla kuukausinäkymässä"
 
-#: ../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."
@@ -5058,7 +5076,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
 "välissä käytettäessä kuukausinäkymää"
 
-#: ../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."
@@ -5066,7 +5084,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä , kalenterin listojen ja päivämäärien "
 "selausnäkymän välissä."
 
-#: ../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."
@@ -5074,7 +5092,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, tehtävälistan ja tehtävän esikatselun "
 "välissä."
 
-#: ../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."
@@ -5082,7 +5100,7 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
 "tehtävälistan välissä käytettäessä kuukausinäkymää"
 
-#: ../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."
@@ -5090,69 +5108,85 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
 "tehtävälistan välissä kun ei käytetä kuukausinäkymää"
 
-#: ../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 "Ohjelmat, joita voidaan suorittaa hälytyksistä."
 
-#: ../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 "Päivänäkymässä äskettäin käytetyt toissijaiset aikavyöhykkeet"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Äänihälytysten tiedostojen tallennuskansio"
 
-#: ../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 "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../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 "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../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 "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../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 "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../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 "Näytä näkyvät hälytykset ilmoitusalueella"
 
-#: ../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 "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../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 "Näytä \"Esikatselu\"-paneeli"
 
-#: ../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 "Näytä esikatselupaneeli"
 
-#: ../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 "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
 
-#: ../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 "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Näytä viikkonumerot päivä- ja työviikkonäkymissä"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Näytä viikkonumerot päivämääräselaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Näyttää toissijaisen aikavyöhykkeen aikanäkymässä, jos asetettu. Arvo on "
+"samanlainen kuin avaimessa \"timezone\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Tehtäväpaneelin pystysijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5161,7 +5195,7 @@ msgstr ""
 "URL-malli, jota käytetään vapaa/varattu tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5170,8 +5204,11 @@ msgstr ""
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
 "Helsinki\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "Päivänäkymän toissijainen aikavyöhyke"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5179,20 +5216,20 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1"
 "\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5200,42 +5237,42 @@ msgstr ""
 "Tapahtumien läpinäkyvyys kalenterinäkymissä. Arvo on väliltä 0 (läpinäkyvä) "
 "ja 1 (peittävä)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24-tunnin kello"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
 "\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5243,84 +5280,88 @@ msgstr ""
 "Pakataanko viikonloput kuukausinäkymässä. Tämä tiivistää lauantain ja "
 "sunnuntain yhden viikonpäivän kokoisiksi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Piirretäänkö Marcus Bains-viiva (viiva nykyhetkessä) kalenteriin."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Näytetäänkö viikkonumerot päivämäärä- ja työviikkonäkymissä."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Käytetäänkö kesäaikaa näytettäessä tapahtumia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Työpäivät"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Työpäivän päättymistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Työpäivän päättymisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Työpäivän alkamistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Työpäivän alkamisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "kesäaika"
 
@@ -5372,13 +5413,13 @@ msgstr "Aktiiviset tapaamiset"
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../calendar/gui/calendar-commands.c:94 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../calendar/gui/calendar-commands.c:319
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5387,129 +5428,138 @@ msgstr ""
 "Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
 "aika. Jos jatkat, et voi palauttaa näitä tapahtumia."
 
-#: ../calendar/gui/calendar-commands.c:325
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:673
-#: ../plugins/google-account-setup/google-contacts-source.c:340
+#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-contacts-source.c:368
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "päivä"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../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
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Sää"
 
-#: ../calendar/gui/calendar-component.c:658
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
-#: ../mail/em-folder-tree.c:2107
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
 msgid "_Make available for offline use"
 msgstr "_Kopioi käytettäväksi yhteydettömässä tilassa"
 
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "_Älä kopioi käytettäväksi yhteydettömässä tilassa"
 
-#: ../calendar/gui/calendar-component.c:995
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1176
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: ../calendar/gui/calendar-component.c:1192
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: ../calendar/gui/calendar-component.c:1305
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1521
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1522
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1523
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1529
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1530
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../calendar/gui/calendar-component.c:1531
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1537
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1538
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1539
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1547
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5535,7 +5585,7 @@ msgid "Any Field"
 msgstr "Mikä tahansa kenttä"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:21
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -5555,8 +5605,8 @@ msgstr "Luokka"
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Luottamuksellinen"
@@ -5574,12 +5624,12 @@ msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:41
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "On olemassa"
 
@@ -5589,20 +5639,20 @@ msgstr "On olemassa"
 msgid "Organizer"
 msgstr "Järjestäjä:"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
 #: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -5621,22 +5671,22 @@ msgid "Summary Contains"
 msgstr "Yhteenveto sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:32
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ei sisällä"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:46
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "on"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:52
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "ei ole"
 
@@ -5652,7 +5702,7 @@ msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
 msgid "Permission denied to open the calendar"
 msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -5776,25 +5826,52 @@ msgid "A_dd"
 msgstr "_Lisää"
 
 #: ../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 "Hälytykset"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Määrittelemätön"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(Näytetään päivänäkymässä)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5808,59 +5885,59 @@ msgstr ""
 "10 minuuttia\n"
 "5 minuuttia"
 
-#: ../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 ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</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\">Hälytykset</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\">Vapaa/varattu-tietojen oletuspalvelin</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\">Yleistä</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\">Tehtävälista</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\">Aika</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\">Työviikko</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 "Säädä _kesäajan mukaan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Näytä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5870,13 +5947,13 @@ msgstr ""
 "tuntia\n"
 "päivää"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5894,151 +5971,167 @@ msgstr ""
 "lauantai\n"
 "sunnuntai"
 
-#: ../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 "Valitse väri"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_Su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "_Toinen aikavyöhyke:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Valitse kalenterit, joiden hälytykset lähetetää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 "Näytä muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "Näytä _muistutus"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Näytä viikkonumero päivä- ja työviikkonäkymissä"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "_Tänään erääntyvät tehtävät:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "_To"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Pohja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Viikon ensimmäinen päivä:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "_Eräpäivän ylittäneet tehtävät:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_La"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Ti"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_Ke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr "ennen joka vuosipäivää ja syntymäpäivää"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "ennen tapaamista"
 
@@ -6090,46 +6183,46 @@ msgstr "Muistilappulistan ominaisuudet"
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Tapahtuma on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Tehtävä on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Muistilappu on poistettu."
 
-#: ../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 olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
-#: ../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 Et ole tehnyt muutoksia, sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Tapahtumaa on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Tehtävää on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Muistilappua on muutettu."
 
-#: ../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 Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
-#: ../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 Et tehnyt muutoksia, suljetaanko muokkain?"
@@ -6139,293 +6232,297 @@ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %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:2365
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../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:2371
 msgid "Completed "
 msgstr "Valmis"
 
-#: ../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:2376
 msgid " (Due "
 msgstr "(erääntyy "
 
-#: ../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:2378
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:243
-#: ../calendar/gui/dialogs/comp-editor.c:416 ../composer/e-msg-composer.c:1766
-#: ../composer/e-msg-composer.c:1985
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2053
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
+#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:489 ../composer/e-msg-composer.c:2055
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:3260 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:848
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr "Säilytä alkuperäinen?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "_Kopioi valittu teksti leikepöydälle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Napsauta tästä näyttääksesi ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Liitä tekstiä leikepöydältä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1373 ../mail/em-folder-tree.c:2099
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1383
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Liitä tiedosta napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1393
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1452
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1462
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1776
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Viimeisimmät _asiakirjat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1795
-#: ../composer/e-composer-actions.c:697
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1890
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> liite"
 msgstr[1] "<b>%d</b> liitettä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1922
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1925
-#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2044
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1040
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "_Poista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2047
-#: ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2381
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2256
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Näytä tai piilota liitepalkki välilyönnillä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2400
-#: ../calendar/gui/dialogs/comp-editor.c:2447
-#: ../calendar/gui/dialogs/comp-editor.c:3293
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3322
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -6445,51 +6542,51 @@ msgstr "Kohde on vain luettavissa"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../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 "Tapahtumaa ei voi poistaa corba-virheen takia"
 
-#: ../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 "Tehtävää ei voi poistaa corba-virheen takia"
 
-#: ../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 "Muistilappua ei voi poistaa corba-virheen takia"
 
-#: ../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 "Kohdetta ei voi poistaa corba-virheen takia"
 
-#: ../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 "Tapahtumaa ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../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 "Tehtävää ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../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 "Muistilappua ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../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 "Kohdetta ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../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 "Tapahtumaa ei voi poistaa virheen takia"
 
-#: ../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 "Tehtävää ei voi poistaa virheen takia"
 
-#: ../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 "Muistilappua ei voi poistaa virheen takia"
 
-#: ../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 "Kohdetta ei voi poistaa virheen takia"
 
@@ -6506,65 +6603,65 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Hälytykset"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Napsauta tästä, jos haluat asettaa tai poistaa tämän tehtävän hälytyksiä"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "T_oistuvuus"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Muuta tämä tapahtuma toistuvaksi"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../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 "Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Lisää erityisiä lähetysvaihtoehtoja"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
 #: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2724
+#: ../calendar/gui/dialogs/event-page.c:2725
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hälytyksiä"
 
@@ -6626,66 +6723,48 @@ msgstr "Järjestäjä vaaditaan."
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Lisää "
 
-#: ../calendar/gui/dialogs/event-page.c:2600
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenteria \"%s\" ei voi avata"
 
-#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/event-page.c:2645
 #: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1803
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Toimit henkilön %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Muokkaa"
 
-#. 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:1158 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Määrittelemätön"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "Yksi päivä ennen tapaamista"
@@ -6761,7 +6840,7 @@ msgstr "_Yhteystiedot..."
 msgid "Organizer:"
 msgstr "Järjestäjä:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:140 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Muistilappu"
 
@@ -6792,39 +6871,39 @@ msgstr "Vastaan_ottajat:"
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
-#: ../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 "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
-#: ../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 "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
-#: ../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 "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
-#: ../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 "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
@@ -6837,9 +6916,13 @@ msgstr ""
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr " "
 
@@ -6847,7 +6930,7 @@ msgstr " "
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -6856,7 +6939,7 @@ msgstr "ensimmäinen"
 #. * (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 "toinen"
 
@@ -6864,7 +6947,7 @@ msgstr "toinen"
 #. * (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 "kolmas"
 
@@ -6872,7 +6955,7 @@ msgstr "kolmas"
 #. * (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 "neljäs"
 
@@ -6880,13 +6963,13 @@ msgstr "neljäs"
 #. * (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 "viimeinen"
 
 #. 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 "Toinen päiväys"
 
@@ -6894,7 +6977,7 @@ msgstr "Toinen päiväys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -6902,7 +6985,7 @@ msgstr "1. - 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -6910,45 +6993,45 @@ msgstr "11. - 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1061
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21. - 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "päivä"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "  "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -6999,6 +7082,10 @@ msgstr "viikko"
 msgid "year(s)"
 msgstr "vuosi"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "Lähetä hälytys tälle tapahtumalle"
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -7019,54 +7106,54 @@ msgstr "<span weight=\"bold\">Tila</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:652 ../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:9
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:266
 #: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Korkea"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:244
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2551
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:270
 #: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Matala"
 
 #: ../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:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ei aloitettu"
@@ -7127,7 +7214,7 @@ msgstr "_Järjestäjä:"
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1760
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
@@ -7224,56 +7311,56 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3308
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../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 "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../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 "WWW-sivu:"
 
-#: ../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 "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
@@ -7293,7 +7380,7 @@ msgstr "Vapaa"
 
 #: ../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 "Varattu"
 
@@ -7307,67 +7394,67 @@ 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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
 #: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../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 "Tallenna nimellä..."
 
-#: ../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 "Valitse kansio, johon valitut liitteet tallennetaan..."
 
-#: ../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 "nimetön_kuva.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../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 "Aseta _taustaksi"
 
@@ -7375,7 +7462,7 @@ msgstr "Aseta _taustaksi"
 msgid "_Save Selected"
 msgstr "Tallenna _valitut"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
@@ -7386,7 +7473,7 @@ msgstr "* Ei yhteenvetoa *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2368
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -7394,7 +7481,7 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2372
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
@@ -7452,45 +7539,45 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:820
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
 #: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
 #: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1732 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "T_ulosta..."
 
 #: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1752 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
 #: ../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 "L_eikkaa"
 
 #: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1735
-#: ../calendar/gui/e-calendar-view.c:1754 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
 #: ../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"
@@ -7500,7 +7587,7 @@ msgstr "L_iitä"
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
@@ -7560,153 +7647,150 @@ msgstr "Aloituspäivä"
 #. 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:545
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:86
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Tila"
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1726
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1739
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1741
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1742
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1760
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1763
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1764 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1770 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#: ../calendar/gui/e-calendar-view.c:2223
-#: ../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:2126
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-calendar-view.c:2224
-#: ../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:2132
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-calendar-view.c:2225
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-calendar-view.c:2226
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-calendar-view.c:2227
+#: ../calendar/gui/e-calendar-view.c:2258
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2388 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2422
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7719,53 +7803,63 @@ 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 minuutin välein"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Näytä toinen aikavyöhyke"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1562
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "Viikko %d"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka päivä"
 msgstr[1] "Joka %d:s päivä"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka kerta"
 msgstr[1] "Joka %d:s kerta"
 
-#: ../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 "
@@ -7773,35 +7867,35 @@ msgstr[0] "Joka viikko "
 msgstr[1] "Joka %d:s viikko "
 
 #. 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 " ja "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s päivä"
 
-#: ../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"
 msgstr[0] "kerran kuussa"
 msgstr[1] "kerran %d:s kuu"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka %d:s vuosi"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7809,319 +7903,325 @@ msgstr[0] " kaikkiaan %d kerran"
 msgstr[1] " kaikkiaan %d kertaa"
 
 #. 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 ", päättyen"
 
 #. 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 "Alkaa"
 
 #. 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 "Päättyy"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Erääntyy "
 
-#: ../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 "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitä ei löytynyt kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Tehtävä on peruttu, mutta sitä ei löytynyt tehtävälistoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../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> pyytää %s läsnäoloa tapaamisessa."
 
-#: ../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> pyytää läsnäoloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. 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> toivoo liittämistään olemassaolevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: ../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> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivityspyyntö"
 
-#: ../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> on vastannut tapaamispyyntöön."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Vastaus kokouspyyntöön"
 
-#: ../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> perui kokouksen."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Kokouksen peruminen"
 
-#: ../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> lähetti järjettömän viestin."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: ../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> pyytää %s tekemään työtehtävän."
 
-#: ../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> pyytää sinua suorittamaan tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
 #. 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> toivoo lisäystään olemassaolevaan tehtävään."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: ../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> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: ../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> on vastannut työtehtävän antoon."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: ../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> perui tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Tehtävän peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../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> pyytää sinun vapaa/varattu -tietoja."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustelu"
 
-#: ../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> on vastannut vapaa/varattu -kyselyyn."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../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 "Viesti ei näytä olevan kunnolla muotoiltu."
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: ../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 "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Päivitys valmis\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 "Kohde on virheellinen eikä sitä voi päivittää\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 "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: ../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 "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../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 "Lähetetty\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 "Kohdetta ei voi lähettää!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
-#: ../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 "Kuittauspyyntö"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Hylkää"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -8149,99 +8249,93 @@ msgstr "Ladataan kalenteria..."
 msgid "Server Message:"
 msgstr "Palvelinviesti:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../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 "Henkilö"
 
-#: ../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 "Ryhmä"
 
-#: ../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 "Resurssi"
 
-#: ../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 "Huone"
 
-#: ../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 "Puheenjohtaja"
 
-#: ../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 "Vaadittu läsnäolija"
 
-#: ../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 "Vapaaehtoinen läsnäolija"
 
-#: ../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 "Ei läsnä"
 
-#: ../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 "Vaatii toimenpiteitä"
 
 #. 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 "Osallistuja                       "
 
-#. 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 "Kuittauspyyntö"
-
-#: ../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 "Työn alla"
 
 #. 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, %B %d, %Y"
 
@@ -8250,7 +8344,7 @@ msgstr "%A, %B %d, %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"
 
@@ -8260,67 +8354,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 "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../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 "_Automaattinen valinta"
 
-#: ../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 "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -8348,11 +8442,11 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "Jäsen"
 
-#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
@@ -8365,16 +8459,16 @@ msgstr ""
 "Virhe %s:ssä:\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Ladataan muistilappuja"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Avataan muistilappuja sijainnista %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
@@ -8382,63 +8476,63 @@ msgstr "Valtuutetaan seuraavat tehtävät...."
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. 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:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2624
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "_Oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2625
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Tallenna oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2630
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Määrittele näkymät..."
 
-#: ../calendar/gui/gnome-cal.c:2872
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/gnome-cal.c:2887
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: ../calendar/gui/gnome-cal.c:2896
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ladataan muistilappuja lähteestä %s"
 
-#: ../calendar/gui/gnome-cal.c:3001
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3969
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -8498,137 +8592,196 @@ msgstr "Syyskuu"
 msgid "_Select Today"
 msgstr "_Valitse tämä päivä"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön."
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Hyväksytty"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Alustavasti hyväksytty"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Hylätty"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Valtuutettu"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Peru"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
 msgid "Refresh"
-msgstr "Virkistä"
+msgstr "Päivitä"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:499
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:582
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valittu"
 msgstr[1] ", %d valittua"
 
-#: ../calendar/gui/memos-component.c:631
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Muistilappujen päivitys epäonnistui."
 
-#: ../calendar/gui/memos-component.c:873
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
 "lisäämistä varten"
 
-#: ../calendar/gui/memos-component.c:886
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/memos-component.c:996
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Muistilappujen lähteen valinta"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../calendar/gui/memos-component.c:1177
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1185
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1192
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Muistilappu_lista"
 
-#: ../calendar/gui/memos-component.c:1193
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../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 "Tulosta muistilaput"
 
@@ -8682,275 +8835,275 @@ msgstr "Tehtävien '%s' muunnos epäonnistui"
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../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 "Su"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Osanottajat:"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: ../calendar/gui/tasks-component.c:490
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:573
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../calendar/gui/tasks-component.c:622
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Tehtävälistan päivitys epäonnistui."
 
-#: ../calendar/gui/tasks-component.c:861
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tehtävälistaa '%s' ei voi avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: ../calendar/gui/tasks-component.c:874
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/tasks-component.c:985
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1240
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1241
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1242
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1248
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1250
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1256
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "_Tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../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"
@@ -8962,11 +9115,11 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
 msgid "Do not ask me again."
 msgstr "Älä kysy enää uudestaan"
 
-#: ../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 "Tulosta tehtävät"
 
@@ -8983,11 +9136,11 @@ msgstr "Peruttu"
 msgid "In progress"
 msgstr "Kesken"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:50
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:51
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
@@ -8997,7 +9150,7 @@ msgstr "Tapaamiset ja kokoukset"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
@@ -10611,7 +10764,7 @@ msgstr "_Sulje"
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
 #: ../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
@@ -10637,8 +10790,8 @@ msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
 #: ../composer/e-composer-actions.c:511
-msgid "Save _Draft"
-msgstr "Tallenna _luonnos"
+msgid "Save as _Draft"
+msgstr "Tallenna luonnoksena"
 
 #: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
@@ -10776,6 +10929,10 @@ msgstr "_Vastaanottaja-kenttä"
 msgid "Toggles whether the To field is displayed"
 msgstr "Määrittää näytetäänkö Vastaanottaja-kenttä"
 
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Tallenna luonnos"
+
 #: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
@@ -10840,18 +10997,18 @@ msgstr "Valitse kansio johon viesti postitetaan:"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1553
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10859,23 +11016,23 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2597 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../composer/e-msg-composer.c:1551
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2770
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4071
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10965,13 +11122,12 @@ msgstr ""
 "Viestin palautuksen avulla voit jatkaa siitä, mihin jäit."
 
 #: ../composer/mail-composer.error.xml.h:17
-#, fuzzy
 msgid ""
 "Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Lähetysasetukset ovat käytettävissä vain Novell Groupwise- ja Microsoft "
-"Exchange -tileillä."
+"Exchange -tileille."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11075,7 +11231,7 @@ msgid "Evolution Query"
 msgstr "Evolutionin kysely"
 
 #. 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 "Sisäinen virhe, tuntematonta virhettä \"%s\" haettiin"
@@ -11088,7 +11244,64 @@ msgstr "Komponentti"
 msgid "Name of the component being logged"
 msgstr "Lokitettavan komponentin nimi"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Vianetsintälokit"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Näytä _viestit tilarivillä"
+
+#. 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 "sekunnin ajan."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Lokita viestit:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Lokituksen taso"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Aika"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Viestit"
+
+#: ../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 "Sulje tämä ikkuna"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Virhe"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Virheet"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Varoitukset ja virheet"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Vianetsintä"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Virheet, varoitukset ja vianetsintäviestit"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
@@ -11097,7 +11310,7 @@ msgstr "käytössä"
 
 #: ../e-util/e-plugin.c:309
 msgid "Whether the plugin is enabled"
-msgstr "Onko liitännäinen käytössä"
+msgstr "Onko lisäosa käytössä"
 
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
@@ -11140,51 +11353,55 @@ msgstr "Kirjoita tiedoston yli?"
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/e-util.c:98
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Linkkiä ei voitu avata."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "Tärk_eä"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Työ"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Henkilökohtainen"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "Te_htävää"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "Merkinnän _nimi:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Merkinnälle täytyy antaa nimi."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11192,12 +11409,12 @@ msgstr ""
 "Samanniminen merkintä on jo tallennettu palvelimelle. Nimeä merkintä "
 "uudestaan."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-virhe: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Kaikki virheet tästä eteenpäin näkyvät vain päätteessä."
 
@@ -11491,8 +11708,8 @@ msgstr "määrittelemäsi aika"
 #: ../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
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-contacts-source.c:369
 msgid "weeks"
 msgstr "viikkoa"
 
@@ -11500,15 +11717,15 @@ msgstr "viikkoa"
 msgid "years"
 msgstr "vuotta"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Säännön nimi"
 
@@ -11564,7 +11781,7 @@ msgstr "Evolutionin sähköpostin asetukset"
 msgid "Evolution Network configuration control"
 msgstr "Evolutionin verkkoyhteyden asetukset"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
 #: ../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
@@ -11587,6 +11804,7 @@ msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "_Sähköposti"
 
@@ -11608,13 +11826,13 @@ msgstr ""
 "ohjelmalle %s\n"
 "ja ruksita laatikko, jos hyväksyt lisenssin\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 "Valitse kansio"
 
 #: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
@@ -11683,7 +11901,7 @@ msgid "Protocol"
 msgstr "Protokolla"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1184 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -11703,14 +11921,23 @@ msgstr "Allekirjoitukset"
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "Käytettävää tiliä ei löydy, viestin edelleenlähetys on peruttu."
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11718,7 +11945,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
@@ -11726,64 +11953,48 @@ msgstr "-----Alkuperäinen viesti-----"
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
-#.
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
-#. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
-#. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
-#. *
-#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
-#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Aseta väri"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
@@ -11791,210 +12002,213 @@ msgstr "Lähetetty"
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ei pääty"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "ei palauta"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "ei kuulosta samalta kuin"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "ei ala"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "päättyy"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "on olemassa"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Lauseke"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Tärkeä"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "on jälkeen"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "on ennen"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:38
 msgid "is not set"
 msgstr "ei ole asetettu"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:39
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Merkintä"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Soita ääni"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Lue"
 
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "palauttaa enemmän kuin"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "palauttaa vähemmän kuin"
 
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Lähettäjä tai vastaanottajat"
+
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/em-filter-i18n.h:81
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
-#: ../mail/em-filter-i18n.h:82
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "kuulostaa samalta kuin"
 
-#: ../mail/em-filter-i18n.h:83
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/em-filter-i18n.h:84
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/em-filter-i18n.h:85
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "alkaa"
 
-#: ../mail/em-filter-i18n.h:87
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/em-filter-i18n.h:89
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
@@ -12081,15 +12295,15 @@ msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2561 ../mail/mail-component.c:164
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
@@ -12121,15 +12335,20 @@ msgstr "EI VASTAAVAA"
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Pohjat"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Lähtevät"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Lähetetyt"
 
-#: ../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 "Ladataan..."
 
@@ -12168,12 +12387,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -12195,43 +12414,48 @@ msgstr "_Siirrä kansioon"
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2105
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2108
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Siirrä..."
 
-#: ../mail/em-folder-tree.c:2116 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../mail/em-folder-tree.c:2123 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr ""
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %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:1188
+#: ../mail/em-folder-view.c:1203
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
 msgid "C_opy"
 msgstr "_Kopioi"
 
@@ -12253,204 +12477,204 @@ msgstr "Luo uusi kansio"
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Välitä"
 
 #. 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:1337 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1343
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1344
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1345
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as Un_important"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lähetettäväksi..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "_Label"
 msgstr "_Merkintä"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1360
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1364
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1368
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
 #. 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:1370
 msgid "Search Folder based on _Subject"
 msgstr "Hakunäkymä _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Se_nder"
 msgstr "Hakunäkymä _lähettäjän perusteella"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1372
 msgid "Search Folder based on _Recipients"
 msgstr "Hakunäkymä _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Search Folder based on Mailing _List"
 msgstr "Hakunäkymä _postituslistan perusteella"
 
 #. 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:1378
 msgid "Filter based on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1380
 msgid "Filter based on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1381
 msgid "Filter based on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. 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
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:529
-#: ../plugins/google-account-setup/google-source.c:727
+#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:510
+#: ../plugins/google-account-setup/google-source.c:708
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2518
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voi hakea"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2537
 msgid "Retrieving Message..."
 msgstr "Noudetaan viestiä..."
 
-#: ../mail/em-folder-view.c:2791
+#: ../mail/em-folder-view.c:2756
 msgid "C_all To..."
 msgstr "_Soita..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2759
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2760
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2796
+#: ../mail/em-folder-view.c:2761
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:3289
+#: ../mail/em-folder-view.c:3254
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../mail/em-folder-view.c:3301
+#: ../mail/em-folder-view.c:3266
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../mail/em-folder-view.c:3306
+#: ../mail/em-folder-view.c:3271
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
 #. 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 "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Et_si:"
 
 #. 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 "_Edellinen"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "Täsmää _kirjainkoko"
 
-#: ../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 "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12458,11 +12682,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../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 "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12470,11 +12694,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../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 "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12482,11 +12706,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../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 "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12494,11 +12718,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../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 "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12506,11 +12730,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../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 "Salaamaton"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12518,11 +12742,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../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 "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12532,11 +12756,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../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 "Salattu"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12544,11 +12768,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../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 "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12558,87 +12782,87 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../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 "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Tallenna liite nimellä"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Tallenna valinta..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d lii_te"
 msgstr[1] "%d lii_tettä"
 
-#: ../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:2387
 msgid "S_ave"
 msgstr "T_allenna"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2383
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2530 ../mail/em-format-html-display.c:2569
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2532
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2589
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2665
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12737,7 +12961,7 @@ msgstr "Tämä viesti lähetettiin <b>%s</b> käyttäjän <b>%s</b> puolesta"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -12798,11 +13022,11 @@ msgstr "Virhe tarkistettaessa allekirjoitusta"
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "PGP-viestiä ei voitu tulkita"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
 
@@ -12850,7 +13074,7 @@ msgstr "Merkintä"
 #: ../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 "%s-liitännäinen on käytettävissä ja ohjelma on asennettu."
+msgstr "%s-lisäosa on käytettävissä ja ohjelma on asennettu."
 
 #. May be a better text
 #: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
@@ -12858,11 +13082,11 @@ msgstr "%s-liitännäinen on käytettävissä ja ohjelma on asennettu."
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
-"%s-liitännäinen ei ole käytettävissä. Tarkista että sen paketti on asennettu."
+"%s-lisäosa ei ole käytettävissä. Tarkista että sen paketti on asennettu."
 
 #: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
-msgstr "Roskapostiliitännäistä ei ole saatavilla"
+msgstr "Roskapostilisäosaa ei ole saatavilla"
 
 #. green
 #: ../mail/em-migrate.c:1059
@@ -12921,8 +13145,7 @@ msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:2898
-#, fuzzy
+#: ../mail/em-migrate.c:2952
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -12930,16 +13153,16 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 "Evolutionin sähköpostikansioiden yhteenvedon esitys on siirretty sqlite-"
-"tietokantaan versiossa 2.24\n"
+"tietokantaan version 2.24 jälkeen.\n"
 "\n"
-"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
+"Odota kärsivällisesti, että Evolution muuntaa kansioiden tietoja..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Paikallisia sähköpostikansioita ei voi luoda paikkaan '%s': %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12947,38 +13170,38 @@ msgstr ""
 "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
 "config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#: ../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 "_Vastaa lähettäjälle"
 
-#: ../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 "Vastaa _listalle"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
 
-#: ../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 "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Kansio"
 
 #. 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 "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
@@ -13669,7 +13892,7 @@ msgstr "Tekstin viestiosan kokoraja"
 
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
-msgstr "Roskapostikäsittelijän oletusliitännäinen"
+msgstr "Roskapostikäsittelijän oletuslisäosa"
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "The last time empty junk was run, in days since the epoch."
@@ -13710,9 +13933,9 @@ msgid ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
-"Tämä on roskapostin käsittelyn oletusliitännäinen, vaikka useita olisi "
-"käytössä. Jos oletusliitännäinen ei ole käytössä, ei palata käyttämään muita "
-"käytössä olevia liitännäisiä."
+"Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. "
+"Jos oletuslisäosaei ole käytössä, ei palata käyttämään muita käytössä olevia "
+"lisäosia."
 
 #: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
@@ -13918,10 +14141,12 @@ msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
@@ -13937,7 +14162,10 @@ msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
@@ -13959,35 +14187,30 @@ msgstr "Evolution Pine-tuoja"
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../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 "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Pohjat"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -14652,9 +14875,9 @@ msgid "Use Authe_ntication"
 msgstr "Käytä _tunnistautumista"
 
 #: ../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
+#: ../plugins/google-account-setup/google-source.c:615
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
@@ -14686,7 +14909,7 @@ msgstr "_Automaattisten välipalvelinasetusten URL:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
-msgstr "_Roskapostin oletusliitännäinen"
+msgstr "_Roskapostin oletuslisäosa"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
@@ -14837,7 +15060,7 @@ msgstr "_Etsi:"
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: ../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 "Merkitse edelleenlähetettäväksi"
 
@@ -14889,7 +15112,7 @@ msgstr "_Merkki:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
@@ -14936,11 +15159,11 @@ msgstr "Lähetetään viestiä %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stä epäonnistui"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Valmis."
 
@@ -15091,39 +15314,39 @@ msgstr "Lähetä ja vastaanota postia"
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:804
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Käyttäjä perui toimenpiteen."
 
@@ -15800,83 +16023,79 @@ msgstr "_Poista pysyvästi"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2519 ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Viestit"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3981 ../mail/message-list.c:4452
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15884,7 +16103,7 @@ msgstr ""
 "Mikään viesti ei vastaa hakuehtojasi. Tyhjennä hakukenttä valikon kohdasta "
 "Haku -> Tyhjennä tai muuta hakua."
 
-#: ../mail/message-list.c:4293
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -15921,39 +16140,39 @@ msgstr "Koko"
 msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../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 "Välitä"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../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 "Vastaa"
 
-#: ../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 "Vastaa kaikille"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Arvio"
 
@@ -16045,34 +16264,34 @@ msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from Evolution."
 msgstr ""
-"Muotoiluliitännäinen, joka esittää ääniliitteet sisäkkäisesti ja sallii "
-"niiden soittamisen suoraan Evolutionista."
+"Muotoilulisäosa, joka esittää ääniliitteet sisäkkäisesti ja sallii niiden "
+"soittamisen suoraan Evolutionista."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr "Äänensoiton liitännäinen"
+msgstr "Äänensoiton lisäosa"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Palauta varmuuskopio"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -16082,118 +16301,118 @@ msgstr ""
 "sähköpostit, kalenterit, tehtävät, muistiot ja osoitekirjat.\n"
 "Palautus palauttaa myös kaikki asetukset, sähköpostisuotimet jne."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "_Palauta Evolution varmuuskopiotiedostosta"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Valitse palautettava Evolution-varmuuskopio:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Tarkista evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Varmuuskopio on valmis"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Tarkistetaan paikalliset lähteet"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Tämä saattaa kestää hetken, riippuen tililläsi olevien tietojen määrästä."
@@ -16205,7 +16424,7 @@ msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia."
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
-msgstr "Varmuuskopioinnin ja palautuksen liitännäinen"
+msgstr "Varmuuskopioinnin ja palautuksen lisäosa"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16317,27 +16536,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter-lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Putki bogofilterille epäonnistui, virhekoodi: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
@@ -16359,7 +16578,7 @@ msgstr "Bogofilter-asetukset"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
 msgid "Bogofilter junk plugin"
-msgstr "Bogofilter-roskapostiliitännäinen"
+msgstr "Bogofilter-roskapostilisäosa"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
@@ -16376,8 +16595,8 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:627
-#: ../plugins/google-account-setup/google-contacts-source.c:311
+#: ../plugins/google-account-setup/google-source.c:608
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "Use _SSL"
 msgstr "Käytä _SSLää"
 
@@ -16385,8 +16604,8 @@ msgstr "Käytä _SSLää"
 #: ../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
+#: ../plugins/google-account-setup/google-source.c:632
+#: ../plugins/google-account-setup/google-contacts-source.c:358
 msgid "Re_fresh:"
 msgstr "Vi_rkistä:"
 
@@ -16487,7 +16706,7 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"Testiliitännäinen, joka tarjoaa ponnahdusikkunan jolla voit kopioida asioita "
+"Testilisäosa, joka tarjoaa ponnahdusikkunan jolla voit kopioida asioita "
 "leikepöydälle."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
@@ -16517,7 +16736,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:590
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16598,6 +16817,14 @@ msgstr ""
 "viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
 "nimi, \"=\"-merkki ja otsakken sisältö, eroteltuna \";\"-merkeillä."
 
+#. 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 ""
+"[Turvataso=Henkilökohtainen;Luokittelematon;Suojattu;Luottamuksellinen;"
+"Salainen;Erittäin salainen]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Avaa muiden käyttäjien kansioita"
@@ -17184,8 +17411,8 @@ msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
-"Liitännäinen, jolla voidaan hallita tiettyjä Exchange-tiliin liittyviä "
-"toimintoja ja ominaisuuksia."
+"Lisäosa, jolla voidaan hallita tiettyjä Exchange-tiliin liittyviä toimintoja "
+"ja ominaisuuksia."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17193,7 +17420,8 @@ msgstr "Exchange-toiminnot"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "Välilehteä \"Exchange-asetukset\" ei voi avata yhteydettömässä tilassa."
+msgstr ""
+"Välilehteä \"Exchange-asetukset\" ei voi avata yhteydettömässä tilassa."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
@@ -17331,7 +17559,7 @@ msgid "Folder offline"
 msgstr "Kansio on yhteydettömässä tilassa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -17451,7 +17679,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Tuntematon virhe etsittäessä {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:540
+#: ../plugins/google-account-setup/google-source.c:521
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -17548,7 +17776,7 @@ msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
 msgstr ""
-"Liitännäinen, jonka avulla voit käyttää ulkoista muokkainta viestien "
+"Lisäosa, jonka avulla voit käyttää ulkoista muokkainta viestien "
 "kirjoittamiseen. Voit lähettää tällä vain muotoilematonta tekstiä (ei HTML-"
 "viestejä)."
 
@@ -17578,7 +17806,7 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"Liitännäisen asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. "
+"Lisäosien asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. "
 "Yritä käyttää muuta komentoa."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
@@ -17589,11 +17817,11 @@ msgstr "_Kirjoita viestit ulkoisessa muokkaimessa"
 msgid "Compose messages using an external editor"
 msgstr "Kirjoita viestit käyttäen ulkoista muokkainta"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17631,7 +17859,8 @@ msgstr "Peru kansion \"%s\" tilaus"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "Sallii postikansioiden tilauksen perumisen sivupalkin kontekstivalikosta."
+msgstr ""
+"Sallii postikansioiden tilauksen perumisen sivupalkin kontekstivalikosta."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17641,20 +17870,12 @@ msgstr "Peru kansioiden tilauksia"
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../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:440
+#: ../plugins/google-account-setup/google-source.c:421
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Syötä salasana käyttäjälle %s tilattujen kalentereiden käyttöä varten."
 
-#: ../plugins/google-account-setup/google-source.c:540
+#: ../plugins/google-account-setup/google-source.c:521
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17663,22 +17884,27 @@ msgstr ""
 "Ei voi lukea tietoja Googlen palvelimelta.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:702
+#: ../plugins/google-account-setup/google-source.c:683
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:737
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "Retrieve _list"
 msgstr "Nouda _luettelo"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
 msgid "<b>Server</b>"
 msgstr "<b>Palvelin</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Google-kalenterin ja yhteystietojen liitännäinen."
+msgstr "Google-kalenterin ja yhteystietojen lisäosa."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17690,7 +17916,7 @@ msgstr "Muistilista"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Groupwise-kalenterien ja yhteystietolähteiden liitännäinen."
+msgstr "Groupwise-kalenterien ja yhteystietolähteiden lisäosa."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
@@ -17788,7 +18014,7 @@ msgstr "Lisää lähetysvalintoja groupwise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in GroupWise accounts."
-msgstr "Liitännäinen GroupWise-tilien ominaisuuksille."
+msgstr "Lisäosa GroupWise-tilien ominaisuuksille."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
@@ -17953,7 +18179,8 @@ msgstr "_Kirjoita"
 msgid "permission to read|_Read"
 msgstr "_Luku"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Välimuisti"
 
@@ -17961,7 +18188,8 @@ msgstr "Välimuisti"
 msgid "<b>Account Name</b>"
 msgstr "<b>Tilin nimi</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Välimuistiin kirjautuminen"
 
@@ -18080,7 +18308,7 @@ msgstr "Seuraa viestin tilaa..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
-msgstr "Hula-kalenterien lähteiden määrittelyn liitännäinen."
+msgstr "Hula-kalenterien lähteiden määrittelyn lisäosa."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
@@ -18138,7 +18366,7 @@ msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "A plugin for the features in the IMAP accounts."
-msgstr "Liitännäinen IMAP-tilien ominaisuuksille."
+msgstr "Lisäosa IMAP-tilien ominaisuuksille."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
@@ -18235,117 +18463,117 @@ msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:748
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:827
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassaolevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1054
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1066
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1075
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1080
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1174
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1181
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1318
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1322
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1354
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18353,15 +18581,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1490
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-#: ../plugins/itip-formatter/itip-formatter.c:1600
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-#: ../plugins/itip-formatter/itip-formatter.c:1601
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18369,11 +18597,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1530
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1531
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18381,227 +18609,227 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2240
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2243
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2246
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2492
-#: ../plugins/itip-formatter/itip-formatter.c:2524
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2507
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
 #. 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:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Huomenna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "+%Ana %d. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %d. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %d. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %d. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %d. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %d. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %d. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Vastaa henkilön <b>%s</b> puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Vastaanotettu henkilön <b>%s</b> puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoi seuraavan kokouksen sinulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystänsä olemassaolevaan kokoukseen %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18609,88 +18837,88 @@ msgid ""
 msgstr ""
 "<b>%s</b> %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> perui seuraavan kokouksen %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> on perunut seuraavan tapaamisen."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> kieltäytyi seuraavista kokousmuutoksista."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> julkaisi seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään %s:n kautta"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18699,7 +18927,7 @@ msgstr ""
 "<b>%s</b> %s kautta toivoo saavansa viimeisimmät tiedot seuraavista "
 "työtehtävistä:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18707,170 +18935,178 @@ msgid ""
 msgstr ""
 "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> julkaisi seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Hylkää"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Hylkää"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "H_yväksy"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Hyväksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Lähetä tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Päivitä"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Loppumisaika:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "_Säilytä oma muistitus"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+msgid "_Inherit reminder"
+msgstr "_Peri muistututs"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Tehtävät :"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Muistilaput :"
 
@@ -19078,8 +19314,7 @@ msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
 msgstr ""
-"Liitännäinen, jonka avulla voidaan luoda tapaamisia viestin sisällön "
-"perusteella."
+"Lisäosa, jonka avulla voidaan luoda tapaamisia viestin sisällön perusteella."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -19107,8 +19342,7 @@ msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
 msgstr ""
-"Liitännäinen, jonka avulla voidaan luoda tehtäviä viestin sisällön "
-"perusteella."
+"Lisäosa, jonka avulla voidaan luoda tehtäviä viestin sisällön perusteella."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -19212,8 +19446,8 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"Tätä toimintoa ei voitu suorittaa. Otsake toimenpiteelle ei "
-"sisältänyt mitään toimintoa, joka voidaan käsitellä.\n"
+"Tätä toimintoa ei voitu suorittaa. Otsake toimenpiteelle ei sisältänyt "
+"mitään toimintoa, joka voidaan käsitellä.\n"
 "\n"
 "Otsake: {0}"
 
@@ -19324,29 +19558,29 @@ msgstr "Käytetään merkitsemään kaikki kansion viestit luetuiksi"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "Liitännäinen, joka toteuttaa mono-liitännäiset."
+msgstr "Lisäosa, joka toteuttaa mono-lisäosat."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
-msgstr "Monon latain"
+msgstr "Mono-lataaja"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Liitännäinen, jolla voidaan hallita muiden liitännäistä käyttöä."
+msgstr "Lisäosa, jolla voidaan hallita muiden lisäosien käyttöä."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 #: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
-msgstr "Liitännäisten hallinta"
+msgstr "Lisäosien hallinta"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr "Käytä ja poista käytöstä liitännäisiä"
+msgstr "Käytä ja poista käytöstä lisäosia"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
-msgstr "_Liitännäiset"
+msgstr "_Lisäosat"
 
 #: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
@@ -19368,7 +19602,7 @@ msgstr "Yhteenveto"
 #: ../plugins/plugin-manager/plugin-manager.c:362
 #: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
-msgstr "Liitännäinen"
+msgstr "Lisäosa"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
@@ -19377,10 +19611,10 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Testiliitännäinen, joka demonstroi muotoilija-liitännäistä, jolla  voit "
-"estää HTML-sähköpostit.\n"
+"Testilisäosa, joka demonstroi muotoilija-lisäosaa, jolla  voit estää HTML-"
+"sähköpostit.\n"
 "\n"
-"Tämä liitännäinen on tukematonta demo-koodia.\n"
+"Tämä lisäosa on tukematonta demo-koodia.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -19391,19 +19625,19 @@ msgstr "Raakatekstin tila"
 msgid "Prefer plain-text"
 msgstr "Suosi raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Näytä mieluummin raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Näytä ainoastaan raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -19415,6 +19649,37 @@ msgstr "Evolutionin profiloija"
 msgid "Writes a log of profiling data events."
 msgstr "Kirjoittaa lokia profilointitiedon tapahtumista."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Tuo outlook-viestejä PST-tiedostosta."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Outlookin PST-tuoja"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlookin omat kansiot (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+msgid "_Address Book"
+msgstr "_Osoitekirja"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+msgid "A_ppointments"
+msgstr "_Tapaamiset"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+msgid "_Journal entries"
+msgstr "_Päiväkirjamerkinnät"
+
+#: ../plugins/pst-import/pst-importer.c:352
+msgid "Importing Outlook data"
+msgstr "Tuodaan tietoja Outlookista"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Mahdollistaa kalenterien julkaisemisen verkossa"
@@ -19519,6 +19784,14 @@ msgstr ""
 "iCal\n"
 "Vapaa/Varattu"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "Uusi sijainti"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Muokkaa sijaintia"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hei Python"
@@ -19529,15 +19802,15 @@ msgstr "Pythonin liittännäislataimen testit"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
-msgstr "Python-testiliitännäinen"
+msgstr "Python-testilisäosa"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr "Testiliitännäinen pythonin EPlugin-lataimelle."
+msgstr "Testilisäosa pythonin EPlugin-lataimelle."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using Python."
-msgstr "Muita pythonilla tehtyjä liitännäisiä lataava liitännäinen."
+msgstr "Muita pythonilla tehtyjä lisäosia lataava lisäosa."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
@@ -19596,8 +19869,8 @@ msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
-"Suodattaa roskapostia käyttäen Spamassassinia. Tämä liitännäinen vaatii, "
-"että spamassassin on asennettu."
+"Suodattaa roskapostia käyttäen Spamassassinia. Tämä lisäosa vaatii, että "
+"spamassassin on asennettu."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin Options"
@@ -19605,11 +19878,11 @@ msgstr "Spamassassin-valitsimet"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
 msgid "SpamAssassin junk plugin"
-msgstr "Spamassassin-roskapostiliitännäinen"
+msgstr "Spamassassin-roskapostilisäosa"
 
 #: ../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 "Liitännäinen kaikkien liitteiden tallentamiseen kerralla."
+msgstr "Lisäosa kaikkien liitteiden tallentamiseen kerralla."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -19842,8 +20115,8 @@ msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
-"Luettelo avainsana- ja arvopareista, joita pohjat-liitännäinen käyttää "
-"viestin rungon osien korvaamiseen."
+"Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin "
+"rungon osien korvaamiseen."
 
 #: ../plugins/templates/templates.c:603
 msgid "No title"
@@ -19859,11 +20132,11 @@ msgstr "Tallenna pohjana"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr "Pohjiin perustuva malliliitännäinen"
+msgstr "Pohjiin perustuva mallilisäosa"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Liitännäinen, joka voita avata TNEF-liitteitä ytnef-ohjelman avulla."
+msgstr "Lisäosa, joka voita avata TNEF-liitteitä ytnef-ohjelman avulla."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19871,23 +20144,22 @@ msgstr "TNEF-liitteiden purkaja"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV-yhteystietojen liitännäinen."
+msgstr "WebDAV-yhteystietojen lisäosa."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV-yhteystiedot"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Vältä IfMatch-komentoa (vaaditaan apache-versiolle < 2.2.8)"
 
@@ -20033,7 +20305,7 @@ msgstr "Sivupaneeli on näkyvissä"
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -20286,19 +20558,15 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Virhe avattaessa FAQ-sivua."
-
-#: ../shell/e-shell-window-commands.c:1174
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Yhteydellinen tila"
 
-#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: ../shell/e-shell-window-commands.c:1200
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
@@ -20327,28 +20595,28 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Tuntematon järjestelmävirhe."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Virheellisiä argumentteja"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF:ia ei voidaan rekisteröidä"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
@@ -20410,7 +20678,7 @@ msgstr ""
 "Evolutionin käyttöön."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20446,7 +20714,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20454,43 +20722,43 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:490
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
-msgstr "Älä lataa mitään liitännäisiä."
+msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:492
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:577
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sähköposti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:605
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20641,7 +20909,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"Varmenne '%s' on varmennenviranomaisen varmenne (CA).\n"
+"Varmenne '%s' on varmentajan varmenne (CA).\n"
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
@@ -20651,8 +20919,8 @@ msgid ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
-"Koska luotat varmenneviranomaista, joka myönsi tämän varmenteen, luotat myös "
-"tämän varmenteen oikeellisuuteen, jollei tässä muuten mainita"
+"Koska luotat varmentajaan, joka myönsi tämän varmenteen, luotat myös tämän "
+"varmenteen oikeellisuuteen, jollei tässä muuten mainita"
 
 #: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
@@ -20660,7 +20928,7 @@ msgid ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
-"Koska et luota varmenneviranomaiseen, joka myönsi tämän varmenteen, et "
+"Koska et luota varmentajaan, joka myönsi tämän varmenteen, et "
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
 #: ../smime/gui/certificate-manager.c:137
@@ -20688,7 +20956,7 @@ msgstr "Varmenteen nimi"
 #: ../smime/gui/certificate-manager.c:280
 #: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
-msgstr "Tarkoitukset"
+msgstr "Käyttötarkoitus"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:553
@@ -20697,7 +20965,7 @@ msgstr "Sarjanumero"
 
 #: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
-msgstr "Vanhenee"
+msgstr "Vanhenemispäivä"
 
 #: ../smime/gui/certificate-manager.c:389
 msgid "All email certificate files"
@@ -20791,7 +21059,7 @@ msgstr "<b>Kelvollisuus</b>"
 
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
-msgstr "Viranomaiset"
+msgstr "Varmentajat"
 
 #: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
@@ -20815,7 +21083,7 @@ msgstr "Varmenne"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr "Varmenneviranomaisen luotto"
+msgstr "Varmentajan luottamus"
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
@@ -20831,7 +21099,7 @@ msgstr "Julkinen nimi (CN)"
 
 #: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
-msgstr "Varmenteen yhteystiedot"
+msgstr "Tuttavien varmenteet"
 
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
@@ -20915,15 +21183,12 @@ msgstr "Näytä"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"Seuraavista organisaatiosta olevista varmenteista sinut voidaan tunnistaa:"
+msgstr "Seuraavien organsiaatioiden varmenteet varmentavat identiteettisi:"
 
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Seuraavat varmenneviranomaiset voidaan tunnistaa tallentamistasi "
-"varmenteista:"
+msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -20931,7 +21196,7 @@ msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
-msgstr "Varmenteesi"
+msgstr "Omat varmenteet"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
@@ -20997,7 +21262,7 @@ msgstr "Netscape-varmenteen tyyppi"
 
 #: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
-msgstr "Varmenneviranomaisen avaintunniste"
+msgstr "Varmentajan avaintunniste"
 
 #: ../smime/lib/e-cert.c:671
 #, c-format
@@ -21034,11 +21299,11 @@ msgstr "Kohteen allekirjoittaja"
 
 #: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
-msgstr "SSL varmenneviranomainen"
+msgstr "SSL-varmenteiden varmentaja"
 
 #: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
-msgstr "Sähköpostivarmenneviranomainen"
+msgstr "Sähköpostivarmenteiden varmentaja"
 
 #: ../smime/lib/e-cert.c:850
 msgid "Signing"
@@ -21962,7 +22227,7 @@ msgstr "Liitä viestit leikepöydältä"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
-msgstr "Pos_tita uusi viesti kansioon"
+msgstr "L_isää uusi viesti kansioon"
 
 #: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
@@ -22135,7 +22400,7 @@ msgstr "_Lainattuna"
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
 #: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
-msgstr "_Lue"
+msgstr "_Luettu"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -22147,7 +22412,7 @@ msgstr "_Palauta viesti"
 
 #: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
-msgstr "l_ukematon"
+msgstr "L_ukematon"
 
 #: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
@@ -22161,10 +22426,6 @@ msgstr "Lä_hennä"
 msgid "Close"
 msgstr "Sulje"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
-
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Päätyökalupalkki"
@@ -22598,42 +22859,42 @@ msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
 #. 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 "Oma näkymä"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Tallenna oma näkymä"
 
-#: ../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 "Määrittele näkymät..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Luo tai muokkaa näkymiä"
 
@@ -22657,7 +22918,7 @@ msgstr "Näkymän tyyppi"
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Liitepalkki"
 
@@ -22757,16 +23018,16 @@ msgstr "Minimileveys"
 msgid "Spacing"
 msgstr "Välistys"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Nyt"
 
-#: ../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 "Ajan tulee olla muodossa: %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 "Prosenttiarvon tulee olla välillä 0 - 100"
 
@@ -22881,10 +23142,6 @@ msgstr "Paina tästä näyttääksesi kalenterin"
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "Aika"
-
 #: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "N_yt"
@@ -23760,3 +24017,21 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Yhteystiedon tulostustyylien muokkaimen testi"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Tekijänoikeudet (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr ""
+#~ "Tämän pitäisi testata yhteystiedon tulostustyylin muokkaimen widgettiä"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Yhteystiedon tulostustesti"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Tämän pitäisi testata yhteystiedon tulostuksen koodia"
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Virhe avattaessa FAQ-sivua."
diff --git a/po/ko.po b/po/ko.po
index fb950acfad..8fd1276c12 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,18 +1,28 @@
 # translation of evolution to Korean
+# This file is distributed under the same license as the evolution package.
 # Sung-Hyun Nam, 2000.
 # ChiDeok Hwang <hwang@mizi.co.kr>, 2001.
 # Young-Ho Cha <ganadist@mizi.com>, 2000, 2002.
 # Eunju Kim <eukim@redhat.com>, 2007.
-# Changwoo Ryu <cwryu@debian.org>, 2003-2006, 2007, 2008.
+# Changwoo Ryu <cwryu@debian.org>, 2003-2006, 2007, 2008, 2009.
 #
+# 참고:
+# - "Evolution"은 "에볼루션"으로 음역.
+# - "아무개 wrote:" 혹은 "--- Original Message ---" 따위의 메일의 일부분을
+#   차지하는 문자열의 번역은, 사용자의 UI 문제가 아니므로 생각해 볼 일이다. 현재는
+#   번역되지 않았거나 소극적으로 번역되어 있다.
 #
-#: ../shell/main.c:589
+# - 영어 문장 순서대로 문장 중간중간에 UI를 넣은, 번역하기 어려운 케이스가 많다.
+#   UI XML 파일이나 소스 코드에서 확인하는 수밖에 없고, 장기적으로 원문을 바로잡아야
+#   한다.
+#
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-05 00:48+0900\n"
-"PO-Revision-Date: 2008-09-05 01:57+0900\n"
+"POT-Creation-Date: 2009-01-24 01:51+0900\n"
+"PO-Revision-Date: 2009-01-24 15:42+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +32,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "에볼루션 주소록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "새 연락처"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "새 연락처 목록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -157,7 +167,7 @@ msgid "calendar view for one or more days"
 msgstr "달력 보기, 일 단위"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%Y년 %b %e일 %A"
 
@@ -168,18 +178,18 @@ msgstr "%Y년 %b %e일 %A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:339
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%b %e일 (%a)"
 
 #: ../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:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %e일 (%a)"
 
@@ -187,10 +197,10 @@ msgstr "%Y년 %b %e일 (%a)"
 #: ../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:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%Y년 %b %e일"
 
@@ -200,15 +210,15 @@ msgstr "%Y년 %b %e일"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:353
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%b %d"
 
 #: ../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 "그놈 달력"
 
@@ -256,11 +266,11 @@ msgstr "팝업"
 msgid "popup a child"
 msgstr "하위 창 팝업"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "편집"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "이 셀 편집 시작"
 
@@ -273,19 +283,19 @@ msgstr "토글"
 msgid "toggle the cell"
 msgstr "셀 토글"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "늘이기"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "이 셀이 들어 있는 ETree의 행 늘이기"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "줄이기"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "이 셀이 들어 있는 ETree의 행 줄이기"
 
@@ -404,7 +414,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "'{0}' 주소록을 지우시겠습니까?"
+msgstr "'{0}' 주소록을 삭제하시겠습니까?"
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading address book."
@@ -420,9 +430,9 @@ msgstr "LDAP 서버에서 인증이 실패했습니다."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
-msgstr "연락처를 지우는 데 실패했습니다"
+msgstr "연락처를 삭제하는 데 실패했습니다"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
@@ -433,6 +443,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "서버 버전"
 
@@ -476,7 +487,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
-msgstr "주소록을 영원히 지웁니다."
+msgstr "주소록을 영원히 제거합니다."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
@@ -537,7 +548,7 @@ msgstr ""
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
-msgstr "더하기(_A)"
+msgstr "추가(_A)"
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
@@ -557,7 +568,7 @@ msgstr "그대로 사용(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -566,21 +577,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
 
-#: ../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 "주소록을 읽어들일 수 없습니다"
 
-#: ../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 "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "자동 완성"
 
@@ -596,11 +608,13 @@ msgstr "인증서"
 msgid "Configure autocomplete here"
 msgstr "여기서 자동 완성을 설정합니다"
 
+#. ensure the group name is in current locale, not read from configuration
 #. 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:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "연락처"
@@ -637,158 +651,178 @@ msgstr "에볼루션 폴더 설정 컨트롤"
 msgid "Manage your S/MIME certificates here"
 msgstr "여기서 S/MIME 인증서를 관리합니다"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "이 컴퓨터"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
 #: ../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
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "개인"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "연락처(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "새로운 연락처를 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "연락처 목록(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:253
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "주소록(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "새 주소록을 만듭니다"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "주소록 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "베이스"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "종류(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "오프라인 작업을 위해 주소록 내용 로컬에 복사(_B)"
 
-#: ../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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "일반"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "주소록"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "인증"
 
-#: ../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 "자세히"
 
-#: ../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 "찾는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "다운로드하는 중"
 
-#: ../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 "주소록 속성"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "옮기는 중..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' 옮기는 중:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP 서버"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "자동 완성 설정"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -799,7 +833,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -809,7 +843,7 @@ msgstr ""
 "\n"
 "폴더를 여기에 맞게 변환하는 동안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -819,7 +853,7 @@ msgstr ""
 "\n"
 "폴더를 여기에 맞게 변환하는 동안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -829,53 +863,60 @@ msgstr ""
 "\n"
 "폴더를 여기에 맞게 변환하는 동안 잠시 기다리십시오..."
 
-#: ../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 "\"%s\" 폴더 이름 바꾸기:"
 
-#: ../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 "폴더 이름 바꾸기"
 
-#: ../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 "폴더 이름에 '/'가 들어갈 수 없습니다"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "새 주소록(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "이름 바꾸기(_R)..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../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 "지우기(_D)"
+msgstr "삭제(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "속성(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "연락처 원본 선택"
 
@@ -896,8 +937,8 @@ msgstr "%s(사용자 %s)의 암호를 입력하십시오"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
@@ -921,32 +962,50 @@ msgid ""
 msgstr "세로 창의 위치, 카드와 리스트보기와 미리 보기 창의 사이, 픽셀 단위."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "주소로 이름을 자동 완성해서 표시"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "미리 보기 창 보기"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "에볼루션에서 자동 완성을 시작하려면 입력해야 할 문자 개수."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "이름 선택 대화 상자에 마지막으로 사용되었던 폴더의 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "이름 선택 대화 상자에 마지막으로 사용되었던 폴더의 URI."
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "세로 창 위치"
 
-#: ../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 "미리 보기 창을 볼지 여부."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "항상 주소록에서 자동 완성한 메일 주소를 표시(_S)"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "주소록에서 찾아 보기"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -985,10 +1044,10 @@ msgstr "<b>종류:</b> "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
-msgstr "주소록을 더합니다"
+msgstr "주소록을 추가합니다"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "항상"
 
@@ -1027,14 +1086,14 @@ msgid "Lo_gin:"
 msgstr "로그인(_G):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "사용 안 함"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "암호화 없음"
 
@@ -1046,7 +1105,7 @@ msgstr "한 단계"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
@@ -1112,7 +1171,7 @@ msgstr "지원하는 찾기 기준"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
@@ -1123,7 +1182,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "찾기 기준은 찾기를 시작할 항목의 고유 이름(distinguished name, DN)입니다. 찾"
-"기 기준을 비워두면, 디렉토리 트리의 맨 위부터 찾기 시작합니다."
+"기 기준을 비워두면, 디렉터리 트리의 맨 위부터 찾기 시작합니다."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1132,13 +1191,13 @@ msgid ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 msgstr ""
-"찾기 범위는 디렉토리 트리 아래로 얼마나 깊이 찾을 지 정의합니다. \"아래\"의 "
+"찾기 범위는 디렉터리 트리 아래로 얼마나 깊이 찾을 지 정의합니다. \"아래\"의 "
 "찾기 범위는 찾기 기준 아래의 모든 엔트리에 대해서 찾게 됩니다. 찾기 범위가 "
 "\"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니다."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버의 완전한 이름입니다. 예를 들어 \"ldap.mycompany.com\"."
 
@@ -1153,7 +1212,7 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "에볼루션에서 인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서"
@@ -1206,7 +1265,7 @@ msgstr "로그인 방법(_L):"
 
 #: ../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:"
@@ -1221,7 +1280,7 @@ msgid "_Search scope:"
 msgstr "찾기 범위(_S):"
 
 #: ../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 "서버(_S):"
@@ -1239,13 +1298,14 @@ msgid "cards"
 msgstr "카드"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "분"
 
@@ -1286,8 +1346,8 @@ msgid "<b>Work</b>"
 msgstr "<b>직장</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1298,16 +1358,16 @@ msgid "Ca_tegories..."
 msgstr "분류(_T)..."
 
 #: ../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 "연락처"
 
 #: ../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 "연락처 편집기"
 
@@ -1316,11 +1376,12 @@ msgid "Full _Name..."
 msgstr "전체 이름(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "그림"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
@@ -1333,1252 +1394,1263 @@ msgid "Nic_kname:"
 msgstr "별명(_K):"
 
 #: ../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 "노벨 그룹와이즈"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "노벨 그룹와이즈"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "개인 정보"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "전화"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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 "업무"
 
-#: ../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 "주소(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "기념일(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "비서(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "생일(_B):"
 
-#: ../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:1893
 msgid "_Calendar:"
 msgstr "달력(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "도시(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "회사(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "국가(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "부서(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "파일 이름(_F):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "약속 있음/없음(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "홈페이지(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "관리자(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "메모(_N):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "사무실(_O):"
 
-#: ../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 "사서함(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "업무(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "배우자(_S):"
 
-#: ../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 "시/도(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "직위(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "화상 대화(_V):"
 
-#: ../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 "HTML 메일 받음(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "웹로그(_W):"
 
-#: ../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 "위치(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "우편 번호(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "주소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c: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-reflow-adapter.c:424
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../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/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "편집 가능"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "미국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "아프가니스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "알바니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "알제리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "미국령 사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "안도라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "앙골라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "앙귈라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "남극"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "안티가 바부다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "아르헨티나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "아르메니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "아루바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "아제르바이잔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "바하마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "바레인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "방글라데시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "바르바도스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "벨라루스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "벨리즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "베닌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "버뮤다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "부탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "볼리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "보스니아 헤르체코비나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "보츠와나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "보우벳 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "영국령 인도양 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "브루나이 다루살람"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "불가리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "부르키나 파소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "부룬디"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "캄보디아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "카메룬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "케이프 베르드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "케이만 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "중앙 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "챠드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "칠레"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "중국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "크리스마스 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "코코스 (킬링) 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "콜롬비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "코모로스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "콩고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "콩고 민주 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "쿡 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "코트 디브와르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "크로아티아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "쿠바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "사이프러스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "덴마크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "지부티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "도미니카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "도미니카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "에쿠아도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "이집트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "엘 살바도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "적도기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "에리트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "에스토니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "에티오피아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "포클랜드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "패로 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "피지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "프랑스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "프랑스령 기아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "프랑스령 폴리네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "프랑스령 남 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "가봉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "감비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "그루지아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "독일"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "가나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "지브롤터"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "그리스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "그린란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "그레나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "과달루프"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "괌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "과테말라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "건지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "기니비사우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "가이아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "하이티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "허드 맥도널드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "바티칸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "혼두라스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "홍콩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "헝가리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "아이슬란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "인도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "인도네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "이란"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "이라크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "아이랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "맨 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "이탈리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "자메이카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "일본"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "저지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "요르단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "카자흐스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "케냐"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "키리바티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "조선민주주의인민공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "대한민국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "쿠웨이트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "키르기즈스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "라오스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "라트비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "레바논"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "레소토"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "라이베리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "리히텐슈타인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "리투아니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "룩셈부르크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "마카오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "마케도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "마다가스카르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "말라위"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "말레이시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "몰디브"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "말리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "몰타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "마샬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "마르띠니크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "모리타니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "모리셔스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "마요트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "멕시코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "미크로네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "몰도바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "모나코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "몽골"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "몽세라트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "모로코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "모잠비크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "미얀마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "나미비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "나우루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "네팔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "네덜란드령 앤틸레스 열도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "뉴 칼레도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "뉴질랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "니카라과"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "니제르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "나이지리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "니우에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "노퍽 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "북 마리아나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "오만"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "파키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "팔라우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "팔레스타인 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "파나마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "파푸아 뉴기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "파라과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "페루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "필리핀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "피트케언"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "푸에르토리코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "카타르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "레위니옹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "루마니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "러시아 연방"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "르완다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "세인트 키츠 네비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "세인트 루시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "세인트 빈센트 그레나다인즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "산마리노"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "상투메 프린시페"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "사우디아라비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "세네갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "세르비아 몬테네그로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "세이셸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "시에라리온"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "싱가폴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "슬로바키아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "슬로베니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "솔로몬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "소말리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "남 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "남 조지아 남 샌드위치 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "스페인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "스리랑카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "세인트 헬레나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "쌩 피에르 미켈론"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "수단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "수리남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "스발바르드 얀마이엔 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "스와질란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "스위스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "시리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "타이완"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "타지키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "탄자니아 연방 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "태국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "동티모르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "토고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "토켈로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "통가"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "트리니다드 토바고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "튀니지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "터키"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "투르크멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "터크 스케이커스 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "투발루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "우간다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "우크라이나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "아랍에미리트연합"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "영국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "미국령 소군도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "우르과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "우즈베키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "바누아투"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "베네수엘라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "베트남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "버진 제도, 영국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "버진 제도, 미국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "왈리스 후투나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "서부 사하라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "예멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "잠비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "이름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL 인스턴스 메신저"
 
-#: ../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 "재버"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "야후 메신저"
 
-#: ../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 "가두가두 메신저"
 
-#: ../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 "스카이프"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "서비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "위치"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
-msgstr "사용자이름"
+msgstr "사용자 이름"
 
-#: ../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 "집"
 
-#: ../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:2259
 msgid "Other"
 msgstr "기타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "야후"
 
-#: ../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 "가두가두"
 
-#: ../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 "그룹와이즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
-msgstr "쓰기 가능한 필드"
+msgstr "쓰기 가능한 항목"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
-msgstr "필수 필드"
+msgstr "필수 항목"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "바뀜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연락처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "이 연락처에 사용할 그림을 선택하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "그림 없음(_N)"
 
-#: ../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"
@@ -2586,79 +2658,79 @@ msgstr ""
 "연락처 데이터가 잘못되었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../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'이(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "연락처가 잘못되었습니다."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "연락처 빠른 추가"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "전체 이름(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "전자 메일(_M)"
 
-#: ../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 "주소록 선택(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr ""
 "정말로 연락처 목록을 (%s)\n"
-"지우시겠습니까?"
+"삭제하시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
 "정말로 이 연락처 목록을\n"
-"지우시겠습니까?"
+"삭제하시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 msgstr ""
 "정말로 연락처를 (%s)\n"
-"지우시겠습니까?"
+"삭제하시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 "정말로 이 계정을\n"
-"지우시겠습니까?"
+"삭제하시겠습니까?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
@@ -2760,9 +2832,9 @@ msgstr "메신저 서비스(_I):"
 
 #: ../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 "위치(_L):"
 
@@ -2776,6 +2848,9 @@ msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "선택..."
 
@@ -2801,9 +2876,9 @@ msgid "_Members"
 msgstr "구성원(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2861,92 +2936,94 @@ msgstr "연락처 합치기"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "전자메일"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "필드에 포함"
 
+# FIXME - hard to translate UI + string based on English grammar
 #: ../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 "전자메일 시작"
+msgstr "메일 주소 시작"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 msgid "Name contains"
 msgstr "이름에 포함"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "연락처 없음"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "연락처 %d개"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "쿼리"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "주소록 보기를 가져오는 데 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "모델"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
-msgstr "카드를 바꾸는 데 오류가 발생했습니다"
+msgstr "카드를 수정하는 데 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+# FIXME - hard to translate UI + string based on English grammar
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "이름 시작"
 
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "소스"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "형태"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "vCard로 저장..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "열기(_O)"
@@ -2973,15 +3050,15 @@ msgstr "연락처 전달(_F)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
-msgstr "연락처로 메세지 보내기(_M)"
+msgstr "연락처로 메시지 보내기(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
-msgstr "리스트로 메세지 보내기(_M)"
+msgstr "리스트로 메시지 보내기(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
-msgstr "연락처로 메세지 보내기(_M)"
+msgstr "연락처로 메시지 보내기(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
@@ -3000,12 +3077,12 @@ msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3013,17 +3090,23 @@ msgstr "복사(_C)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
-msgstr "붙여 넣기(_A)"
+msgstr "붙여넣기(_A)"
 
 #. 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 "모든 분류"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "맞지 않음"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "비서"
 
@@ -3053,7 +3136,7 @@ msgstr "카폰"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3061,7 +3144,7 @@ msgid "Categories"
 msgstr "분류"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "회사"
 
@@ -3111,22 +3194,22 @@ msgid "Journal"
 msgstr "일지"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "관리자"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "별명"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "메모"
 
@@ -3155,14 +3238,14 @@ msgid "Radio"
 msgstr "무선"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "역할"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "배우자"
 
@@ -3193,55 +3276,55 @@ msgstr "구성 단위"
 msgid "Web Site"
 msgstr "웹 사이트"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "너비"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "높이"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "촛점이 있는 지"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "항목"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "항목 이름"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "텍스트 모델"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "최대 필드 이름 길이"
 
@@ -3312,84 +3395,84 @@ msgstr ""
 msgid "Adapter"
 msgstr "어댑터"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "업무 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "집 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "기타 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "커서가 있는 지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
-#: ../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 "링크 위치 복사(_C)"
 
-#: ../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 "새 메세지 보내기(_S)..."
+msgstr "새 메시지 보내기(_S)..."
 
-#: ../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 "전자메일 주소 복사(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(지도)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "지도"
 
 # List는 여기서 Mailing List를 말한다
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "리스트 구성원"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "부서"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "업무"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "직위"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "화상 대화"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c: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:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3401,206 +3484,197 @@ msgid "Calendar"
 msgstr "달력"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../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 "약속 있음/없음"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "전화"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "팩스"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "웹로그"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "생일"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "기념일"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "직함"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "블로그"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "성공했습니다"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "백엔드를 사용중입니다"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "저장고가 연결되지 않았습니다"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "주소록이 없습니다"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "내 연락처를 정의하지 않았습니다"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "권한이 거부되었습니다"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "연락처를 찾을 수 없습니다"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "연락처 ID가 이미 있습니다"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "프로토콜이 지원되지 않습니다"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "취소함"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "취소할 수 없습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "인증이 실패했습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "인증이 필요합니다"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS를 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "그런 소스가 없습니다"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "오프라인 모드에서는 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "기타 오류"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "서버 버전이 잘못되었습니다"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "지원하지 않는 인증 방식"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
-msgstr "이 주소록을 열 수 없습니다. 이 주소록을 오프라인에서 사용할 수 있게 표시하지 않았거나 아직 오프라인에서 사용할 수 있게 다운로드하지 않은 상태입니다. 온라인 모드에서 주소록을 다시 읽어들여서 그 내용을 다운로드하십시오."
+"load the address book once in online mode to download its contents."
+msgstr ""
+"이 주소록을 열 수 없습니다. 이 주소록을 오프라인에서 사용할 수 있게 표시하지 "
+"않았거나 아직 오프라인에서 사용할 수 있게 다운로드하지 않은 상태입니다. 온라"
+"인 모드에서 주소록을 다시 읽어들여서 그 내용을 다운로드하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
 "는 지 확인하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
-"할 수 없습니다."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하려"
-"면 LDAP를 지원하는 에볼루션을 설치해야 합니다."
+"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 "이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP을 사용하려면 LDAP을 지원하는 에볼루션을 설치해야 합니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
-msgstr "자세한 오류 내용:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "자세한 오류 메시지:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3609,59 +3683,59 @@ msgid ""
 msgstr ""
 "이 쿼리에 서버에서 리턴하기로 설정한 것보다 많은 카드가 일치하거나,\n"
 "에볼루션에서 표시하도록 설정한 것보다 많은 카드가 일치하였습니다.\n"
-"좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
+"좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서 \n"
 "결과의 한계치를 지정하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../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 ""
-"쿼리에 걸린 시간이 서버의 한계값이나 이 주소록에서 설정한 한계값을\n"
-"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
-"결과의 한계값을 지정하십시오."
+"쿼리에 걸린 시간이 서버의 시간 제한이나 이 주소록에서 설정한 시간 제한을\n"
+"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서\n"
+"시간 제한을 늘려 보십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr "이 주소록의 백엔드에서 이 질의를 파싱할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr "이 주소록의 백엔드에서 이 질의를 수행하길 거부했습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "이 질의가 성공적으로 끝나지 않았습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "목록을 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "연락처를 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
-msgstr "목록을 고치는 중 오류가 발생했습니다"
+msgstr "목록을 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
-msgstr "연락처를 고치는 중 오류가 발생했습니다"
+msgstr "연락처를 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
-msgstr "목록을 지우는 중 오류가 발생했습니다"
+msgstr "목록을 제거하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
-msgstr "연락처를 지우는 중 오류가 발생했습니다"
+msgstr "연락처를 제거하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3673,16 +3747,16 @@ msgstr[0] ""
 "연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
 "정말로 이 연락처를 전부 여시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "표시하지 않기(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "모든 연락처 표시(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3691,90 +3765,90 @@ msgstr ""
 "%s이(가) 이미 존재합니다\n"
 "이 파일을 덮어 쓰시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "덮어 쓰기"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "연락처"
 
 # 파일 이름
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "카드.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "주소록 선택"
 
 # 파일 이름
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "목록"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "연락처 이동"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "연락처 이동"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "여러 개 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "%s에 대한 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s에 대한 연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:297
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "주소록 질의중입니다..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "기타 연락처 %d개."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "vCard 자세히 보기"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "vCard 간단히 보기"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "주소록에 저장"
 
@@ -3783,28 +3857,28 @@ msgid "Card View"
 msgstr "카드: "
 
 #: ../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 "가져오는 중..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV 혹은 TAB (.csv, .tab)"
+msgstr "아웃룩 CSV 혹은 TAB (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV 및 TAB 가져오기"
+msgstr "아웃룩 CSV 및 TAB 가져오기"
 
 #: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV 혹은 TAB (.csv, .tab)"
+msgstr "모질라 CSV 혹은 TAB (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozilla CSV 및 TAB 가져오기"
+msgstr "모질라 CSV 및 TAB 가져오기"
 
 #: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
@@ -3814,19 +3888,19 @@ msgstr "에볼루션 CSV 혹은 TAB (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "에볼루션 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 데이터 교환 형식 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "에볼루션 LDIF 가져오기"
 
-#: ../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 "에볼루션 vCard 가져오기"
 
@@ -3871,11 +3945,11 @@ msgid "Format"
 msgstr "형식"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c: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:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "머리말:"
@@ -3978,9 +4052,9 @@ msgstr "명암"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c: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 "크기:"
 
@@ -4009,30 +4083,8 @@ msgstr "너비:"
 msgid "_Font..."
 msgstr "글꼴(_F)..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "연락처 인쇄 모양새 편집 테스트"
-
-# 테스트 프로그램
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "연락처 인쇄 모양새 편집 위젯을 테스트합니다"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "연락처 인쇄 테스트"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "연락처 인쇄 코드를 테스트합니다"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c: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 "파일을 열 수 없습니다"
@@ -4045,61 +4097,61 @@ msgstr "주소록의 목록을 가져올 수 없습니다"
 msgid "failed to open book"
 msgstr "주소록을 여는 데 실패했습니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "표준 출력 대신에 출력할 파일을 지정합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "<출력파일>"
 
 # command line help
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "로컬 주소록 폴더 목록을 표시합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "카드를 vcard 혹은 csv 파일로 표시합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "비동기 모드로 내보냅니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "비동기 모드에서 출력 파일 한 개에 들어갈 카드 개수, 기본 크기 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "<개수>"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "명령행 인자에 오류가 발생했습니다. --help 옵션을 사용해 사용법을 확인하십시"
 "오."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "csv 혹은 vcard 형식만을 지원합니다."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "비동기 모드에서는, 파일로 출력해야 합니다."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "일반 모드에서는, 크기 옵션이 필요 없습니다."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "처리하지 못한 오류"
 
@@ -4175,49 +4227,49 @@ msgstr "이 작업에 들어 있는 모든 정보를 지울 것이고 복구할
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "정말로 이 '{0}' 작업을 지우시겠습니까?"
+msgstr "정말로 이 '{0}' 작업을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
+msgstr "정말로 '{0}' 약속을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "정말로 이 '{0}' 메모를 지우시겠습니까?"
+msgstr "정말로 이 '{0}' 메모를 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
+msgstr "정말로 '{0}' 약속을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
-msgstr "정말로 '{0}' 메모를 지우시겠습니까?"
+msgstr "정말로 '{0}' 메모를 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "정말로 '{0}' 작업을 지우시겠습니까?"
+msgstr "정말로 '{0}' 작업을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
-msgstr "정말로 이 약속을 지우시겠습니까?"
+msgstr "정말로 이 약속을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
-msgstr "정말로 이 모임을 지우시겠습니까?"
+msgstr "정말로 이 모임을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "정말로 이 메모를 지우시겠습니까?"
+msgstr "정말로 이 메모를 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "정말 이 작업을 지우시겠습니까?"
+msgstr "정말 이 작업을 삭제하시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
@@ -4232,68 +4284,77 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "정말로 요약문 없는 작업을 보내시겠습니까?"
 
 #: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "달력 저장소에 연결되어 있지 않습니다."
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "새 행사를 만들 수 없습니다"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "행사를 저장할 수 없습니다"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "'{0}' 달력을 지우시겠습니까?"
+msgstr "'{0}' 달력을 삭제하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
-msgstr "'{0}' 메모 목록을 지우시겠습니까?"
+msgstr "'{0}' 메모 목록을 삭제하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "'{0}' 작업 목록을 지우시겠습니까?"
+msgstr "'{0}' 작업 목록을 삭제하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "보내지 않기(_N)"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "다운로드하는 중입니다. 이 약속을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "다운로드하는 중입니다. 이 작업을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "편집 창을 읽어들일 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 이 작업을 수락하도"
+"전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자들이 이 작업을 수락하도"
 "록 합니다."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
-"전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 응답하도록 합니다."
+"전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자들이 응답하도록 합니다."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "달력을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "메모 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "작업 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "'{0}'에 오류가 발생했습니다"
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4301,7 +4362,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 모임을 취소했다는 사실을 알 지 "
 "못할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4309,7 +4370,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 메모를 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4317,7 +4378,23 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 작업을 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "서버에서 응답이 없습니다."
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "약속 저장"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "메모 저장"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "작업 저장"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4325,7 +4402,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 달력을 업데이트할 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4333,7 +4410,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 작업 목록을 업데이트"
 "할 수 있습니다."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4341,7 +4418,7 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 약속을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4349,83 +4426,91 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 작업을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "현재 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "에볼루션 달력이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "에볼루션 달력이 예상치 못하게 끝났습니다."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "에볼루션 메모가 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "에볼루션 작업이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "이 달력은 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "메모 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "작업 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
-msgstr "이 달력은 완전히 지워집니다."
+msgstr "이 달력은 완전히 제거합니다."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
-msgstr "이 메모 목록은 완전히 지워집니다."
+msgstr "이 메모 목록은 완전히 제거합니다."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
-msgstr "이 작업 목록은 완전히 지워집니다."
+msgstr "이 작업 목록은 완전히 제거합니다."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "달력을 읽어들일 수 없습니다"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "바뀐 부분을 이 약속에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "바뀐 부분을 이 메모에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "바뀐 부분을 이 작업에 저장하시겠습니까?"
 
-#: ../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 "이 메모에 대한 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "모든 참가자에게 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "이 작업을 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "업데이트한 모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "업데이트한 작업 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4435,108 +4520,108 @@ msgstr ""
 "제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
 "습니다."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "약속에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "작업에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../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 "메모에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 달력을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 메모를 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 작업을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "바뀐 내용 버리기(_D)"
 
-#: ../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 "저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "바뀐 내용 저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "공지사항 보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "여러 날에 걸친 행사 분리:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server를 시작할 수 없습니다"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "파일롯의 Calendar 프로그램 블록을 읽을 수 없습니다"
 
-#: ../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 "파일롯의 Memo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../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 "파일롯의 Memo 프로그램 블록에 쓸 수 없습니다"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "기본 우선순위:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../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 "파일롯의 ToDo 프로그램 블록에 쓸 수 없습니다"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "달력 및 작업"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1343
 msgid "Calendars"
 msgstr "달력"
 
@@ -4554,7 +4639,7 @@ msgstr "에볼루션 달력 설정 컨트롤"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
-msgstr "에볼루션 달력 계획 메세지 보기"
+msgstr "에볼루션 달력 계획 메시지 보기"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
@@ -4577,22 +4662,22 @@ msgid "Memo_s"
 msgstr "메모(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:1025 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "메모"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586
+#: ../calendar/gui/tasks-component.c:1014 ../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
@@ -4614,24 +4699,25 @@ msgstr "작업(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "에볼루션 달력 알림 서비스"
 
-#: ../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] "분"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "시간"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "시작 시각"
 
@@ -4642,10 +4728,10 @@ msgstr "약속"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "위치:"
 
@@ -4654,53 +4740,57 @@ msgid "Snooze _time:"
 msgstr "연기할 시간(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr "해제(_D)"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "연기 모드(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "약속 장소"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d개 알림이 있습니다"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4713,7 +4803,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4730,15 +4820,15 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
-msgstr "이 메세지를 다시 보지 않습니다."
+msgstr "이 메시지를 다시 보지 않습니다."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4751,7 +4841,7 @@ msgid "invalid time"
 msgstr "잘못된 시간"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4759,7 +4849,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
 #. 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"
@@ -4769,7 +4859,7 @@ msgstr[0] "%d분"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4781,163 +4871,187 @@ msgid "Alarm programs"
 msgstr "알림 프로그램"
 
 #: ../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 "오류를 상태 표시줄에 표시할 시간, 초 단위."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "항목을 지울 때 확인 질문하기"
 
-#: ../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 "오늘 마감인 작업의 배경색, \"#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 "마감이 지난 작업의 배경색, \"#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 "알림을 실행할 달력"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "시간 막대에 마커스 베인스 라인을 그릴 색 (기본값은 비어 있음)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "하루씩 볼 때 마커스 베인스 라인을 그릴 색."
 
-#: ../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 "한 달씩 볼 때 토요일/일요일은 한 칸에 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "폴더 비울 때 확인 질문"
 
-#: ../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 "근무 시작/끝 시간을 지정할 날."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "기본 약속 미리 알림"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "기본 미리 알림 단위"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "기본 미리 알림 값"
 
-#: ../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 "알림 오디오 파일을 저장할 디렉토리"
+msgstr "알림 오디오 파일을 저장할 디렉터리"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "행사 그라디언트"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "행사 투명도"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "약속 있음/없음 서버 URL"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "약속 있음/없음 템플리트 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "달력 보기에서 행사의 그라디언트."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "끝마친 작업 숨기기"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "작업 단위 숨기기"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "작업 값 숨기기"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "가로 창 위치"
 
-#: ../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 "근무일에 끝나는 시간, 24시간 형식으로 0에서 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 "근무일에 시작하는 시간, 24시간 형식으로 0에서 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 "일별 보기 및 근무일 주별 보기에 보일 시간 간격, 분 단위."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "마지막 알림 시간"
 
+#: ../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 "어떤 메시지를 기록할 지 단계."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr "일별 보기에서 최근에 사용한 보조 시간대의 목록."
+
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "약속 있음/없음 정보를 게시할 서버 URL 목록."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "마커스 베인 라인"
 
-#: ../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 "마커스 베인 라인 색 - 날짜별 보기"
 
-#: ../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 "마커스 베인 라인 색 - 시간 막대"
 
-#: ../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 "'day_second_zones' 목록에서 기억할 최근에 사용한 시간대의 최대 수."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "최근에 사용한 시간대를 기억할 최대 수."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "근무일에 끝나는 분, 0에서 59까지."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "근무일에 시작하는 분, 0에서 59까지."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "한 달씩 보기 가로 창 위치"
 
-#: ../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 "한 달씩 보기 세로 창 위치"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../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 "기본 미리 알림 여부를 결정할 단위의 수."
 
-#: ../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 "언제 작업을 감출 지 결정할 단위의 수."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "마감이 지난 작업 색"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4945,7 +5059,7 @@ msgstr ""
 "가로 창의 위치, 한 달씩 보기가 아닐 때 날짜 선택 달력과 작업 목록 사이, 픽셀 "
 "단위."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4953,19 +5067,19 @@ msgstr ""
 "가로 창의 위치, 한 달씩 보기에서 뷰와 날짜 선택 달력과 작업 목록 사이, 픽셀 "
 "단위."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "세로 창의 위치, 카드 목록과 날짜 찾아보기 달력 사이."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "세로 창의 위치, 작업 목록과 작업 미리 보기 창 사이, 픽셀 단위."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4973,7 +5087,7 @@ msgstr ""
 "세로 창의 위치, 한 달씩 보기에서 뷰와 날짜 선택 달력과 작업 목록 사이, 픽셀 "
 "단위."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4981,70 +5095,84 @@ msgstr ""
 "세로 창의 위치, 한 달씩 보기가 아닐 때 뷰와 날짜 선택 달력과 작업 목록 사이, "
 "픽셀 단위."
 
-#: ../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 "알림에서 실행할 프로그램."
 
-#: ../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 "알람 오디오 저장 디렉토리"
+msgstr "알람 오디오 저장 디렉터리"
 
-#: ../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 "행사/작업/모임 편집에서 응답요청 항목 표시"
 
-#: ../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 "행사/작업/모임 편집에서 역할 항목 표시"
 
-#: ../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 "한 주씩 보거나 한 달씩 볼 때 약속 끝나는 시간 표시"
 
-#: ../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 "행사/작업/모임 편집에서 분류 항목 표시"
 
-#: ../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 "알림 영역에서 알림 표시"
 
-#: ../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 "행사/작업/모임 편집에서 상태 항목 표시"
 
-#: ../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 "\"미리 보기\" 창 표시"
 
-#: ../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 "\"미리 보기\" 창을 표시합니다."
 
-#: ../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 "행사/모임 편집에서 시간대 항목을 표시합니다"
 
-#: ../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 "행사/작업/모임 편집에서 종류 항목을 표시합니다"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "일별 보기 및 근무일 주별 보기에서 몇 번째 주인지 표시합니다"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시합니다"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr "보조 시간대가 있으면, 일별 보기에서 보조 시간대를 표시합니다. 값은 'timezone' 키에서 사용한 값과 비슷합니다."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "오늘 마감인 작업의 색"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "작업 세로 창 위치"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5053,7 +5181,7 @@ msgstr ""
 "약속 있음/없음 데이터 대체품으로 사용할 URL 템플리트, %u은(는) 전자메일 주소"
 "의 사용자 부분, %d은(는) 도메인으로 바뀝니다."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5061,331 +5189,359 @@ msgstr ""
 "달력의 날짜와 시간에 사용할 기본 시간대, \"America/New York\"처럼 번역하지 않"
 "은 Olsen 시간대 데이터베이스에 따라서."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "일별 보기에서 보조 시간대."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"세 가지 값이 가능합니다. \"0\"은 오류, \"1\"은 경고, \"2\"는 디버깅 메시지."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "시간 간격"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "최근에 알림이 작동한 시각, time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "시간대 "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "달력 보기에서 행사의 투명도, 0(투명)에서 1(불투명) 사이의 값."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24시간 형식"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "기본 미리 알림의 단위, \"minutes\", \"hours\" 혹은 \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "작업을 언제 숨길지 결정하는 단위, \"minutes\", \"hours\" 혹은 \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "시작 요일"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "한 주가 시작하는 요일, 일요일(0)에서 토요일(6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "알림을 표시할 때 알림 영역을 사용할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "약속이나 작업을 지울 때 확인 질문을 할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "지운 약속이나 작업을 비울 때 확인 질문을 할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "한 달씩 볼 때 주말을 요약해서 토요일/일요일을 한 칸에 표시할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "한 주씩 보거나 한 달씩 볼 때 행사 끝나는 시간 표시할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "달력에 마커스 베인스 라인을 (해당 시간대에 직선) 그릴 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "끝마친 작업을 작업 표시할 때 감출 지 여부."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "약속에 미리 알림 기본값을 설정할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 응답요청 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "행사/모임 편집에서 분류 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 역할 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 상태 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "시간을 오전/오후가 아닌 24시간 모드로 표시할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "행사/모임 편집에서 시간대 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 종류 항목 표시"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "일별 보기 및 근무일 주별 보기에서 몇 번째 주인지 표시할 지 여부."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "날짜 선택할 때 몇 번째 주인지 표시할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "행사를 표시할 때 일광 절약시간을 사용할 지 여부."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "근무 요일"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "근무일에 끝나는 시간"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "근무일에 끝나는 분"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "근무일에 시작하는 시간"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "근무일에 시작하는 분"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "일광 절약 시간"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "분류가"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "주석에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "위치에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "맞지 않음"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7일 간의 작업"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "마감이 지난 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "활성화한 약속"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7일 간의 약속"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "인쇄"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr ""
-"이 작업은 선택한 기간보다 오래 된 행사들을 모두 영구적으로 지우게 됩니다. 계"
-"속하시면, 이 행사를 복구할 수 없게 됩니다."
+msgstr "이 작업은 선택한 기간보다 오래 된 행사들을 모두 영구적으로 지우게 됩니다. 계속하시면, 이 행사를 복구할 수 없게 됩니다."
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "일"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the 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/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "웹"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "생일 및 기념일"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "날씨"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../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:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "오프라인에서 사용할 수 있게 하기(_M)"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "오프라인에서 사용할 수 없게 하기(_D)"
+
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "달력을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1194
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 '%s' 달력을 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1210
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1323
 msgid "Calendar Source Selector"
 msgstr "달력 소스 선택"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1539
 msgid "New appointment"
 msgstr "새 약속"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1540
 msgctxt "New"
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1541
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1547
 msgid "New meeting"
 msgstr "새 모임"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1548
 msgctxt "New"
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1549
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1555
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1556
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "하루 종일 약속(_P)"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1557
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1563
 msgid "New calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1564
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
@@ -5405,237 +5561,134 @@ msgstr "주별 보기"
 msgid "Month View"
 msgstr "월별 보기"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "모든 항목"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "첨부"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "참석자"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "업무"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "분류"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "등급"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "경쟁"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "비밀"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "설명"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "존재하지 않음"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "존재함"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "즐겨찾기"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "선물"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "목표"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "공휴일"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "명절 카드"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "최신 연락처"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "아이디어"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "국제 문제"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "주요 고객"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "기타"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "앞으로 7일"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "주최자"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "전화 걸기"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "개인"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:252
-#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "공개"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "반복"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "상태"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "전략"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "요약"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "요약에 포함"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "공급처"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "시간 및 비용"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "중요 인물"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "기다리기"
-
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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 "포함"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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 "포함하지 않음"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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 "같음"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "다름"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "달력을 여는 메소드를 지원하지 않습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "달력을 열 허가가 거부되었습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
@@ -5661,7 +5714,7 @@ msgstr "알림 추가"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
-msgstr "사용자 설정 메세지(_M)"
+msgstr "사용자 설정 메시지(_M)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
@@ -5669,20 +5722,20 @@ msgstr "사용자 설정 알림 소리"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
-msgstr "메세지(_S):"
+msgstr "메시지(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "사운드 재생"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "알림 팝업 창 표시"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "프로그램 실행"
 
@@ -5695,7 +5748,7 @@ msgid "Send To:"
 msgstr "보낼 사람:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
@@ -5759,29 +5812,56 @@ msgstr "동작/시작 옵션"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
-msgstr "더하기(_D)"
+msgstr "추가(_D)"
 
 # Alarm -> 알림, Microsoft Office XP 참고
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "알림"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 우선(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "없음"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "알림을 선택한 달력"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(일별 보기에 표시)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5795,58 +5875,58 @@ msgstr ""
 "10분\n"
 "05분"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u와 %d 기호는 전자메일 주소의 사용자와 도메인으로 바뀝니다.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">경고</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">기본 약속 있음/없음 서버</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">일반</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">작업 목록</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">시간</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">근무 주</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "일광 절약 시간 조정(_V)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "하루의 끝(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "표시"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "금요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5856,13 +5936,13 @@ msgstr ""
 "시간\n"
 "일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "월요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5880,251 +5960,269 @@ msgstr ""
 "토요일\n"
 "일요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "일(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "토요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "보조 시간대(_C):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "알림을 지정할 달력을 선택하십시오"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "약속(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "미리 알림 표시(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
-#: ../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:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "일별 보기 및 근무일 주별 보기에서 몇 번째 주인지 표시(_U)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "일요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "오늘 마감인 작업(_A):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "목(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "서식:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "목요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "시간대(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "시간 형식:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "화요일"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "수요일"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "시작 요일(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "근무 요일:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12시간 (오전/오후)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24시간"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "항목을 지울 때 확인 질문하기(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "한 달씩 볼 때 주말은 한 칸에 표시(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "하루의 시작(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "금(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "끝마친 작업이 다음 시간이 지나면 숨기기(_H):"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "월(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "마감이 지난 작업(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "토(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "한 주씩 보거나 한 달씩 볼 때 약속 끝나는 시간 표시(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "시간 간격(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "화(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "수(_W)"
 
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+# FIXME: bad msgid
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ", 매 기념일/생일 전에"
+
+# FIXME: bad msgid
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
-msgstr "전에 미리 알려주기"
+msgstr ", 매 약속 전에"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "오프라인 작업을 위해 달력 내용을 로컬에 복사(_Y)"
 
-#: ../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 "오프라인 작업을 위해 작업 목록 내용을 로컬에 복사(_Y)"
 
-#: ../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 "오프라인 작업을 위해 메모 목록 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "색(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "작업 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "메모 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "달력 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "작업 목록 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "새 작업 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "메모 목록 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "새 메모 목록"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
-msgstr "이 행사는 지워졌습니다."
+msgstr "이 행사는 삭제되었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
-msgstr "이 작업은 지워졌습니다."
+msgstr "이 작업은 삭제되었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
-msgstr "이 메모는 지워졌습니다."
+msgstr "이 메모는 삭제되었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 닫으시겠습니까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  바뀐 사항이 있습니다. 편집기를 닫으시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "이 행사는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "이 작업은 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "이 메모는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 업데이트하시겠습니"
 "까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
@@ -6135,361 +6233,366 @@ msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr "부터 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr " (완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (기한 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "첨부한 메시지 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "첨부한 메세지 %d개"
+msgstr[0] "첨부한 메시지 %d개"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "이동(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "드래그 취소(_D)"
 
-#: ../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:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "약속 편집"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "모임 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "약속 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "할당한 작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "메모 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "요약 없음"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr "본래 항목을 유지하시겠습니까?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "현재 창을 닫으려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
-msgstr "선택한 메세지를 클립보드로 복사합니다"
+msgstr "선택한 메시지를 클립보드로 복사합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "해당 도움말을 보려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "클립보드에서 텍스트를 붙여 넣습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "현재 창을 저장하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "모든 텍스트 선택"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../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:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "넣기(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "첨부(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "파일을 첨부하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "분류를 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "시간대(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "시간대 항목을 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "공개(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "공개로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "개인 정보(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "개인 정보로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "비밀(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "비밀로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "역할 항목(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "역할 항목을 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "응답바람(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "응답요청 항목을 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "상태 항목(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "상태 항목을 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "종류 항목(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "참석자 종류를 표시할 지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
-msgstr "최근 문서(_M)"
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+msgid "Recent _Documents"
+msgstr "최근 문서(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b>개 첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "첨부 모음 숨기기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "첨부 모음 보기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "지우기(_R)"
+msgstr "제거(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "첨부파일 추가(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "첨부 모음 보기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "스페이스를 눌러 첨부 모음을 토글하십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "받을 곳을 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "이 항목을 다른 수신자의 메일함에서도 지움(_D)"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "오류때문에 이 항목을 지울 수 없습니다"
 
@@ -6507,153 +6610,154 @@ msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "알림(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "이 행사에 알림을 설정하거나 해제하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "반복(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "반복 행사로 만듭니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "보내기 옵션"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "고급 보내기 옵션 넣기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "하루 종일 행사(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "하루 종일 행사가 있는 지 토글합니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "시간을 약속 있음으로 표시(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "시간을 약속 있음으로 표시할 지 토글합니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "약속 있음/없음(_F):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "약속(_M)"
 
-#: ../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:2725
 msgid "This event has alarms"
 msgstr "행사에 알림이 있습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "주최자(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "대리인(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "참석자(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "선택하신 주최자가 이제 계정이 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "추가(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' 달력을 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s 자격으로 작업합니다"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약속 %d일 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6661,34 +6765,16 @@ msgstr[0] "약속 %d시간 전에"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약속 %d분 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "사용자 지정"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "없음"
-
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../calendar/gui/dialogs/event-page.glade.h:1
@@ -6774,19 +6860,19 @@ msgstr "연락처(_N)..."
 msgid "Organizer:"
 msgstr "주최자:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "메모"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'의 메모를 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "받는 사람"
 
@@ -6800,60 +6886,64 @@ msgid "T_o:"
 msgstr "받는 사람(_O):"
 
 #: ../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 "그룹(_G):"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "반복 행사를 고치려고 합니다. 무엇을 고치시겠습니까?"
+msgstr "반복 행사를 수정하려고 합니다. 무엇을 수정하시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "반복 행사를 대리하려고 합니다. 무엇을 대리하시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "반복 작업을 고치려고 합니다. 무엇을 고치시겠습니까?"
+msgstr "반복 작업을 수정하려고 합니다. 무엇을 수정하시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "반복 메모를 고치려고 합니다. 무엇을 고치시겠습니까?"
+msgstr "반복 메모를 수정하려고 합니다. 무엇을 수정하시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "이 경우만"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "이 경우 및 지나간 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "이 경우 및 앞으로의 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 에볼루션에서 편집할 수 있는 반복이 들어 있습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "반복하는 날짜가 잘못되었습니다"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr "반복 끝나는 시각이 행사 시작보다 앞 시각입니다."
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "요일"
 
@@ -6861,7 +6951,7 @@ msgstr "요일"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "첫번째"
 
@@ -6870,15 +6960,15 @@ msgstr "첫번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
-msgstr "초"
+msgstr "두번째"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (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 "세번째"
 
@@ -6886,7 +6976,7 @@ msgstr "세번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "네번째"
 
@@ -6894,13 +6984,13 @@ msgstr "네번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "마지막"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "기타 날짜"
 
@@ -6908,7 +6998,7 @@ msgstr "기타 날짜"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1일부터 10일"
 
@@ -6916,7 +7006,7 @@ msgstr "1일부터 10일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11일부터 20일"
 
@@ -6924,14 +7014,14 @@ msgstr "11일부터 20일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21일부터 31일"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "일"
 
@@ -6940,33 +7030,33 @@ msgstr "일"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "기간:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "번"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "예외 추가"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "고칠 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
-msgstr "예외 바꾸기"
+msgstr "예외 수정"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "지울 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "날짜/시각"
 
@@ -7029,6 +7119,10 @@ msgstr "주"
 msgid "year(s)"
 msgstr "년"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "이 이벤트에 내 알림 보내기"
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -7049,55 +7143,55 @@ msgstr "<span weight=\"bold\">상태</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "완료됨"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "높음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "진행중"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "낮음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "보통"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -7110,7 +7204,7 @@ msgid "Stat_us:"
 msgstr "상태(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "정의안됨"
 
@@ -7136,28 +7230,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "누르면 작업의 자세한 상태 정보를 바꾸거나 봅니다"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "보내기 옵션(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "작업 자세히"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "주최자(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'의 작업을 열 수 없습니다."
@@ -7179,68 +7273,68 @@ msgid "Time zone:"
 msgstr "시간대:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d일"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d주"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "알 수 없는 동작 수행"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s 약속 시작 전"
 
 #. 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 약속 시작 후"
 
 #. 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"
 
 #. 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 약속 끝나기 전"
 
 #. 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 약속 끝난 후"
 
 #. 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"
 
 #. 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 (%s)"
@@ -7248,61 +7342,61 @@ msgstr "%s (%s)"
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
 #. 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"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URL을 열려면 누르십시오"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "시작 날짜:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "설명:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "요약:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "마감 날짜:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "상태:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "우선 순위:"
 
@@ -7316,17 +7410,17 @@ msgid "Start Date"
 msgstr "시작 날짜"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "약속 없음"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "약속 있음"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7336,225 +7430,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "예"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "반복됨"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "선택한 첨부를 저장할 폴더 선택..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "이름없는_그림.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
-msgstr "선택한 것 저장(_S)"
+msgstr "선택한 사항 저장(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* 요약 없음 *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "주최자: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "주최자: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "시작: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "기한: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
-msgstr "선택한 오브젝트를 지우는 중입니다"
+msgstr "선택한 오브젝트를 삭제하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "인쇄(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
-msgstr "붙여 넣기(_P)"
+msgstr "붙여넣기(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "선택한 작업을 마치지 못한 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
-msgstr "선택한 작업 지우기(_D)"
+msgstr "선택한 작업 삭제(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업을 추가하려면 누르십시오"
@@ -7577,8 +7671,8 @@ msgid "Due date"
 msgstr "마감 날짜"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "우선순위"
 
@@ -7586,109 +7680,154 @@ msgstr "우선순위"
 msgid "Start date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "상태"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "항목을 옮기는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "항목을 복사하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "새 모임(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "현재 뷰(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "오늘 선택(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "인쇄(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "회신(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우 옮길 수 있게 만들기(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
-msgstr "이 경우 지우기(_O)"
+msgstr "이 경우 삭제(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
-msgstr "모든 경우 지우기(_A)"
+msgstr "모든 경우 삭제(_A)"
+
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "수락"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "거부"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "잠정적"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "대리"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "동작 필요"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "시간: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:115
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:126
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7701,137 +7840,147 @@ 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:587
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "보조 시간대 표시"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%B %e일 %A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "오후"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "%d주"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "예. (복잡한 반복)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "%d일마다"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] "%d주일마다"
+msgstr[0] "%d주마다"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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 "
-msgstr[0] "%d주일마다 "
+msgstr[0] "%d주마다 "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. 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 " 그리고 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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"
 msgstr[0] "%d달마다"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "%d년마다"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] " 전체 %d번"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", 끝: "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "시작"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "끝"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "기한"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7839,297 +7988,287 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "수락"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "거부"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "모임이 취소되었지만, 이 모임이 달력에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "작업이 취소되었지만, 이 작업이 작업 목록에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 모임 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>님이 모임에 %s님의 참석을 요청했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>님이 모임에 참석하시기를 요청했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>님이 기존 모임에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 모임 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 모임 요청에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>님이 모임을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "모임 취소"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
+msgstr "<b>%s</b>님이 이해하기 어려운 메시지를 보냈습니다."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
-msgstr "잘못된 모임 메세지"
+msgstr "잘못된 모임 메시지"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>님이 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "작업 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "작업 취소"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
-msgstr "잘못된 작업 메세지"
+msgstr "잘못된 작업 메시지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 게시했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../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>이(가) 약속 있음/없음 정보를 요청했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../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>이(가) 약속 있음/없음 요청에 회신했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
-msgstr "틀린 약속 있음/없음 메세지"
+msgstr "틀린 약속 있음/없음 메시지"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
-msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
+msgstr "메시지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
-msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
+msgstr "이 메시지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
-msgstr "첨부에 올바른 달력 메세지가 없습니다"
+msgstr "첨부에 올바른 달력 메시지가 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "응답바람"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "업데이트"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "수락"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
 
@@ -8141,7 +8280,7 @@ msgstr "-"
 
 #: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
-msgstr "달력 메세지"
+msgstr "달력 메시지"
 
 #: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
@@ -8157,114 +8296,95 @@ msgstr "달력 불러오기..."
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
-msgstr "서버 메세지:"
+msgstr "서버 메시지:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "개인"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "그룹"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "방"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "불참자"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "잠정적"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "대리"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "참석자"
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "응답바람"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "진행중"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%Y년 %B %e일 %A"
 
@@ -8272,80 +8392,80 @@ msgstr "%Y년 %B %e일 %A"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:476
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:480
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "부재 중"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "정보 없음"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "참석자(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "옵션(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "근무 시간만 보기(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "축소해서 보기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
@@ -8373,16 +8493,15 @@ msgstr "언어"
 msgid "Member"
 msgstr "구성원"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
-msgstr "선택한 메모 지우기(_D)"
+msgstr "선택한 메모 삭제(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "메모를 추가하려면 누르십시오"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8391,80 +8510,80 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s에 있는 메모를 여는 중입니다"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
-msgstr "선택한 오브젝트를 지웁니다..."
+msgstr "선택한 오브젝트를 삭제합니다..."
 
 #: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
-msgstr "지운 메세지 비우는 중"
+msgstr "지운 메시지 비우는 중"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "시간대를 선택하십시오"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%B %e일"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "사용자 설정 보기(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "사용자 설정 보기 저장(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "보기 지정(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s에서 메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -8524,145 +8643,200 @@ msgstr "9월"
 msgid "_Select Today"
 msgstr "오늘 선택(_S)"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "주최자를 결정해야 합니다."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "참석자가 최소한 한 사람은 필요합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "행사 정보"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "메모 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "약속 있음/없음 정보"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "달력 정보"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "수락"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "잠정적으로 수락"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "거절"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "대리"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "취소"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
 msgid "Refresh"
-msgstr "새로 고침"
+msgstr "새로운 사항"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
 msgid "Counter-proposal"
-msgstr "반대-제안"
+msgstr "반대제안"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "약속 있음/없음 정보 (%s부터 %s까지)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iCalendar 정보"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "이 행사의 참석자여야 합니다."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "새 메모 목록(_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d개 선택"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "메모를 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:882
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 메모 목록을 열 수 없습니다"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:895
 msgid "There is no calendar available for creating memos"
 msgstr "메모를 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1005
 msgid "Memo Source Selector"
 msgstr "메모 소스 선택"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1184
 msgid "New memo"
 msgstr "새 메모"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1185
 msgctxt "New"
 msgid "Mem_o"
 msgstr "메모(_O)"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1186
 msgid "Create a new memo"
 msgstr "새 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1192
 msgid "New shared memo"
 msgstr "새 공유 메모"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1193
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "공유 메모(_S)"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1194
 msgid "Create a shared new memo"
 msgstr "새 공유 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1200
 msgid "New memo list"
 msgstr "새 메모 목록"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1201
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "메모 목록(_S)"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1202
 msgid "Create a new memo list"
 msgstr "새 메모 목록을 만듭니다"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "메모 인쇄"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "앞으로 7일"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8710,273 +8884,273 @@ msgstr "`%s' 작업을 옮겨 올 수 없습니다"
 msgid "Notes"
 msgstr "쪽지"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1일"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2일"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3일"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4일"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5일"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6일"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7일"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8일"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9일"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10일"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11일"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12일"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13일"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14일"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15일"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16일"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17일"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18일"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19일"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20일"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21일"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22일"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23일"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24일"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25일"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26일"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27일"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28일"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29일"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30일"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31일"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "일"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "월"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "화"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "수"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "목"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "금"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "토"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "약속"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "작업"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "요약: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "참석자: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "연락처:"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "새 작업 목록(_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "작업을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:870
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 작업 목록을 열 수 없습니다"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:883
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:994
 msgid "Task Source Selector"
 msgstr "작업 소스 선택"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1248
 msgid "New task"
 msgstr "새 작업"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1249
 msgctxt "New"
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1250
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1256
 msgid "New assigned task"
 msgstr "새로 할당한 작업"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1257
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Create a new assigned task"
 msgstr "새로 할당한 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1264
 msgid "New task list"
 msgstr "새 작업 목록"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1265
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "작업 목록(_K)"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8988,11 +9162,11 @@ msgstr ""
 "\n"
 "정말로 이 작업들을 지우시겠습니까?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
@@ -9001,61 +9175,61 @@ msgstr "작업 인쇄"
 msgid "% Completed"
 msgstr "% 완료"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "취소함"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "진행 중"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../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 "보다 큼"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "보다 적음"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "약속 및 모임"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "달력을 여는 중입니다"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 파일 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "에볼루션 iCalendar 가져오기"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "미리 알림!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 파일 (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "에볼루션 vCalendar 가져오기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "달력 행사"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "에볼루션 달력 똑똑한 가져오기"
 
@@ -10610,251 +10784,255 @@ msgstr "태평양/월리스"
 msgid "Pacific/Yap"
 msgstr "태평양/얍"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "자동 저장 파일을 열 수 없습니다"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
+msgstr "편집기에서 메시지를 가져올 수 없습니다"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "첨부 넣기"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "첨부(_T)"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
-msgstr "제목 없는 메세지"
+msgstr "제목 없는 메시지"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "파일을 첨부합니다"
 
-#: ../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 "닫기(_C)"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "현재 파일을 닫습니다"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "인쇄 미리 보기(_V)"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "현재 파일을 저장합니다"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "다른 이름으로 저장(_A)..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "현재 파일을 다른 이름으로 저장합니다"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
 msgstr "임시 보관함에 저장(_D)"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "임시 보관함에 저장"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "보내기(_E)"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
-msgstr "이 메세지를 지금 보냅니다"
+msgstr "이 메시지를 지금 보냅니다"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "보내기 옵션 넣기"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
-msgstr "새 메세지(_M)"
+msgstr "새 메시지(_M)"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
-msgstr "새 메세지 창을 엽니다"
+msgstr "새 메시지 창을 엽니다"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "문자 인코딩(_E)"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "보안(_S)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP 암호화(_E)"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
-msgstr "이 메세지를 PGP로 암호화합니다"
+msgstr "이 메시지를 PGP로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP 서명(_S)"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
-msgstr "이 메세지를 PGP키로 서명합니다"
+msgstr "이 메시지를 PGP키로 서명합니다"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
-msgstr "메세지 우선순위 높이기(_P)"
+msgstr "메시지 우선순위 높이기(_P)"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
-msgstr "메세지 우선순위를 높입니다"
+msgstr "메시지 우선순위를 높입니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "내용 읽음 확인 요청(_Q)"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
-msgstr "메세지를 읽으면 배달 확인 받기"
+msgstr "메시지를 읽으면 배달 확인 받기"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 암호화(_C)"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
+msgstr "이 메시지를 S/MIME 암호화 인증서로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 서명(_N)"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "이 메세지를 S/MIME 서명 증명으로 서명합니다"
+msgstr "이 메시지를 S/MIME 서명 증명으로 서명합니다"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "숨은 참조 항목(_B)"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "숨은 참조 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "참조 항목(_C)"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "참조 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "발신 항목(_F)"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "발신 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "올리는 곳 항목(_P)"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "올리는 곳 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "회신 주소 항목(_R)"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "회신 주소 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "제목 항목(_S)"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "제목 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "받는 사람 항목(_T)"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "받는 사람 항목을 표시할 지 토글합니다"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "임시 저장"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
-msgstr "메세지를 받을 사람을 입력하십시오"
+msgstr "메시지를 받을 사람을 입력하십시오"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "메세지의 사본을 받을 사람의 주소를 입력하십시오"
+msgstr "메시지의 사본을 받을 사람의 주소를 입력하십시오"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"메세지의 받는 사람 목록에 나타나지 않고 참조 메세지를 받을 주소를 입력하십시"
+"메시지의 받는 사람 목록에 나타나지 않고 참조 메시지를 받을 주소를 입력하십시"
 "오."
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "보낸 사람(_O):"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "회신 주소(_R):"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "받는 사람(_T):"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "참조(_C):"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "숨은 참조(_B):"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "게시 위치(_P):"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "제목(_U):"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "서명(_G):"
 
@@ -10870,56 +11048,52 @@ msgstr "게시물 수신자"
 # post -> 게시, Microsoft Office XP 참고
 #: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
-msgstr "메세지를 올릴 폴더를 선택하십시오."
+msgstr "메시지를 올릴 폴더를 선택하십시오."
 
 #: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "최근 문서(_D)"
-
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "첨부 모음 보기(_A)"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"보내는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
+"보내는 메시지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
+"보내는 메시지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "첨부"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "첨부 모음 숨기기(_A)"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
-msgstr "메세지를 작성합니다"
+msgstr "메시지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
 msgstr ""
-"<b>(메일 작성에 텍스트가 아닌 메세지 본문이 들어 있습니다. 이 메세지 본문은 "
+"<b>(메일 작성에 텍스트가 아닌 메시지 본문이 들어 있습니다. 이 메시지 본문은 "
 "편집할 수 없습니다.)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
@@ -10938,7 +11112,7 @@ msgstr "모든 계정을 지웠습니다."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "정말로 제목이 '{0}'인, 작성중이었던 메세지를 버리시겠습니까?"
+msgstr "정말로 제목이 '{0}'인, 작성중이었던 메시지를 버리시겠습니까?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -10954,8 +11128,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"편지 작성 창을 닫으면 메세지를 영영 잃어버리게 됩니다. 잃어버리지 않으려면 메"
-"세지를 임시 보관함 폴더에 저장하도록 해야 합니다. 그래야 나중에 그 메세지를 "
+"편지 작성 창을 닫으면 메시지를 영영 잃어버리게 됩니다. 잃어버리지 않으려면 메"
+"세지를 임시 보관함 폴더에 저장하도록 해야 합니다. 그래야 나중에 그 메시지를 "
 "계속 작성할 수 있습니다."
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -10964,7 +11138,7 @@ msgstr "메일 작성 창을 만들 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "메세지를 만들 수 없습니다."
+msgstr "메시지를 만들 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
@@ -10972,7 +11146,7 @@ msgstr "&quot;{0}&quot; 서명 파일을 읽을 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "{0}에서 첨부할 메세지를 가져올 수 없습니다."
+msgstr "{0}에서 첨부할 메시지를 가져올 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
@@ -10980,11 +11154,11 @@ msgstr "&quot;{0}&quot; 자동 저장 파일을 저장할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr "디렉토리는 메세지에 첨부할 수 없습니다."
+msgstr "디렉터리는 메시지에 첨부할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
-msgstr "작성하다 만 메세지를 복구하시겠습니까?"
+msgstr "작성하다 만 메시지를 복구하시겠습니까?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
@@ -11000,16 +11174,14 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"새 메세지를 작성하는 도중에 에볼루션이 갑자기 끝났습니다. 메세지를 복구하면 "
+"새 메시지를 작성하는 도중에 에볼루션이 갑자기 끝났습니다. 메시지를 복구하면 "
 "저번에 작성한 데서부터 계속 작성할 수 있습니다."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
-msgstr ""
-"노벨 그룹와이즈 및 마이크로소프트 익스체인지에서만 사용할 수 있는 보내기 옵션"
-"입니다."
+msgstr "노벨 그룹와이즈 및 마이크로소프트 익스체인지에서만 사용할 수 있는 보내기 옵션입니다."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11017,15 +11189,15 @@ msgstr "보내기 옵션을 사용할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "`{0}' 파일은 일반 파일이 아니므로 메세지에 첨부할 수 없습니다."
+msgstr "`{0}' 파일은 일반 파일이 아니므로 메시지에 첨부할 수 없습니다."
 
 #: ../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 ""
-"디렉토리의 내용을 첨부하려면, 디렉토리에 들어 있는 파일들을 하나하나 첨부하거"
-"나 디렉토리의 아카이브 파일을 만들어서 첨부하십시오."
+"디렉터리의 내용을 첨부하려면, 디렉터리에 들어 있는 파일들을 하나하나 첨부하거"
+"나 디렉터리의 아카이브 파일을 만들어서 첨부하십시오."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
@@ -11044,15 +11216,15 @@ msgstr "주소 선택 컨트롤을 활성화할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
-msgstr "작성하다 만 메세지가 있습니다"
+msgstr "작성하다 만 메시지가 있습니다"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
-msgstr "경고: 바뀐 메세지"
+msgstr "경고: 바뀐 메시지"
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "`{0}' 파일을 이 메세지에 첨부할 수 없습니다."
+msgstr "`{0}' 파일을 이 메시지에 첨부할 수 없습니다."
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
@@ -11078,7 +11250,7 @@ msgstr "임시 저장(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "에볼루션 메일 및 달력"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "그룹웨어 모음"
 
@@ -11094,40 +11266,97 @@ msgstr "주소 카드"
 msgid "calendar information"
 msgstr "달력 정보"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "에볼루션 오류"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "에볼루션 경고"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "에볼루션 정보"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "에볼루션 물음"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "내부 오류, 알 수 없는 '%s' 오류가 발생했습니다"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "컴포넌트"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "기록 중인 컴포넌트의 이름"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "디버깅 기록"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "상태 표시줄에서 오류 표시 시간(_E):"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "초."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "기록 메시지:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "기록 단계"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "시간"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "메시지"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "이 창을 닫습니다"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "오류"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "오류"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "경고 및 오류"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "디버깅"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "오류, 경고 및 디버깅 메시지"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "사용"
 
@@ -11176,164 +11405,168 @@ msgstr "파일을 덮어쓰시겠습니까?"
 msgid "_Overwrite"
 msgstr "덮어 쓰기(_O)"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "링크를 열 수 없습니다."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "에볼루션 도움말을 표시할 수 없습니다."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "중요(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "업무(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "개인(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "할 일(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "나중에(_L)"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "레이블 이름(_N):"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "레이블 편집"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "레이블 추가"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "레이블 이름이 빈 문자열이면 안 됩니다."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "같은 태그의 레이블이 이미 서버에 있습니다. 레이블 이름을 바꾸십시오."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf 오류: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
-msgstr "나머지 오류 메세지는 터미널에서만 표시합니다."
+msgstr "나머지 오류 메시지는 터미널에서만 표시합니다."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d초 전"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "앞으로 %d초"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "앞으로 %d분"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "앞으로 %d시간"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d일 전"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "앞으로 %d일"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d주 전"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "앞으로 %d주"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "앞으로 %d달"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d년 전"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "앞으로 %d년"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<날짜를 선택하려면 여기를 누르십시오>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "현재"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "비교할 시각을 선택하십시오"
 
@@ -11346,56 +11579,56 @@ msgstr "파일을 선택하십시오"
 msgid "Test"
 msgstr "테스트"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "규칙 이름(_U):"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
-msgstr "다음 조건이 만족한 항목을 찾습니다"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
+msgstr "다음 조건이 만족하는 항목을 찾습니다"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "필터 조건 추가(_D)"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "조건 추가(_D)"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
-msgstr "모든 조건이 다 충족될 때"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
+msgstr "모든 조건이 다 충족되면"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
-msgstr "어떤 조건이라도 충족될 때"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
+msgstr "어떤 조건이라도 충족되면"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "항목 찾기(_F):"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "관계된 모두"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "답장"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "답장 및 그 상위 메일"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "답장 없거나 상위 메일 없음"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "글타래 포함(_N)"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "받는 메일"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "보내는 메일"
 
@@ -11461,7 +11694,7 @@ msgid ""
 "12:00am of the date specified."
 msgstr ""
 "지정한 날짜의 오전 12:00를 기준으로\n"
-"메세지 시각을 비교합니다."
+"메시지 시각을 비교합니다."
 
 #: ../filter/filter.glade.h:7
 msgid ""
@@ -11469,7 +11702,7 @@ msgid ""
 "a time relative to when filtering occurs."
 msgstr ""
 "필터링하는 시각까지 얼마나 지났나를 기준으로\n"
-"메세지 시각을 비교합니다."
+"메시지 시각을 비교합니다."
 
 #: ../filter/filter.glade.h:9
 msgid ""
@@ -11477,7 +11710,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 "필터링하는 현재 시각을 기준으로\n"
-"메세지 시각을 비교합니다."
+"메시지 시각을 비교합니다."
 
 #: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
@@ -11495,7 +11728,7 @@ msgstr "앞으로"
 msgid "months"
 msgstr "달"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "초"
 
@@ -11507,10 +11740,11 @@ msgstr "현재 시각"
 msgid "the time you specify"
 msgstr "지정하는 시각"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "주"
 
@@ -11518,15 +11752,15 @@ msgstr "주"
 msgid "years"
 msgstr "연도"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "규칙 추가"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "규칙 편집"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "규칙 이름"
 
@@ -11537,11 +11771,11 @@ msgstr "메일 작성 기본 설정"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
-msgstr "여기서 보안과 메세지 표시를 포함한, 메일 설정을 합니다"
+msgstr "여기서 보안과 메시지 표시를 포함한, 메일 설정을 합니다"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을 합니다"
+msgstr "여기서 맞춤법 검사, 서명, 그리고 메시지 작성 설정을 합니다"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11579,8 +11813,8 @@ msgstr "에볼루션 메일 기본 설정 컨트롤"
 msgid "Evolution Network configuration control"
 msgstr "에볼루션 네트워크 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
 #: ../mail/mail-component.c:597 ../mail/mail-component.c:598
 #: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
@@ -11593,7 +11827,7 @@ msgid "Mail Accounts"
 msgstr "메일 계정"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
@@ -11605,12 +11839,12 @@ msgstr "네트워크 기본 설정"
 msgid "_Mail"
 msgstr "메일(_M)"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 사용 약관"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11622,65 +11856,65 @@ msgstr ""
 "아래에 있는 %s의 사용 약관을 잘 읽어 보시고\n"
 "동의하실 경우 체크 단추에 체크하십시오.\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
-msgstr "메세지마다 물어보기"
+msgstr "메시지마다 물어보기"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "신상 정보"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "메일 받기"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "새 메일 확인(_N), 매"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "분(_T)"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "메일 보내기"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "기본값"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "새 메일 확인"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "에볼루션 계정 도우미"
 
@@ -11698,19 +11932,19 @@ msgid "Protocol"
 msgstr "프로토콜"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "이름없음"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "언어"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "서명 스크립트 추가"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "서명"
 
@@ -11719,23 +11953,30 @@ msgstr "서명"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "대상 주소를 입력하지 않았으므로 메시지 전달을 취소합니다."
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "사용할 계정이 없으므로 메시지 전달을 취소합니다."
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
-msgstr "알 수 없는 보낸 이"
+msgstr "알 수 없는 보낸 사람"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"${Year}-${Month}-${Day} (${AbbrevWeekdayName}), ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} 쓰시길:"
+msgstr "${Year}-${Month}-${Day} (${AbbrevWeekdayName}), ${24Hour}:${Minute} ${TimeZone}, ${Sender}:"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
@@ -11786,16 +12027,16 @@ msgid "Date sent"
 msgstr "보낸 날짜"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
-msgstr "지우기"
+msgstr "삭제"
 
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
-msgstr "지워짐"
+msgstr "삭제함"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:17
@@ -11878,7 +12119,7 @@ msgstr "설정 아님"
 msgid "is set"
 msgstr "설정"
 
-#: ../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 "정크메일"
@@ -11887,7 +12128,7 @@ msgstr "정크메일"
 msgid "Junk Test"
 msgstr "정크메일 테스트"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "레이블"
 
@@ -11901,19 +12142,19 @@ msgstr "모두"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
-msgstr "메세지 본문"
+msgstr "메시지 본문"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
-msgstr "메세지 머리말"
+msgstr "메시지 머리말"
 
 #: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
-msgstr "메세지가 정크메일"
+msgstr "메시지가 정크메일"
 
 #: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
-msgstr "메세지가 정크메일 아님"
+msgstr "메시지가 정크메일 아님"
 
 #: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
@@ -11927,51 +12168,54 @@ msgstr "프로그램에 파이프 입력"
 msgid "Play Sound"
 msgstr "사운드 재생"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "읽음"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "받는 사람"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "정규식"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "회신"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "리턴"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "더 큰 값 리턴"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "더 작은 값 리턴"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "프로그램 실행"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "점수"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "보낸 사람"
 
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "보낸 사람 혹은 받는 사람"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "레이블 설정"
@@ -12008,9 +12252,9 @@ msgstr "처리 중지"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "제목"
 
@@ -12027,51 +12271,51 @@ msgstr "그러면"
 msgid "Add Ac_tion"
 msgstr "동작 추가(_T)"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "찾은 결과로 찾기 폴더 만들기(_R)..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
-msgstr "모든 메세지"
+msgstr "모든 메시지"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
-msgstr "읽지 않은 메세지"
+msgstr "읽지 않은 메시지"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "레이블 없음"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
-msgstr "읽은 메세지"
+msgstr "읽은 메시지"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
-msgstr "최근 메세지"
+msgstr "최근 메시지"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
-msgstr "최근 5일간 메세지"
+msgstr "최근 5일간 메시지"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
-msgstr "첨부가 있는 메세지"
+msgstr "첨부가 있는 메시지"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
-msgstr "중요한 메세지"
+msgstr "중요한 메시지"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
-msgstr "정크메일 아닌 메세지"
+msgstr "정크메일 아닌 메시지"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "계정 찾기"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "모든 계정 찾기"
 
@@ -12079,14 +12323,14 @@ msgstr "모든 계정 찾기"
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "읽지 않은 메세지:"
+msgstr[0] "읽지 않은 메시지:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "전체 메세지:"
+msgstr[0] "전체 메시지:"
 
 #: ../mail/em-folder-properties.c:196
 #, c-format
@@ -12099,15 +12343,15 @@ msgid "Quota usage"
 msgstr "용량 제한 사용량"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "폴더 속성"
@@ -12124,9 +12368,9 @@ msgstr "만들기(_R)"
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "찾기 폴더"
 
@@ -12136,19 +12380,24 @@ msgstr "찾기 폴더"
 msgid "UNMATCHED"
 msgstr "해당 없음"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "서식"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "보낼 편지함"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
@@ -12187,19 +12436,19 @@ msgstr "%s 폴더를 옮기는 중"
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
 #: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
+msgstr "메시지를 맨 위의 저장고에 넣을 수 없습니다"
 
 #: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
@@ -12209,456 +12458,456 @@ msgstr "폴더로 복사(_C)"
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "이동(_M)..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "이름 바꾸기(_R)..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "새로 고침(_F)"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "보낼 편지함 비우기(_U)"
 
-#: ../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 "휴지통 비우기(_E)"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "읽지 않은 찾기 폴더(_U)"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'에서 `%s' 폴더로 복사하는 중"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "복사(_O)"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' 폴더를 만드는 중입니다"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "폴더를 만듭니다"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
-#: ../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 "메일 지우기가 실패했습니다"
+msgstr "메일 삭제가 실패했습니다"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "이 메일을 지울 권한이 없습니다."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
-#: ../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 "전달(_F)"
 
 #. 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 "새 메세지로 편집(_E)..."
+msgstr "새 메시지로 편집(_E)..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "되살리기(_N)"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "중요하지 않은 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "레이블(_L)"
 
 #. 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 "없음(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "새 레이블(_N)"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
-msgstr "표시 비우기(_E)"
+msgstr "표시 지우기(_E)"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 규칙 만들기(_T)"
 
 #. 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 "제목에 따른 찾기 폴더(_S)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "보낸 사람에 따른 찾기 폴더(_N)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
-msgstr "받은 사람에 따른 찾기 폴더(_R)"
+msgstr "받는 사람에 따른 찾기 폴더(_R)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "메일링 리스트에 대한 찾기 폴더(_L)"
 
 #. 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 "제목에 대한 필터(_J)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "보낸 사람에 대한 필터(_D)"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
-msgstr "받은 사람에 대한 필터(_C)"
+msgstr "받는 사람에 대한 필터(_C)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "메일링 리스트에 대한 필터(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "기본값"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
-msgstr "메세지를 가져올 수 없습니다"
+msgstr "메시지를 가져올 수 없습니다"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
-msgstr "메세지를 가져오는 중..."
+msgstr "메시지를 가져오는 중..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "호출하기(_A)..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "찾기 폴더 만들기(_S)"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "이 주소에서(_F)"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "이 주소로(_T)"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s 주소로 보내려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "%s에게 호출하려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "주소를 감추려면/보이려면 누르십시오"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "일치: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "대소문자 구별(_A)"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "서명 없음"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
+"이 메시지에는 서명이 없습니다.  메시지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "올바른 서명"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
-"이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
+"이 메시지는 서명되었고 서명이 올바릅니다.  메시지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "잘못된 서명"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
-"이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
+"이 메시지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "올바른 서명이지만, 보낸 사람을 확인할 수 없습니다"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
+"이 메시지는 올바른 서명으로 사인되었습니다. 하지만 메시지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "서명이 있지만, 공개키가 필요합니다"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
-msgstr "이 메세지는 서명되어 있지만, 서명에 해당하는 공개 키가 없습니다."
+msgstr "이 메시지는 서명되어 있지만, 서명에 해당하는 공개 키가 없습니다."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "암호화 안 됨"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
-"이 메세지는 암호화하지 않았습니다.  인터넷을 통해 전달되는 동안 다른 사람이 "
-"이 메세지를 봤을 수 있습니다."
+"이 메시지는 암호화하지 않았습니다.  인터넷을 통해 전달되는 동안 다른 사람이 "
+"이 메시지를 봤을 수 있습니다."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "암호화됨, 약함"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  다른 "
-"사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
+"메시지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  다른 "
+"사람이 이 메시지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "암호화됨"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
-"메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
+"메시지가 암호화되어 있습니다.  다른 사람이 이 메시지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "암호화됨, 강력"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
-"적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
+"메시지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
+"적인 시간 내에 다른 사람이 이 메시지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %B %e일, %p %l:%M"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y년 %B %e일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "인라인으로 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "너비에 맞추기(_F)"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "원래 크기로 표시(_O)"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "다른 이름으로 첨부 문서 저장"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "모든 첨부를 저장할 폴더 선택..."
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
-msgstr "선택한 것 저장(_S)..."
+msgstr "선택한 사항 저장(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d개 첨부(_T)"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "저장(_A)"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "모두 저장(_A)"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "첨부 없음"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "원본 보기(_U)"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "원본 감추기(_U)"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "다른 프로그램으로 열기(_P)"
 
-#: ../mail/em-format-html-display.c:2473
+#: ../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."
@@ -12711,11 +12960,11 @@ msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
 
 #: ../mail/em-format-html.c:1236
 msgid "Formatting message"
-msgstr "메세지 내용을 표시하는 중입니다"
+msgstr "메시지 내용을 표시하는 중입니다"
 
 #: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
-msgstr "메세지 내용을 표시하는 중입니다..."
+msgstr "메시지 내용을 표시하는 중입니다..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
 #: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
@@ -12731,7 +12980,7 @@ msgstr "숨은 참조"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "메일 프로그램"
 
@@ -12748,14 +12997,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "이 메세지는 <b>%s</b>이(가) <b>%s</b> 자격으로 보냈습니다."
+msgstr "이 메시지는 <b>%s</b>이(가) <b>%s</b> 자격으로 보냈습니다."
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "보낸 사람"
 
@@ -12765,8 +13014,8 @@ msgid "Reply-To"
 msgstr "회신 주소"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "날짜"
 
@@ -12774,105 +13023,110 @@ msgstr "날짜"
 msgid "Newsgroups"
 msgstr "뉴스그룹"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "얼굴"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+msgstr "S/MIME 메시지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
+msgstr "MIME 메시지를 분석할 수 없습니다. 소스로 보여줍니다."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
-msgstr "PGP/MIME 메세지를 분석할 수 없습니다"
+msgstr "PGP/MIME 메시지를 분석할 수 없습니다"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "PGP/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+msgstr "PGP/MIME 메시지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "서명을 확인하는 중 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
-msgstr "PGP 메세지를 분석할 수 없습니다."
+msgstr "PGP 메시지를 분석할 수 없습니다."
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+msgstr "PGP 메시지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "항상"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "매일"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "매주"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "매달"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "사용자 정의 정크 메일 헤더 추가"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "헤더 이름:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "헤더 값에 포함:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "값 포함"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "색"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "태그"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s 플러그인을 사용할 수 있고 프로그램 바이너리가 설치되어 있습니다."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 플러그인을 사용할 수 없습니다. 패키지를 설치했는지 확인하십시오."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "정크 메일 플러그인을 사용할 수 없습니다"
 
@@ -12921,7 +13175,7 @@ msgstr "과거의 POP keep-on-server 데이터 `%s'을(를) 열 수 없습니다
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
-"POP keep-on-server 데이터 디렉토리 `%s' 디렉토리를 만들 수 없습니다: %s"
+"POP keep-on-server 데이터 디렉터리 `%s' 디렉터리를 만들 수 없습니다: %s"
 
 #: ../mail/em-migrate.c:2112
 #, c-format
@@ -12933,24 +13187,23 @@ msgstr "POP3 keep-on-server 데이터 `%s'을(를) 복사할 수 없습니다: %
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "`%s' 로컬 메일 저장고를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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 ""
-"에볼루션 메일함 폴더의 형식이 에볼루션 버전 2.24 이후 sqlite로 바뀌었습니"
-"다.\n"
+"에볼루션 메일함 폴더의 요약문 형식이 에볼루션 버전 2.24 이후 sqlite로 바뀌었습니다.\n"
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s'에 로컬 메일 폴더를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12958,67 +13211,67 @@ msgstr ""
 "이전에 설치한 에볼루션에서 설정을 잃어들일 수 없습니다. `evolution/config."
 "xmldb'가 없거나 망가졌습니다."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: ../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 "리스트에 회신(_L)"
 
 #. 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 "주소록에 추가(_A)"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "구독"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "서버를 선택하지 않았습니다"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
-msgstr "이 메세지를 다시 보지 않기(_D)."
+msgstr "이 메시지를 다시 보지 않기(_D)."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
-msgstr "메세지 필터"
+msgstr "메시지 필터"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
-msgstr "메세지"
+msgstr "메시지"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
-msgstr "메세지 저장..."
+msgstr "메시지 저장..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "주소 추가"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -13044,7 +13297,7 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"메일 보내고 받기\" 창 너비"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "에볼루션에서 최대 크기만큼의 텍스트 일부분만 표시하도록 합니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
@@ -13052,10 +13305,6 @@ msgstr "에볼루션에서 최대 크기만큼의 텍스트 일부분만 표시�
 msgid "Always request read receipt"
 msgstr "항상 내용 읽음 확인 요청"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "오류를 상태 표시줄에 표시할 시간, 초 단위."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "이모티콘 자동 인식"
@@ -13078,15 +13327,15 @@ msgstr "인용문 강조 색."
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
-msgstr "메세지 작성 창 기본 높이"
+msgstr "메시지 작성 창 기본 높이"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
-msgstr "메세지 작성 창 기본 너비"
+msgstr "메시지 작성 창 기본 너비"
 
 #: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
-msgstr "메세지 작성 읽어들이기/첨부 디렉토리"
+msgstr "메시지 작성 읽어들이기/첨부 디렉터리"
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
@@ -13104,7 +13353,9 @@ msgstr ""
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
-msgstr "얼마나 자주 로컬의 변경 사항을 원격 메일 서버와 동기화할 지 정합니다. 이 간격은 최소한 30초 이상 되어야 합니다."
+msgstr ""
+"얼마나 자주 로컬의 변경 사항을 원격 메일 서버와 동기화할 지 정합니다. 이 간격"
+"은 최소한 30초 이상 되어야 합니다."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
@@ -13120,19 +13371,19 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
-msgstr "메세지를 작성할 기본 문자셋"
+msgstr "메시지를 작성할 기본 문자셋"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
-msgstr "메세지를 작성할 기본 문자셋."
+msgstr "메시지를 작성할 기본 문자셋."
 
 #: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
-msgstr "메세지를 표시할 기본 문자셋"
+msgstr "메시지를 표시할 기본 문자셋"
 
 #: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
-msgstr "메세지를 표시할 기본 문자셋."
+msgstr "메시지를 표시할 기본 문자셋."
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
@@ -13140,11 +13391,11 @@ msgstr "기본 전달 모양새"
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
-msgstr "메세지 작성 창의 기본 높이."
+msgstr "메시지 작성 창의 기본 높이."
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
-msgstr "메세지 창의 기본 높이."
+msgstr "메시지 창의 기본 높이."
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
@@ -13160,11 +13411,11 @@ msgstr "글타래 확장 상태에 대한 기본값"
 
 #: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
-msgstr "메세지 작성 창의 기본 너비."
+msgstr "메시지 작성 창의 기본 너비."
 
 #: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
-msgstr "메세지 창의 기본 너비."
+msgstr "메시지 창의 기본 너비."
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
@@ -13209,20 +13460,20 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"세로 보기의 \"메세지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
+"세로 보기의 \"메시지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할 지 결정합니다."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
-msgstr "메세지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉토리."
+msgstr "메시지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉터리."
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
-msgstr "메일 관련 파일을 저장할 디렉토리."
+msgstr "메일 관련 파일을 저장할 디렉터리."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "가장자리 창의 폴더 이름 줄여 쓰기 사용을 막을 지 여부"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13279,7 +13530,7 @@ msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
-"이 기능을 사용하면 스페이스바 키를 이용해 메세지 미리 보기, 메세지 목록, 폴더"
+"이 기능을 사용하면 스페이스바 키를 이용해 메시지 미리 보기, 메시지 목록, 폴더"
 "를 스크롤합니다."
 
 #: ../mail/evolution-mail.schemas.in.h:54
@@ -13290,25 +13541,36 @@ msgstr "제한된 크기만큼의 일부 텍스트를 표시하도록 합니다.
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Height of the message-list pane"
-msgstr "메세지 목록 창의 높이"
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "파일 이름을 아웃룩/구글 메일 방식으로 인코딩"
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Height of the message-list pane."
-msgstr "메세지 목록 창의 높이."
+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 "메일 헤더의 파일 이름을 아웃룩이나 구글 메일과 같은 방식으로 인코딩합니다. 그래야 에볼루션에서 보낸 다국어 파일 이름을 아웃룩이나 구글 메일에서 인식할 수 있습니다. 아웃룩이나 구글 메일은 RFC 2231을 따르지 않고 올바르지 않은 방법으로 RFC 2047 표준을 따르고 있습니다."
 
 #: ../mail/evolution-mail.schemas.in.h:58
+msgid "Height of the message-list pane"
+msgstr "메시지 목록 창의 높이"
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Height of the message-list pane."
+msgstr "메시지 목록 창의 높이."
+
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "폴더별 미리 보기를 감추고 선택을 없앱니다"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
-msgstr "사용자가 10개 이상의 메세지를 한번에 열면, 정말로 열 지 물어봅니다."
+msgstr "사용자가 10개 이상의 메시지를 한번에 열면, 정말로 열 지 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13316,17 +13578,14 @@ msgstr ""
 "\"미리 보기\" 창이 켜져 있는 경우, 창을 위아래가 아니라 옆으로 나란히 표시합"
 "니다."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
-msgstr ""
-"특정 MIME 타입에 대한 뷰어가 에볼루션 안에 없으면, 이 목록에 있는 MIME 타입에"
-"서 보노보 컴포넌트 뷰어로 매핑되는 (그놈의 MIME타입 데이터베이스에서) 뷰어가 "
-"내용을 표시하는 데 사용됩니다."
+"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 "특정 MIME 타입에 대한 뷰어가 에볼루션 안에 없으면, 이 목록에 있는 MIME 타입에서 보노보 컴포넌트 뷰어로 매핑되는 (그놈의 MIME 타입 데이터베이스에서) 뷰어가 내용을 표시하는 데 사용됩니다."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13334,7 +13593,7 @@ msgstr ""
 "\"메일 보내고 받기\" 창의 최초 높이. 사용자가 세로 방향으로 창 크기를 바꾸면 "
 "이 값이 바뀝니다."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13346,7 +13605,7 @@ msgstr ""
 "소할 때마다 이 값이 바뀝니다. \"메일 보내고 받기\" 창은 최대화할 수 없기 때문"
 "에 이 값은 실제로는 사용하지 않습니다. 이 키는 내부적 용도로만 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13354,11 +13613,11 @@ msgstr ""
 "\"메일 보내고 받기\" 창의 최초 너비. 사용자가 가로 방향으로 창 크기를 바꾸면 "
 "이 값이 바뀝니다."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "여러 개의 메세지에 표시할 때 확인 질문을 할 지 여부를 결정합니다."
+msgstr "여러 개의 메시지에 표시할 때 확인 질문을 할 지 여부를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13366,56 +13625,54 @@ msgstr ""
 "오프라인 모드로 들어갈 때 오프라인 동기화가 필요한 지 여부를 반복해서 묻는 질"
 "문 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
-msgstr ""
-"찾기 결과에서 지우는 게 아니라, 찾기 폴더에서 메세지를 지울 경우 메세지를 영"
-"구히 지운다고 반복해서 경고하는 기능을 끄고 켭니다."
+msgstr "찾기 결과에서 삭제하는 게 아니라, 찾기 폴더에서 메시지를 지울 경우 메시지를 영구히 삭제한다고 반복해서 경고하는 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "마지막으로 정크 메일을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "마지막으로 휴지통을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "어떤 메세지를 기록할 지 단계."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "레이블 및 레이블 색의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "승인한 약관의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "계정 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 계정 목록입니다. 이 목록에는 /apps/"
-"evolution/mail/accounts에 상대적인 서브디렉토리의 이름이 들어 있습니다."
+"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 "사용자 지정 헤더와 그 헤더를 사용할 지 여부의 목록."
 
-#: ../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 "맞춤법 검사에 사용할 사전의 언어 코드 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13423,270 +13680,265 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 레이블 목록입니다. 이 목록에는 <이름>:<색> "
 "형식의 문자열이 들어 있습니다. 색은 HTML 방식 16진수 인코딩을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
-
-#: ../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 "약관에 동의한 프로토콜 이름의 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "http로 HTML 메세지의 그림을 읽어들입니다"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
+msgstr "HTTP를 통해 HTML 메시지의 그림을 읽어들입니다"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
-msgstr "HTTP(S)를 통해 HTML 메세지의 그림을 읽어들입니다. 사용 가능한 값은: \"0\" - 네트워크에서 그림을 하나도 읽어들이지 않습니다. \"1\" - 보낸 사람이 주소록에 들어 있으면 그림을 읽어들입니다. \"2\" - 항상 네트워크에서 그림을 읽어들입니다."
+msgstr "HTTP(S)를 통해 HTML 메시지의 그림을 읽어들입니다. 사용 가능한 값은: \"0\" - 네트워크에서 그림을 읽어들이지 않습니다. \"1\" - 주소록에 있는 사람의 메세지 그림을 읽어들입니다. \"2\" - 항상 네트워크에서 그림을 읽어들입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "필터 동작 기록"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 필터 동작을 기록합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "필터 동작을 기록할 로그 파일"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "필터 동작을 기록할 로그 파일입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
-msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시하기"
+msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
-msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시합니다."
+msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
-msgstr "메세지 창 기본 높이"
+msgstr "메시지 창 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
-msgstr "메세지 창 기본 너비"
+msgstr "메시지 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "메세지-표시 모양새 (\"normal\", \"full headers\", \"source\")"
+msgstr "메시지-표시 모양새 (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "끝날 때 정크 메일을 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "끝날 때 휴지통을 비울 최소 날짜 간격"
 
-#: ../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 "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../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 "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../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 "받는 사람/참조/숨은 참조에 표시할 주소의 길이"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: ../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 "사용자가 폴더의 지운 메세지를 비우려 할 때 물어봅니다."
+msgstr "사용자가 폴더의 지운 메시지를 비우려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "제목 없는 메세지를 보내려 할 때 물어봅니다."
+msgstr "제목 없는 메시지를 보내려 할 때 물어봅니다."
 
-#: ../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 "사용자에게 즉시 오프라인으로 할 지를 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
-msgstr "찾기 폴더에서 메세지를 지울 때 물어봅니다"
+msgstr "찾기 폴더에서 메시지를 지울 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
-msgstr "사용자가 지운 메세지를 비우려 할 때 물어봅니다"
+msgstr "사용자가 지운 메시지를 비우려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "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 "10개 이상의 메세지를 열려고 할 때 물어봅니다"
+msgstr "10개 이상의 메시지를 열려고 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"HTML 메세지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
+"HTML 메시지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
+msgstr "To나 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 "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
-msgstr "여러 개 메세지에 표시하려 할 때 물어봅니다"
+msgstr "여러 개 메시지에 표시하려 할 때 물어봅니다"
 
-#: ../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 "텍스트 스마일리를 인식하고 그림으로 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "텍스트에 들어 있는 링크를 인식하고 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "받은 메일에 대해 정크메일 검사를 실행합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
-msgstr "저장 디렉토리"
+msgstr "저장 디렉터리"
 
-#: ../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 "로컬 주소록에서 보낸 사람 사진 찾기"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "기본으로 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 "메세지 목록의 보낸 사람 전자메일 주소 열"
+msgstr "메시지 목록의 보낸 사람 전자메일 주소 열"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "서버 동기화 주기"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "애니메이션 보기"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "애니메이션이 들어 있는 그림을 애니메이션으로 봅니다."
 
-#: ../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 "메세지 목록에 지워진 메세지를 표시합니다 (취소선을 긋습니다)."
+msgstr "메시지 목록에 삭제한 메시지를 표시합니다 (취소선을 긋습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
-msgstr "메세지 목록에 지워진 메세지를 표시합니다"
+msgstr "메시지 목록에 삭제한 메시지를 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "보낸 사람의 사진을 보여줍니다"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "메세지 목록의 별도 열에 보낸 사람의 전자메일을 표시합니다."
+msgstr "메시지 목록의 별도 열에 보낸 사람의 전자메일을 표시합니다."
 
-#: ../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 "메세지 읽기 창에서 보낸 사람의 사진을 표시합니다."
+msgstr "메시지 읽기 창에서 보낸 사람의 사진을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "인라인 맞춤법 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "맞춤법 검사 색"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "맞춤법 검사 언어"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "구독 대화 상자 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "구독 대화 상자 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
-msgstr "텍스트 메세지 최대 크기"
+msgstr "텍스트 메시지 최대 크기"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "정크 메일 후크에 대한 기본 플러그인"
 
-#: ../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 "마지막으로 정크 메일을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../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 "마지막으로 휴지통을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "메일을 표시할 때 사용할 터미널 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "메일을 표시할 때 사용할 가변폭 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
-msgstr "세 가지 값이 가능합니다. \"0\"은 오류, \"1\"은 경고, \"2\"는 디버깅 메세지."
+msgstr ""
+"세 가지 값이 가능합니다. \"0\"은 오류, \"1\"은 경고, \"2\"는 디버깅 메시지."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
-msgstr ""
-"에볼루션에서 표시할 수 있는 텍스트의 최대 크기를 지정합니다. 기본값은 4MB / "
-"4096 KB이고 단위는 KB입니다."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "에볼루션에서 표시할 수 있는 텍스트의 최대 크기를 지정합니다. 기본값은 4MB / 4096 KB이고 KB 단위로 지정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13696,13 +13948,13 @@ msgstr ""
 "다. 기본 목록 플러그인을 사용하지 않는 경우, 사용 가능한 다른 플러그인을 대"
 "신 사용하지 않습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
-msgstr "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록에서 메일 선택을 지우고 그 폴더에 대한 미리 보기를 없앱니다."
+msgstr "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록에서 메일 선택을 제거하고 그 폴더에 대한 미리 보기를 없앱니다."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13713,26 +13965,29 @@ msgstr ""
 "리스트가 들어 있습니다. XML 구조의 형식은 &lt;header enabled&gt;입니다 - 헤더"
 "를 메일 보기에서 표시하면 enabled로 설정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
-msgstr "이 옵션은 lookup_addressbook 키와 관련 있습니다. 이 옵션은 정크메일 필터에서 알려진 사람이 보낸 메일을 제외할 때, 로컬 주소록에서만 주소를 찾아 볼 지 여부를 결정합니다."
+msgstr ""
+"이 옵션은 lookup_addressbook 키와 관련 있습니다. 이 옵션은 정크메일 필터에서 "
+"알려진 사람이 보낸 메일을 제외할 때, 로컬 주소록에서만 주소를 찾아 볼 지 여부"
+"를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "이 옵션으로 가져오기 속도를 높일 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"기본 메세지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
+"기본 메시지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13740,142 +13995,142 @@ msgstr ""
 "이 설정은 기본값으로 글타래를 확장 상태로 할 지 축소 상태로 할 지 지정합니"
 "다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"이 설정은 해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부를 지정"
+"이 설정은 해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할 지 여부를 지정"
 "합니다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
-msgstr "연관된 메세지를 글타래로 만듭니다."
+msgstr "연관된 메시지를 글타래로 만듭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
-msgstr "연관된 메세지를 글타래로"
+msgstr "연관된 메시지를 글타래로"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
-msgstr "제목에 따라 메세지 목록을 글타래 표시합니다"
+msgstr "제목에 따라 메시지 목록을 글타래 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
-msgstr "메세지를 읽은 것으로 표시하는 경과 시간"
+msgstr "메시지를 읽은 것으로 표시하는 경과 시간"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
-msgstr "메세지를 읽은 것으로 표시하는 경과 시간."
+msgstr "메시지를 읽은 것으로 표시하는 경과 시간."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: ../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 "인라인 맞춤법 검사를 사용할 때 맞춤법이 틀린 단어에 밑줄 그을 색."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "스팸어새신 데몬 및 클라이언트 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "스팸어새신 데몬 및 클라이언트를 (spamc/spamd) 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "메일을 표시할 때 사용자 지정 글꼴을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "로컬 스팸 테스트만 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다 (DNS는 사용하지 않습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "나란히 혹은 옆으로 길게 배치"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "보기/숨은 참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "보기/숨은_참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "보기/참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "보기/참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "보기/보낸 사람 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "보기/보낸 사람 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "보기/게시_위치 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "보기/게시_위치 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "보기/회신_주소 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "보기/회신_주소 메뉴 항목이 체크."
 
-#: ../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 "기본값으로 내용 읽음 확인 요청을 모든 메세지에 더할 지 여부."
+msgstr "기본값으로 내용 읽음 확인 요청을 모든 메시지에 추가할 지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "가장자리 창의 폴더 이름에 대해 줄여 쓰기 사용을 막을 지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"메세지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
+"메시지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
 "래 표시를 할 것인지 여부."
 
-#: ../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 "해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부"
+msgstr "해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할 지 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
-msgstr "메세지 목록 창의 너비"
+msgstr "메시지 목록 창의 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
-msgstr "메세지 목록 창의 너비."
+msgstr "메시지 목록 창의 너비."
 
 #: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
@@ -13889,78 +14144,72 @@ msgstr "에볼루션 ELM 가져오기"
 msgid "Import mail from Elm."
 msgstr "ELM에서 메일을 가져옵니다."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "대상 폴더:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버클리 메일박스 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "버클리 메일박스 형식 폴더 가져오기"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "PINE 데이터 가져오기"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "에볼루션 PINE 가져오기"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "PINE에서 메일을 가져옵니다."
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "%s에 보내는 메일"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "%s에서 온 메일"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "제목이 %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 메일링 리스트"
 
-#: ../mail/mail-autofilter.c:371
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "필터 규칙 추가"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "서식"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13971,7 +14220,7 @@ msgstr[0] "%d개 선택, "
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d개 지움"
+msgstr[0] "%d개 삭제"
 
 #: ../mail/mail-component.c:561
 #, c-format
@@ -14009,95 +14258,39 @@ msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
-msgstr "새 메일 메세지"
+msgstr "새 메일 메시지"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
-msgstr "메일 메세지(_M)"
+msgstr "메일 메시지(_M)"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
-msgstr "메일 메세지를 새로 작성합니다"
+msgstr "메일 메시지를 새로 작성합니다"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "메일 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "오류"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "오류"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "경고 및 오류"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "디버깅"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "오류, 경고 및 디버깅 메세지"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "디버깅 기록"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "상태 표시줄에서 오류 표시 시간(_E):"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "초."
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "기록 메세지:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "기록 단계"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "시간"
-
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "메세지"
-
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "이 창을 닫습니다"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
-msgstr "지원하는 방법인지 확인(_E) "
+msgstr "지원하는 방식 확인(_E)"
 
 #: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
@@ -14133,7 +14326,7 @@ msgstr "<span weight=\"bold\">인증</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">메세지 작성</span>"
+msgstr "<span weight=\"bold\">메시지 작성</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -14145,7 +14338,7 @@ msgstr "<span weight=\"bold\">기본 동작</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">메일 지우기</span>"
+msgstr "<span weight=\"bold\">메일 삭제</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
@@ -14161,15 +14354,15 @@ msgstr "<span weight=\"bold\">그림 읽어들이기</span>"
 
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">메세지 표시</span>"
+msgstr "<span weight=\"bold\">메시지 표시</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">메세지 글꼴</span>"
+msgstr "<span weight=\"bold\">메시지 글꼴</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">메세지 수신 확인</span>"
+msgstr "<span weight=\"bold\">메시지 수신 확인</span>"
 
 #: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -14230,7 +14423,7 @@ msgstr "스크립트 추가(_S)"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "이 계정으로 보내는 메세지는 항상 서명(_W)"
+msgstr "이 계정으로 보내는 메시지는 항상 서명(_W)"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
@@ -14275,7 +14468,7 @@ msgstr "문자셋(_H):"
 
 #: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
-msgstr "지원하는 형식인지 확인(_E) "
+msgstr "지원하는 방식 확인(_E)"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Check cu_stom headers for junk"
@@ -14295,15 +14488,15 @@ msgstr "받는 메일이 정크메일인 지 검사합니다"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
-msgstr "비우기(_A)"
+msgstr "지우기(_A)"
 
 #: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
-msgstr "비우기(_R)"
+msgstr "지우기(_R)"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "맞춤법이 틀린 글자의 색상(_M):"
+msgstr "맞춤법이 틀린 글자의 색(_M):"
 
 #: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
@@ -14335,17 +14528,17 @@ msgstr "기본 문자 인코딩(_N):"
 
 #: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
-msgstr "끝날 때 정크 메일 지우기(_X)"
+msgstr "끝날 때 정크 메일 삭제(_X)"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "보내는 메세지에 (기본값으로) 디지털 서명(_U)"
+msgstr "보내는 메시지에 (기본값으로) 디지털 서명(_U)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Do not format messages when text size exceeds" ____ "KB"
 #: ../mail/mail-config.glade.h:71
 msgid "Do not format messages when text si_ze exceeds"
-msgstr "메세지의 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
+msgstr "메시지의 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my address book"
@@ -14376,125 +14569,125 @@ msgid "Empty trash folders on e_xit"
 msgstr "끝날 때 휴지통 폴더 비우기(_X): "
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
 msgstr "만능 스페이스바 사용(_P)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "찾기 폴더 사용(_R)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "암호화 인증서(_P):"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
-msgstr "보내는 메세지 암호화 (기본값으로)(_G)"
+msgstr "보내는 메시지 암호화 (기본값으로)(_G)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "고정폭(_X):"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "고정폭 글꼴(_E):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "글꼴 속성"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
-msgstr "HTML 형식 메세지(_H)"
+msgstr "HTML 형식 메시지(_H)"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "전체 이름(_E):"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
-msgstr "HTML 메세지"
+msgstr "HTML 메시지"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "HTTP 프록시(_T):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "헤더"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 표시(_Q):"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "인라인"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "인라인 (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 "레이블"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "언어 표"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "메일 헤더 표"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "메일함 위치"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
-msgstr "메세지 작성"
+msgstr "메시지 작성"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "프록시 없는 호스트(_P):"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "주의: 레이블의 밑줄은 메뉴의 단축키를 지정하는 데 사용합니다."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "알림: 처음 연결하면 암호를 물어보는 창이 뜰 것입니다"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션은 무시합니다."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 키 ID(_K):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "암호(_W):"
 
-#: ../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."
@@ -14502,7 +14695,7 @@ msgstr ""
 "아래 공백에 이 계정에 대해 설명하는 이름을 입력하십시오.\n"
 "이 이름은 표시하는 목적으로만 사용합니다."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14510,130 +14703,138 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"선택\" 필드는 메일"
+"아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"추가\" 필드는 메일"
 "을 보낼 때 정보를 추가하지 않고 싶으면 채우지 않아도 됩니다."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "포트:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "숨은 참조로만 메세지를 보낼 때 확인 질문(_O)"
+msgstr "숨은 참조로만 메시지를 보낼 때 확인 질문(_O)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "인용"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "암호 기억(_M)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "회신 주소(_P):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "암호 기억(_P)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "SOCKS 호스트(_O):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "로컬 주소록에서만 보낸 사람의 사진 찾기(_E)"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "선택(_E)..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
-msgstr "메세지 수신 확인 보내기(_E):"
+msgstr "메시지 수신 확인 보내기(_E):"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "일반 글꼴(_T):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "기본 폴더 선택"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "인쇄에 사용할 HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "보낸 편지함 폴더 선택"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "보낸 편지함 폴더(_M):"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "서버에 인증이 필요(_V)"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "서명 인증서(_N):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "서명(_U):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "서명"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "서명 표"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "맞춤법 검사"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "답장할 때 맨 아래부터 입력 시작(_T)"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
-msgstr "방법(_Y): "
+msgstr "방식(_Y): "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "이 언어 목록은 사전을 설치한 언어만 들어 있습니다."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14642,7 +14843,7 @@ msgstr ""
 "다음 스크립트의 출력을 서명으로 사용합니다. \"이름\"은 표시 목적으로만 이용합"
 "니다."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14650,26 +14851,26 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "사용자이름(_E):"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "인증 사용(_N)"
 
-#: ../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 "사용자이름(_N):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14679,129 +14880,129 @@ msgstr ""
 "\n"
 "시작하려면 \"앞으로\"를 누르십시오. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "서명 추가(_A)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "항상 인터넷에서 그림 읽어들이기(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "자동 프록시 설정 URL(_A):"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "기본 정크 메일 플러그인(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "인터넷에 직접 연결(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "모임 요청에 서명하지 않기 (Outlook 호환)(_D)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "답장을 쓸 때 원문 위에 서명 놓기(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "주소록에 있는 사람이 보낸 메일의 그림 읽어들이기(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "로컬 주소록만 찾아 보기(_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "수동 프록시 설정(_M):"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "그림을 인터넷에서 읽어들이지 않기(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "경로(_P):"
 
-#: ../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 "HTML 메일을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "제목이 없이 메세지를 보낼 때 확인 질문(_P)"
+msgstr "제목이 없이 메시지를 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "회신 모양(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "스크립트(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "보안 HTTP 프록시(_S):"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "선택(_S)..."
 
 #. 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 "그림 애니메이션 보기(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "메일 미리 보기에서 보낸 사람의 사진 보기(_S)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Shrink To / Cc / Bcc headers to ____ addresses"
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "받는 사람 / 참조 / 숨은 참조 헤더 줄이기(_S): "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "시스템 기본값 사용(_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 사용(_U)"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "개 주소"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "색상"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "설명"
 
@@ -14847,11 +15048,11 @@ msgstr "찾기(_I):"
 
 #: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
-msgstr "메세지에서 찾음"
+msgstr "메시지에서 찾음"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
-msgstr "추가 작업 메세지 플래그"
+msgstr "추가 작업 메시지 플래그"
 
 #: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
@@ -14882,7 +15083,7 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"다음은 추가 작업 플래그를 표시하려고 선택한 메세지입니다.\n"
+"다음은 추가 작업 플래그를 표시하려고 선택한 메시지입니다.\n"
 "\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
 
 #: ../mail/mail-dialogs.glade.h:21
@@ -14901,29 +15102,29 @@ msgstr "표시(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "사용권 약관에 동의하시면 여기에 체크하십시오(_T)"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-folder-cache.c:845
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:105
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
-msgstr "선택한 메세지 필터링하는 중"
+msgstr "선택한 메시지 필터링하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:264
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "메일 가져오는 중"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "나가는 필터를 적용하는 데 실패했습니다: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14932,139 +15133,139 @@ msgstr ""
 "%s에 추가하는 데 실패했습니다: %s\n"
 "대신에 로컬의 `보낸 편지함'에 추가합니다."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "로컬의 '보낸 편지함' 폴더에 추가하는 데 실패했습니다: %s"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:724
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
-msgstr "메세지 보내는 중입니다"
+msgstr "메시지 보내는 중입니다"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:734
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "%2$d개 중에서 %1$d번째 메세지를 보내는 중"
+msgstr "%2$d개 중에서 %1$d번째 메시지를 보내는 중"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "%2$d개 메세지 중에서 %1$d번째를 보내는 데 실패했습니다"
+msgstr "%2$d개 메시지 중에서 %1$d번째를 보내는 데 실패했습니다"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "완료."
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:871
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
-msgstr "메세지를 폴더로 저장하는 중"
+msgstr "메시지를 폴더로 저장하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:949
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "메시지들을 %s(으)로 옮기는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:949
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "메시지들을 %s(으)로 복사하는 중"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "전달한 메시지"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1207
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s 폴더를 여는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1272
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s 폴더의 용량 제한 정보를 가져오는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1341
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s을(를) 여는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1412
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
-msgstr "%s 폴더를 지우는 중"
+msgstr "%s 폴더를 제거하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1501
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1564
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "계정 '%s'의 지운 메세지를 비우고 내용을 저장하는 중"
+msgstr "계정 '%s'의 지운 메시지를 비우고 내용을 저장하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1565
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1619
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "폴더 다시 읽는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
-msgstr "지운 메세지를 비우는 중"
+msgstr "지운 메시지를 비우는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1706
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1788
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
-msgstr "메세지 %s을(를) 가져오는 중"
+msgstr "메시지 %s을(를) 가져오는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1895
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "메세지 %d개를 가져오는 중"
+msgstr[0] "메시지 %d개를 가져오는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1980
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
-msgstr[0] "메세지 %d개를 저장하는 중"
+msgstr[0] "메시지 %d개를 저장하는 중"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15073,12 +15274,12 @@ msgstr ""
 "%s(으)로 메시지 저장 중 오류 발생:\n"
 " %s"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2130
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15087,31 +15288,31 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이터를 쓸 수 없습니다: %s"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2317
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2317
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2413
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' 오프라인 계정을 준비 중"
 
-# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2499
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "서비스 확인중"
 
@@ -15127,39 +15328,39 @@ msgstr "메일 보내고 받기"
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "업데이트 중..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "새 메일 확인"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s의 암호를 입력하십시오"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "암호 입력"
 
-#: ../mail/mail-session.c:212
-#: ../plugins/exchange-operations/exchange-config-listener.c:713
+#: ../mail/mail-session.c:217
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 암호를 입력하십시오"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "암호 입력"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
@@ -15178,7 +15379,7 @@ msgstr "서명 이름(_S):"
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "스풀 디렉토리 `%s'을(를) 만들 수 없습니다: %s"
+msgstr "스풀 디렉터리 `%s'을(를) 만들 수 없습니다: %s"
 
 #: ../mail/mail-tools.c:150
 #, c-format
@@ -15204,21 +15405,21 @@ msgstr "잘못된 폴더: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "찾기 폴더 설정: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s'에 대한 찾기 폴더를 업데이트하는 중입니다"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s에 대한 찾기 폴더를 업데이트하는 중입니다"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "찾기 폴더 편집"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "새 찾기 폴더"
 
@@ -15261,49 +15462,49 @@ msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"메세지에 의미있는 제목을 써야 받는 사람이 메일이 무엇에 관한 메일인지 알 수 "
+"메시지에 의미있는 제목을 써야 받는 사람이 메일이 무엇에 관한 메일인지 알 수 "
 "있습니다."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "정말로 이 계정과 그 프록시를 모두 지우시겠습니까?"
+msgstr "정말로 이 계정과 그 프록시를 모두 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
-msgstr "정말로 이 계정을 지우시겠습니까?"
+msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "정말로 이 계정을 사용하지 않고 그 프록시를 모두 지우시겠습니까?"
+msgstr "정말로 이 계정을 사용하지 않고 그 프록시를 모두 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "정말로 {0}개의 메세지를 동시에 여시겠습니까?"
+msgstr "정말로 {0}개의 메시지를 동시에 여시겠습니까?"
 
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "모든 폴더의 지워진 메세지를 완전히 지우시겠습니까?"
+msgstr "모든 폴더의 삭제한 메시지를 완전히 제거하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "\"{0}\" 폴더의 모든 지워진 메세지를 완전히 지우시겠습니까?"
+msgstr "\"{0}\" 폴더의 모든 삭제한 메시지를 완전히 제거하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "정말로 HTML 형식의 메세지를 보내시겠습니까?"
+msgstr "정말로 HTML 형식의 메시지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "정말로 받는 사람이 BCC만 있는 메세지를 보내시겠습니까?"
+msgstr "정말로 받는 사람이 BCC만 있는 메시지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "정말로 제목 없는 메세지를 보내시겠습니까?"
+msgstr "정말로 제목 없는 메시지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Because \"{0}\"."
@@ -15319,7 +15520,7 @@ msgstr "서명 없음"
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "\"{0}\" 찾기 폴더를 더할 수 없습니다."
+msgstr "\"{0}\" 찾기 폴더를 추가할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15331,11 +15532,11 @@ msgstr "\"{0}\" 폴더를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
-msgstr "임시 저장 디렉토리를 만들 수 없습니다."
+msgstr "임시 저장 디렉터리를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "\"{1}\" 때문에 디렉토리를 저장할 수 없습니다."
+msgstr "\"{1}\" 때문에 디렉터리를 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder \"{0}\"."
@@ -15387,7 +15588,7 @@ msgstr "바뀐 사항을 계정에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory \"{0}\"."
-msgstr "\"{0}\" 디렉토리에 저장할 수 없습니다."
+msgstr "\"{0}\" 디렉터리에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file \"{0}\"."
@@ -15415,19 +15616,19 @@ msgstr "서명 파일을 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:44
 msgid "Delete \"{0}\"?"
-msgstr "\"{0}\"을(를) 지우시겠습니까?"
+msgstr "\"{0}\"을(를) 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
-msgstr "계정을 지우시겠습니까?"
+msgstr "계정을 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "\"{0}\" 찾기 폴더 안의 메세지를 지우시겠습니까?"
+msgstr "\"{0}\" 찾기 폴더 안의 메시지를 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
-msgstr "찾기 폴더 안의 메세지를 지우시겠습니까?"
+msgstr "찾기 폴더 안의 메시지를 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
@@ -15435,11 +15636,11 @@ msgstr "바뀐 내용을 버리시겠습니까?"
 
 #: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
-msgstr "지우지 않기(_E)"
+msgstr "삭제하지 않기(_E)"
 
 #: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
-msgstr "지우지 않기"
+msgstr "삭제하지 않기"
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
@@ -15453,7 +15654,7 @@ msgstr "오프라인 사용이라고 표시한 폴더를 로컬에 동기화하�
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
-msgstr "모든 메세지를 읽은 것으로 표시할까요?"
+msgstr "모든 메시지를 읽은 것으로 표시할까요?"
 
 #: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
@@ -15485,35 +15686,33 @@ msgstr "파일이 있지만 일반 파일이 아닙니다."
 
 #: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "계속하시면, 이 메세지를 복구할 수 없을 것입니다."
+msgstr "계속하시면, 이 메시지를 복구할 수 없을 것입니다."
 
 #: ../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 ""
-"폴더를 지우시면, 그 안에 있는 내용과 그 하위 폴더의 내용까지 영원히 지우게 됩"
-"니다."
+msgstr "폴더를 삭제하면, 그 안에 있는 내용과 그 하위 폴더의 내용까지 영원히 삭제하게 됩니다."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "계속하시면, 모든 프록시 계정을 영원히 지웁니다."
+msgstr "계속하시면, 모든 프록시 계정을 영원히 삭제합니다."
 
 #: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "계속 하시면, 계정과 모든 프록시의 정보를 영원히 지웁니다."
+msgstr "계속 하시면, 계정과 모든 프록시의 정보를 영원히 삭제합니다."
 
 #: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "계속 하시면, 계정 정보를 영원히 지웁니다."
+msgstr "계속 하시면, 계정 정보를 영원히 삭제합니다."
 
 #: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "끝내시면, 에볼루션을 다시 시작할 때까지는 이 메세지를 보내지 않습니다."
+msgstr "끝내시면, 에볼루션을 다시 시작할 때까지는 이 메시지를 보내지 않습니다."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15534,14 +15733,14 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메세지에 Apparently-"
-"To 헤더를 붙입니다. 그리고 이 헤더에는 메세지를 받는 사람을 모두를 기록하게 "
+"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메시지에 Apparently-"
+"To 헤더를 붙입니다. 그리고 이 헤더에는 메시지를 받는 사람을 모두를 기록하게 "
 "됩니다. 이렇게 되지 않으려면, 최소한 주소를 한 개라도 \"받는 사람:\"이나 \"참"
 "조:\"에 쓰십시오."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
-msgstr "모든 메세지를 읽은 것으로 표시합니다"
+msgstr "모든 메시지를 읽은 것으로 표시합니다"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
@@ -15553,7 +15752,7 @@ msgstr "소스를 선택하지 않았습니다."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr "여러 개의 메세지를 한꺼번에 열면 시간이 오래 걸릴 수도 있습니다."
+msgstr "여러 개의 메시지를 한꺼번에 열면 시간이 오래 걸릴 수도 있습니다."
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
@@ -15608,7 +15807,7 @@ msgstr "내용 읽음 확인을 요청했습니다."
 
 #: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "정말로 \"{0}\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+msgstr "정말로 \"{0}\" 폴더와 그 아래 폴더를 모두 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
@@ -15643,9 +15842,7 @@ msgstr "오프라인에서 사용하기 위해 폴더를 로컬에서 동기화�
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
-msgstr ""
-"에볼루션이 제대로 동작하려면 시스템 폴더가 있어야 하고, 이 폴더는 이름을 바꾸"
-"거나, 옮기거나, 지우면 안 됩니다."
+msgstr "에볼루션이 제대로 동작하려면 시스템 폴더가 있어야 하고, 이 폴더는 이름을 바꾸거나, 옮기거나, 삭제하면 안 됩니다."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
@@ -15659,8 +15856,8 @@ msgstr ""
 "지금 보내려는 연락처 목록에는 그 목록에 들어 있는 받는 사람들을 감추도록 설정"
 "되어 있습니다.\n"
 "\n"
-"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메세지에 Apparently-"
-"To 헤더를 붙입니다. 그리고 이 헤더에는 메세지를 받는 사람을 모두를 기록하게 "
+"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메시지에 Apparently-"
+"To 헤더를 붙입니다. 그리고 이 헤더에는 메시지를 받는 사람을 모두를 기록하게 "
 "됩니다. 이렇게 되지 않으려면, 최소한 주소를 한 개라도 \"받는 사람:\"이나 \"참"
 "조:\"에 쓰십시오."
 
@@ -15674,7 +15871,7 @@ msgid ""
 msgstr ""
 "다음:\n"
 "{0}\n"
-"찾기 폴더는 다음 지워진 폴더를 사용합니다:\n"
+"찾기 폴더는 다음 제거한 폴더를 사용합니다:\n"
 "    \"{1}\"\n"
 "업데이트했습니다."
 
@@ -15688,7 +15885,7 @@ msgid ""
 msgstr ""
 "다음:\n"
 "{0}\n"
-"필터 규칙은 다음 지워진 폴더를 사용합니다:\n"
+"필터 규칙은 다음 제거한 폴더를 사용합니다:\n"
 "    \"{1}\"\n"
 "업데이트했습니다."
 
@@ -15701,19 +15898,19 @@ msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"이 폴더는 묵시적으로 더한 폴더일 수도 있습니다.\n"
+"이 폴더는 묵시적으로 추가한 폴더일 수도 있습니다.\n"
 "필요하다면, 찾기 폴더 편집 창으로 가서 직접 추가하십시오."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "지정한 계정을 사용하는 중이 아니므로 이 메세지를 보낼 수 없습니다."
+msgstr "지정한 계정을 사용하는 중이 아니므로 이 메시지를 보낼 수 없습니다."
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
-msgstr "받는 사람을 아무도 지정하지 않아서 이 메세지를 보낼 수 없습니다"
+msgstr "받는 사람을 아무도 지정하지 않아서 이 메시지를 보낼 수 없습니다"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15730,7 +15927,7 @@ msgstr "서명이 바뀌었지만, 저장하지 않았습니다."
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "선택한 폴더와 그 아래 폴더의 모든 메세지를 읽은 것으로 표시합니다."
+msgstr "선택한 폴더와 그 아래 폴더의 모든 메시지를 읽은 것으로 표시합니다."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
@@ -15762,9 +15959,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"경고: 찾기 폴더에서 메세지를 지우면, 로컬 혹은 원격 폴더에서 메세지가 실제로 "
-"지워집니다.\n"
-"정말로 메세지를 지우시겠습니까?"
+"경고: 찾기 폴더에서 메시지를 삭제하면, 로컬 혹은 원격 폴더에서 메시지를 실제로 삭제합니다.\n"
+"정말로 메시지를 삭제하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
@@ -15772,7 +15968,7 @@ msgstr "필요한 정보중에 입력하지 않은 정보가 있습니다."
 
 #: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "보내지 않은 메세지가 있습니다, 그래도 끝내시겠습니까?"
+msgstr "보내지 않은 메시지가 있습니다, 그래도 끝내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
@@ -15814,96 +16010,94 @@ msgstr "동기화하지 않음(_D)"
 
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
-msgstr "비우기(_E)"
+msgstr "완전히 삭제(_E)"
 
 #: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
-msgstr "메세지 열기(_O)"
+msgstr "메시지 열기(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "봤음"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "응답함"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "전달함"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
-msgstr "여러개의 보지않은 메세지"
+msgstr "여러개의 보지않은 메시지"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
-msgstr "여러 메세지"
+msgstr "여러 메시지"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "낮음"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "높음"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%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 "어제 %p %l:%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) %p %l:%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 "%b %e일 %p %l:%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 "%Y년 %b %e일"
 
 #. 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 "메세지 목록 작성중"
+msgstr "메시지 목록 작성중"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
-msgstr ""
-"찾기 기준에 해당하는 메세지가 없습니다. 찾기->비우기 메뉴 항목으로 찾기를 지"
-"우거나 찾기 기준을 바꾸십시오."
+msgstr "찾기 기준에 해당하는 메시지가 없습니다. 찾기->지우기 메뉴 항목으로 찾기를 지우거나 찾기 기준을 바꾸십시오."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
-msgstr "이 폴더에는 메세지가 없습니다."
+msgstr "이 폴더에는 메시지가 없습니다."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15919,7 +16113,7 @@ msgstr "플래그"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "메세지 플래그"
+msgstr "메시지 플래그"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -15927,46 +16121,50 @@ msgstr "받았음"
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "보낸 메세지"
+msgstr "보낸 메시지"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "크기"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "제목 - 자름"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "호출"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "전달하지 않음"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "추가 작업"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "유용한 정보"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "전달"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "회신이 필요 없음"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "회신"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "전체 회신"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "다시 보기"
 
@@ -15977,7 +16175,7 @@ msgstr "본문에 포함"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
-msgstr "메세지에 포함"
+msgstr "메시지에 포함"
 
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
@@ -16011,16 +16209,16 @@ msgstr "로컬 주소록의 주요 기능을 제공합니다."
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
-msgstr "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록"
+msgstr "첨부 알림 플러그인이 메시지 본문에서 찾아볼 근거 목록"
 
 #: ../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 "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록."
+msgstr "첨부 알림 플러그인이 메시지 본문에서 찾아볼 근거 목록."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "키워드"
 
@@ -16034,7 +16232,7 @@ msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
 msgstr ""
-"메세지에서 첨부 파일에 대해 언급한 근거를 찾아보고 첨부가 없다면 경고를 표시"
+"메시지에서 첨부 파일에 대해 언급한 근거를 찾아보고 첨부가 없다면 경고를 표시"
 "합니다."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -16042,21 +16240,21 @@ msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
-"이 메세지에서 첨부 파일이 들어 있어야 한다는 키워드를 찾았지만, 첨부 파일이 "
+"이 메시지에서 첨부 파일이 들어 있어야 한다는 키워드를 찾았지만, 첨부 파일이 "
 "없습니다."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
-msgstr "메세지에 첨부가 없습니다"
+msgstr "메시지에 첨부가 없습니다"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
-msgstr "메세지 편집(_E)"
+msgstr "메시지 편집(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "오디오 인라인 첨부를 표시하고 에볼루션에서 직접 플레이할 수 있는 포매터 플러"
 "그인."
@@ -16109,11 +16307,11 @@ msgstr "복구할 파일을 선택하십시오"
 
 #: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
-msgstr "에볼루션 디렉토리 백업"
+msgstr "에볼루션 디렉터리 백업"
 
 #: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
-msgstr "에볼루션 디렉토리 복구"
+msgstr "에볼루션 디렉터리 복구"
 
 #: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
@@ -16260,11 +16458,7 @@ msgid ""
 "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 ""
-"현재 에볼루션에 있는 모든 데이터 및 설정을 지우고 이를 백업 파일에서 복구합니"
-"다. 에볼루션이 실행되지 않을 경우에만 이를 복구할 수 있습니다. 백업을 시작하"
-"기 전에 모든 파일을 저장 후 종료하였는 지를 확인합니다. 백업 후 에볼루션을 자"
-"동으로 실행하시고자 할 경우 토글 단추를 활성화합니다."
+msgstr "현재 에볼루션에 있는 모든 데이터 및 설정을 삭제하고 이를 백업 파일에서 복구합니다. 에볼루션이 실행되지 않을 경우에만 이를 복구할 수 있습니다. 백업을 시작하기 전에 모든 파일을 저장 후 종료하였는 지를 확인합니다. 백업 후 에볼루션을 자동으로 실행하시고자 할 경우 토글 단추를 활성화합니다."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16278,35 +16472,35 @@ msgstr "설정 복구(_E)..."
 msgid "_Backup Settings..."
 msgstr "설정 백업(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "자동 연락처"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
-msgstr "메세지에 답장하면 자동으로 주소록에 항목 만들기(_A)"
+msgstr "메시지에 답장하면 자동으로 주소록에 항목 만들기(_A)"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "자동 연락처를 사용할 주소록을 선택하십시오"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "인스턴스 메시지 연락처"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "피진 친구 목록의 정보 및 그림을 동기화"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "피진 친구 목록에 사용할 주소록을 선택하십시오"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "지금 친구 목록과 동기화(_B)"
 
@@ -16315,47 +16509,49 @@ 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 "메세지에 답장할 때마다 자동으로 이름과 전자메일 주소를 주소록에 넣습니다. 또 친구 목록에서 인스턴스 메세지 연락처 정보를 채워 넣습니다."
+msgstr ""
+"메시지에 답장할 때마다 자동으로 이름과 전자메일 주소를 주소록에 넣습니다. 또 "
+"친구 목록에서 인스턴스 메시지 연락처 정보를 채워 넣습니다."
 
 #: ../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 "%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 "보고필터 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "보고필터 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "보고필터에 대한 파이프가 실패했습니다. 오류 코드: %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 "메세지 텍스트를 유니코드로 변환(_U)"
+msgstr "메시지 텍스트를 유니코드로 변환(_U)"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
-msgstr "메세지 텍스트를 유니코드로 변환"
+msgstr "메시지 텍스트를 유니코드로 변환"
 
 #: ../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 ""
-"메세지 텍스트를 유니코드 UTF-8로 변환하여 여러가지 문자셋으로 된 스팸/햄 토큰"
+"메시지 텍스트를 유니코드 UTF-8로 변환하여 여러가지 문자셋으로 된 스팸/햄 토큰"
 "을 통일합니다."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16368,23 +16564,33 @@ msgstr "보고필터 정크메일 플러그인"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr "보고필터를 사용해 정크 메세지를 필터링합니다."
+msgstr "보고필터를 사용해 정크 메시지를 필터링합니다."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_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 "SSL 사용(_S)"
 
+#. 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 "새로 고침(_F):"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV 달력 소스"
@@ -16401,13 +16607,6 @@ msgstr "로컬 달력"
 msgid "Provides core functionality for local calendars."
 msgstr "로컬 달력의 주요 기능을 제공합니다."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "새로 고침(_F):"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "보안 연결(_S):"
@@ -16424,48 +16623,55 @@ msgstr "HTTP 달력"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "webcal 및 HTTP 달력의 주요 기능을 제공합니다."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "날씨: 구름"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "날씨: 안개"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "날씨: 구름 약간"
+msgid "Weather: Cloudy"
+msgstr "날씨: 구름"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "날씨: 비"
+msgid "Weather: Cloudy Night"
+msgstr "날씨: 밤하늘 구름"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "날씨: 흐림"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "날씨: 소나기"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "날씨: 눈"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "날씨: 맑음"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "날씨: 밤하늘 맑음"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "날씨: 태풍"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "위치 선택"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "단위(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "미터법 (섭씨, 센티미터 등)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "임페리얼 단위 (화씨, 인치 등)"
 
@@ -16509,7 +16715,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "에볼루션을 기본 전자메일 프로그램으로 하시겠습니까?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "에볼루션"
 
@@ -16539,16 +16745,16 @@ msgid ""
 "default one."
 msgstr "달력이나 주소록을 기본값으로 지정하는 기능을 제공합니다."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "사용자 설정 헤더(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "키"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "값"
 
@@ -16568,7 +16774,7 @@ msgstr "전자메일 사용자 설정 헤더"
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Adds custom header to outgoing messages."
-msgstr "보내는 메세지에 사용자 설정 헤더를 추가합니다."
+msgstr "보내는 메시지에 사용자 설정 헤더를 추가합니다."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16584,10 +16790,16 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"이 키는 보내는 메세지에 추가할 사용자 설정 헤더의 목록입니다. 헤더와 헤더 값"
+"이 키는 보내는 메시지에 추가할 사용자 설정 헤더의 목록입니다. 헤더와 헤더 값"
 "을 지정하는 방법은 다음과 같습니다: 사용자 설정 헤더의 이름 다음에 \"=\" 다음"
 "에 값을 쓰고 \";\"으로 구분."
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "다른 사용자 폴더 열기"
@@ -16605,129 +16817,131 @@ msgid "_User:"
 msgstr "사용자(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "보안 암호"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 "이 옵션을 켜면 보안 암호 (NTLM) 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "일반 암호"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "이 옵션을 켜면 일반 텍스트 암호 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "부재 중"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
-"아래에 지정한 메세지는 부재 중에 메일을 보낸 각 사람들에게\n"
+"아래에 지정한 메시지는 부재 중에 메일을 보낸 각 사람들에게\n"
 "자동으로 전달합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "현재 외부에 있음"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "현재 내부에 있음"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "익스체인지 계정의 암호 바꾸기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "암호 바꾸기"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "익스체인지 계정의 대리인 설정을 관리합니다"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "대리인 도우미"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "기타"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "모든 익스체인지 폴더의 크기 보기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "익스체인지 설정"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "인증(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "메일함 이름 지정(_P)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "메일함(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "인증 방법(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
-msgstr "지원하는 방법인지 확인(_E) "
+msgstr "지원하는 방식 확인(_E)"
 
-#: ../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 ""
-"에볼루션이 오프라인 상태입니다. 지금은 폴더를 만들거나 고칠 수 없습니다. 폴더"
-"를 만들거나 고치려면 온라인 모드로 바꾸십시오."
+msgstr "에볼루션이 오프라인 상태입니다. 지금은 폴더를 만들거나 고칠 수 없습니다. 폴더를 만들거나 수정하려면 온라인 모드로 바꾸십시오."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -16758,37 +16972,37 @@ msgstr "새 암호:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "현재의 암호가 사용 만료되었습니다. 지금 암호를 바꾸십시오."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:665
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "암호가 앞으로 %d일 안에 만료됩니다."
 
-#: ../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 "사용자 설정"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "편집자 (읽기, 만들기, 편집)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "저자 (읽기, 만들기)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "검토자 (읽기전용)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "대리 권한"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16797,35 +17011,35 @@ msgstr "%s에 대한 권한"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
-"이 메세지는 에볼루션에서 대리인으로 지정한 것을 알리는 메세지입니다. 이제 내 "
-"자격으로 메세지를 보낼 수 있습니다."
+"이 메시지는 에볼루션에서 대리인으로 지정한 것을 알리는 메시지입니다. 이제 내 "
+"자격으로 메시지를 보낼 수 있습니다."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "내 폴더에 다음과 같은 권한을 부여 받았습니다:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "내 개인 항목을 볼 수 있습니다."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "하지만 내 개인 항목은 볼 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "귀하는 %s의 대리인으로 지정되었습니다"
@@ -16837,20 +17051,20 @@ msgstr "대리"
 #: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr "대리인 %s을(를) 지우시겠습니까?"
+msgstr "대리인 %s을(를) 제거하시겠습니까?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
-msgstr "액티브 디렉토리에 접근할 수 없습니다"
+msgstr "액티브 디렉터리에 접근할 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
-msgstr "액티브 디렉토리에서 자신을 찾을 수 없습니다"
+msgstr "액티브 디렉터리에서 자신을 찾을 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "액티브 디렉토리에서 %s 대리를 찾을 수 없습니다"
+msgstr "액티브 디렉터리에서 %s 대리를 찾을 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
@@ -16864,7 +17078,7 @@ msgstr "대리 목록을 업데이트할 수 없습니다."
 #: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
-msgstr "%s 대리를 더할 수 없습니다"
+msgstr "%s 대리를 추가할 수 없습니다"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
@@ -16971,7 +17185,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b>부재 중 메세지:</b>"
+msgstr "<b>부재 중 메시지:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
@@ -16983,7 +17197,7 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>아래에 지정한 메세지는 부재 중에 메일을 보낸 각 사람들에게 자동으로\n"
+"<small>아래에 지정한 메시지는 부재 중에 메일을 보낸 각 사람들에게 자동으로\n"
 "전달됩니다.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -17028,8 +17242,8 @@ msgstr "사용자 추가:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "사용자 추가"
 
@@ -17091,7 +17305,7 @@ msgstr "역할: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
-msgstr "<b>메세지 설정</b>"
+msgstr "<b>메시지 설정</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 msgid "<b>Tracking Options</b>"
@@ -17130,12 +17344,12 @@ msgstr ""
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
-msgstr "이 메세지에 대해 배달 확인 요청(_D)"
+msgstr "이 메시지에 대해 배달 확인 요청(_D)"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
-msgstr "이 메세지에 대해 내용 읽음 확인 요청(_R)"
+msgstr "이 메시지에 대해 내용 읽음 확인 요청(_R)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
@@ -17149,11 +17363,11 @@ msgstr "민감 정도(_S): "
 msgid "_User"
 msgstr "사용자(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "사용자 선택"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "주소록..."
 
@@ -17176,18 +17390,22 @@ msgid "Exchange Operations"
 msgstr "익스체인지 동작"
 
 #: ../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 "설정 문제때문에 암호를 바꿀 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "폴더를 표시할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "작업을 수행할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17195,15 +17413,15 @@ msgstr ""
 "익스체인지 계정 \"{0}\"의 설정에 바꾼 사항들은 에볼루션을 다시 시작해야 적용"
 "됩니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "서버에 인증할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "암호를 바꿀 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17213,59 +17431,59 @@ msgstr ""
 "계정을 설정할 수 없습니다. URL, 사용자 이름,\n"
 "암호를 확인하시고, 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "익스체인지 서버에 연결할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "{0} 서버에 연결할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "대리인의 폴더 권한을 지정할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "익스체인지 웹 스토리지 시스템을 찾을 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "{0} 서버를 찾을 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "{0}을(를) 대리로 만들 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "폴더 권한을 읽을 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "폴더 권한을 읽을 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "부재중 상태를 읽을 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "폴더 권한을 업데이트할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "부재중 상태를 업데이트할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr "구독 사용자의 메일함을 읽어들이려면 에볼루션을 다시 시작해야 합니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "익스체인지 계정이 오프라인입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17293,32 +17511,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "대리자를 업데이트하는 데 실패했습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "폴더가 이미 있습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "폴더가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "폴더 오프라인"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "일반 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog 서버에 연결할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17326,72 +17544,72 @@ msgstr ""
 "다른 경로에서 OWA가 실행하고 있다면, 계정 설정 대화 상자에서 그 경로를 지정해"
 "야 합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0}에 대한 메일 박스는 이 서버에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "URL이 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "서버 이름의 철자가 맞는 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "사용자 이름과 암호가 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "이 계정에서 Global Catalog 서버를 설정하지 않았습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "{0} 사용자의 메일박스가 {1}에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "{0} 사용자가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "암호를 성공적으로 바꿨습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "대리인의 ID를 입력하거나 대리인 자격으로 보내기 옵션을 사용하지 마십시오."
 
-#: ../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 "Global Catalog 서버 이름이 올바른지 확인하십시오."
 
-#: ../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 "바뀐 사항을 적용하려면 에볼루션을 다시 시작해 주십시오"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "사용자를 선택하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "암호가 너무 취약하기 때문에 서버에서 거부했습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "에볼루션을 끝내면 익스체인지 계정을 사용하지 않게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "에볼루션을 끝내면 익스체인지 계정을 지우게 됩니다"
+msgstr "에볼루션을 끝내면 익스체인지 계정을 제거하게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "이 익스체인지 서버는 익스체인지 커넥터와 호환되지 않습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17399,7 +17617,7 @@ msgstr ""
 "서버가 익스체인지 5.5를 실행하고 있습니다. 익스체인지 커넥터는\n"
 "마이크로소프트 익스체인지 2000 및 2003만 지원합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17413,90 +17631,88 @@ msgstr ""
 "\n"
 "아니면 단순히 암호를 잘못 입력했을 수도 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "다른 암호로 다시 시도해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
-msgstr "사용자를 접근권한 컨트롤 목록에 더할 수 없습니다:"
+msgstr "사용자를 접근권한 컨트롤 목록에 추가할 수 없습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "대리인을 편집할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "{0}을(를) 찾아보는 데 알 수 없는 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "알 수 없는 오류."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "알 수 없는 종류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "지원하지 않는 동작"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "이 서버에서 사용할 수 있는 메일 저장 제한 용량에 가까워져 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr "한번에 한 명의 대리인을 통해서만 메세지를 보낼 수 있습니다."
+msgstr "한번에 한 명의 대리인을 통해서만 메시지를 보낼 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "자기 자신을 자신의 대리인으로 만들 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "이 서버에 메일을 저장할 수 있는 제한 용량을 넘어갔습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "한 개의 익스체인지 계정만 설정할 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보해 보십시오."
+msgstr "현재 사용량은: {0}KB입니다. 메일을 삭제해서 공간을 더 확보해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "현재 사용량은: {0}KB입니다. 현재 메일을 보내거나 받지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr ""
-"현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보하지 않으면 메일을 보"
-"내지 못할 것입니다."
+msgstr "현재 사용량은: {0}KB입니다. 메일을 삭제해서 공간을 더 확보하지 않으면 메일을 보내지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "암호가 만료되었습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
-msgstr "{0}을(를) 접근 권한 조정 목록에 더할 수 없습니다"
+msgstr "{0}을(를) 접근 권한 조정 목록에 추가할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0}은(는) 이미 대리인입니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0}은(는) 이미 목록에 있습니다"
 
@@ -17557,7 +17773,7 @@ msgstr "외부 편집기에서 작성(_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
-msgstr "외부 편집기를 사용해 메세지 작성"
+msgstr "외부 편집기를 사용해 메시지 작성"
 
 #: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
@@ -17589,13 +17805,9 @@ msgid ""
 "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 ""
-"보내는 메세지에 Face 헤더를 붙입니다. 맨 처음에 48*48 PNG 그림을 설정해야 합"
+"보내는 메시지에 Face 헤더를 붙입니다. 맨 처음에 48*48 PNG 그림을 설정해야 합"
 "니다. 이 그림은 base64로 인코딩해서 ~/.evolution/faces 파일에 저장합니다. 그"
-"러면 그 후에 보내는 메세지에 이 그림을 사용합니다."
-
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "얼굴"
+"러면 그 후에 보내는 메시지에 이 그림을 사용합니다."
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -17603,8 +17815,8 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" 폴더를 구독 해제하는 중"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr "폴더 트리 컨텍스트 메뉴에서 메일 폴더 구독 해제할 수 있게 합니다."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr "가장자리 창의 컨텍스트 메뉴에서 메일 폴더를 구독 해제할 수 있게 합니다."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17616,22 +17828,18 @@ msgstr "구독 중지(_U)"
 
 #: ../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 "구글"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "사용자 이름을 먼저 입력하십시오."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "구독하고 있는 달력 목록을 읽으려면 %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"
@@ -17640,22 +17848,22 @@ msgstr ""
 "구글 서버에서 데이터를 읽을 수 없습니다.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "달력(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "목록 가져오기(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>서버</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
-msgstr "구글 달력 및 연락처를 설정하는 플러그인."
+msgid "A plugin to setup Google Calendar and Contacts."
+msgstr "구글 캘린터 및 주소록을 설정하는 플러그인."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17666,14 +17874,14 @@ msgid "Checklist"
 msgstr "확인목록"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "그룹와이즈 달력 및 연락처 소스를 설정하는 플러그인."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "그룹와이즈 계정 설정"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17689,7 +17897,7 @@ msgid ""
 msgstr ""
 "'%s' 사용자가 폴더를 공유했습니다.\n"
 "\n"
-"'%s'의 메세지\n"
+"'%s'의 메시지\n"
 "\n"
 "\n"
 "%s\n"
@@ -17698,11 +17906,11 @@ msgstr ""
 "공유 폴더를 설치하려면 '앞으로'를 누르십시오\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "공유 폴더 설치"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "공유 폴더 설치"
 
@@ -17728,7 +17936,7 @@ msgid "Email:"
 msgstr "전자메일:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "사용 않음(_D)"
 
@@ -17742,43 +17950,41 @@ msgstr "정크메일 목록(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
 msgid "Message Retract"
-msgstr "메세지 철회"
+msgstr "메시지 철회"
 
 #: ../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 ""
-"메세지를 철회하면 받은 사람 메일함에서 지워질 수 있습니다. 정말로 철회하시겠"
-"습니까?"
+msgstr "메시지를 철회하면 받는 사람의 메일함에서 제거될 수도 있습니다. 정말로 철회하시겠습니까?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
-msgstr "메세지를 성공적으로 철회했습니다"
+msgstr "메시지를 성공적으로 철회했습니다"
 
 #: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "메일 철회"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "그룹와이즈 메세지에 보내기 옵션 추가"
+msgid "Add Send Options to GroupWise messages"
+msgstr "그룹와이즈 메시지에 보내기 옵션 추가"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "그룹와이즈 계정 기능에 대한 플러그인."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "그룹웨어 기능"
+msgid "GroupWise Features"
+msgstr "그룹와이즈 기능"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
-msgstr "메세지 철회가 실패했습니다"
+msgstr "메시지 철회가 실패했습니다"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
-msgstr "선택한 메세지의 철회를 서버에서 허용하지 않았습니다."
+msgstr "선택한 메시지의 철회를 서버에서 허용하지 않았습니다."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17786,20 +17992,23 @@ msgstr "선택한 메세지의 철회를 서버에서 허용하지 않았습니�
 msgid "Invalid user"
 msgstr "잘못된 사용자"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "프록시 권한을 &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 "사용자 지정"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "이 사용자에게 이미 프록시 권한을 부여했습니다."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "프록시 권한을 부여하려면 올바른 사용자 이름을 지정해야 합니다."
 
@@ -17815,26 +18024,30 @@ msgstr "계정이 이미 있습니다"
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "&quot;{0}&quot; 사용자의 프록시 로그인이 실패했습니다. 전자메일 주소를 확인하고 다시 시도하십시오."
+msgstr ""
+"&quot;{0}&quot; 사용자의 프록시 로그인이 실패했습니다. 전자메일 주소를 확인하"
+"고 다시 시도하십시오."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "반복 모임입니다"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "받아들이시겠습니까?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "거부하시겠습니까?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "폴더를 지정한 &quot;{0}&quot; 사용자와 공유할 수 없습니다"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "이 폴더를 지정한 &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
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "목록에 추가할 사용자 이름을 지정해야 합니다"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17847,7 +18060,7 @@ msgstr "<b>사용자:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "C_ustomize notification message"
-msgstr "알림 메세지 사용자 설정(_U)"
+msgstr "알림 메시지 사용자 설정(_U)"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
@@ -17856,7 +18069,7 @@ msgstr "연락처(_T)..."
 #: ../plugins/groupwise-features/properties.glade.h:5
 #: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
-msgstr "메세지"
+msgstr "메시지"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
@@ -17896,7 +18109,7 @@ msgstr "연락처(_T)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr "폴더/옵션/규칙 바꾸기(_F)"
+msgstr "폴더/옵션/규칙 수정(_F)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
@@ -17924,7 +18137,8 @@ msgstr "쓰기(_W)"
 msgid "permission to read|_Read"
 msgstr "읽기(_R)"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "프록시"
 
@@ -17932,14 +18146,15 @@ msgstr "프록시"
 msgid "<b>Account Name</b>"
 msgstr "<b>계정 이름</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "프록시 로그인"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(사용자 %s)의 암호를 입력하십시오"
@@ -17947,20 +18162,26 @@ msgstr "%s%s(사용자 %s)의 암호를 입력하십시오"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "프록시 로그인(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "해당 계정이 온라인 상태일 경우에만 프록시 탭을 사용할 수 있습니다."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "해당 계정을 사용할 경우에만 프록시 탭을 사용할 수 있습니다."
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "고급 보내기 옵션"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "사용자"
 
@@ -17976,70 +18197,70 @@ msgstr "새 공유 폴더(_S)..."
 msgid "Sharing"
 msgstr "공유"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "사용자 지정 알림"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "추가   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
-msgstr "바꾸기"
+msgstr "수정"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
-msgstr "메세지 상태"
+msgstr "메시지 상태"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "제목:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "만든 날짜:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "받는 사람: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "전달: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "열기: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "수락: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "지움: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "거부: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "완료: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "전달되지 않음: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
-msgstr "메세지 상태 추적..."
+msgstr "메시지 상태 추적..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
@@ -18140,11 +18361,11 @@ msgstr "달력으로 가져오기"
 msgid "Imports ICS attachments to calendar."
 msgstr "ICS 첨부 파일을 달력으로 가져옵니다."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "하드웨어 추상화 레이어를 읽어들이지 못했습니다"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18153,11 +18374,11 @@ msgstr ""
 "스를 시작하고 프로그램을 다시 시작하십시오. 아니면 시스템 관리자에게 연락하십"
 "시오."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "아이팟 찾기가 실패했습니다"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -18165,8 +18386,8 @@ msgstr ""
 "동기화할 아이팟을 에볼루션에서 찾을 수 없습니다. 아이팟이 시스템에 연결이 되"
 "지 않았거나 전원이 꺼져 있습니다."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 형식 (.ics)"
 
@@ -18183,472 +18404,472 @@ msgstr "아이팟과 동기화"
 msgid "iPod Synchronization"
 msgstr "아이팟 동기화"
 
-#: ../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 "'%s' 달력을 읽어들이는 데 실패했습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../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 "'%s' 달력에 들어 있는 약속이 이 모임과 충돌합니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' 달력에 약속을 발견했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "달력을 하나도 찾을 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "어느 달력에서도 이 모임을 찾을 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "어느 작업 목록에서도 이 작업을 찾을 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "어느 메모 목록에서도 이 메모를 찾을 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "이 약속의 현재 버전을 찾는 중입니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "항목을 파싱할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목을 '%s' 달력에 보낼 수 없습니다.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력에 수락이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력에 미정이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력에 거절이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력에 취소라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보낼 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참석자를 업데이트할 수 없습니다. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "참석자 상태를 업데이트했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "메모 정보를 보낼 수 없습니다. 해당 메모가 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력이 잘못되었습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
-"메세지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 iCalendar가 아닙니"
+"메시지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 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:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "달력 안이 항목이 올바르지 않습니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
-"메세지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
+"메시지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
 "들어 있지 않습니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력에 여러 개의 항목이 들어 있습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "이 항목을 모두 처리하려면, 파일을 저장해서 그 달력을 가져와야 합니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "이 약속 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "이 작업 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "이 메모 반복"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
-msgstr "적용한 다음에 메세지 지우기(_D)"
+msgstr "적용한 다음에 메시지 삭제(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "충돌 찾기"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "충돌하는 모임을 찾을 달력을 선택하십시오"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "오늘"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "내일"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "내일 %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "내일 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%B %e일 %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %e일 %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Y년 %B %e일 %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y년 %B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y년 %B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 응답하십시오."
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 받음"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>님이 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>님이 다음 모임을 위임했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>님이 다음 모임을 취소했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 거절했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>님이 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b>님이 다음 작업에 %s님의 할당을 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>님이 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18656,7 +18877,7 @@ msgid ""
 msgstr ""
 "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18664,175 +18885,183 @@ msgid ""
 msgstr "<b>%s</b>님이 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
 # FIXME: through what?
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>님이 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b>님이 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b>님이 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 공유 메모를 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 다음 공유 메모를 취소했습니다:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "달력 열기(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "거부(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "거부(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "허용(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "모두 거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "모두 잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "모두 허용(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "정보 보내기(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "참석자 상태 업데이트(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "업데이트(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "시작 시각:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "마침 시각:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "설명:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "참석자에게 업데이트 보내기(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "모든 경우에 적용(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "시간을 약속 없음으로 표시(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "내 미리 알림 유지(_P)"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+msgid "_Inherit reminder"
+msgstr "미리 알림 상속(_I)"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "작업(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "메모:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
-msgstr "메세지의 텍스트/달력 부분을 표시합니다."
+msgstr "메시지의 텍스트/달력 부분을 표시합니다."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18855,7 +19084,7 @@ msgid ""
 msgstr ""
 "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "프록시 로그아웃(_L)"
 
@@ -18877,7 +19106,7 @@ msgstr "알림 영역에서 아이콘 깜박이기."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
-msgstr "D-Bus 메세지 사용."
+msgstr "D-Bus 메시지 사용."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Enable icon in notification area."
@@ -18885,29 +19114,31 @@ msgstr "알림 영역에서 아이콘 사용."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "새 메세지가 도착하면 D-BUS 메세지가 발생합니다."
+msgstr "새 메시지가 도착하면 D-BUS 메시지가 발생합니다."
 
 #: ../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 "새 메세지가 도착했을 때 참이면 삑 소리를 내고, 아니면 사운드 파일을 플레이합니다."
+msgstr ""
+"새 메시지가 도착했을 때 참이면 삑 소리를 내고, 아니면 사운드 파일을 플레이합"
+"니다."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr "받은 편지함의 경우에만 새 메세지 알림."
+msgstr "받은 편지함의 경우에만 새 메시지 알림."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
-msgstr "새 메세지가 도착하면 사운드 재생."
+msgstr "새 메시지가 도착하면 사운드 재생."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
-msgstr "아이콘과 같이 메세지 팝업 표시."
+msgstr "아이콘과 같이 메시지 팝업 표시."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "새 메세지가 도착했을 때 알림 영역에 새 메일 아이콘 표시."
+msgstr "새 메시지가 도착했을 때 알림 영역에 새 메일 아이콘 표시."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -18915,15 +19146,15 @@ msgstr "재생할 사운드 파일 이름."
 
 #: ../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 "새 메세지가 도착하면 재생할 사운드 파일, 삑 소리 모드가 아닐 경우."
+msgstr "새 메시지가 도착하면 재생할 사운드 파일, 삑 소리 모드가 아닐 경우."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "새 메세지가 도착하면 사운드를 재생할 지 삑 소리를 낼 지."
+msgstr "새 메시지가 도착하면 사운드를 재생할 지 삑 소리를 낼 지."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr "새 메세지가 도착하면 아이콘 위에 메세지를 표시할 지 여부."
+msgstr "새 메시지가 도착하면 아이콘 위에 메시지를 표시할 지 여부."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -18931,22 +19162,22 @@ msgstr "아이콘을 깜박일 지 여부."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
-msgstr "받은 편지함 폴더에만 새 메세지를 알릴 지 여부."
+msgstr "받은 편지함 폴더에만 새 메시지를 알릴 지 여부."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
-msgstr "D-Bus 메세지 보내기(_D)"
+msgstr "D-Bus 메시지 보내기(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "에볼루션 메일 알림"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "메일 알림 속성"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18955,67 +19186,67 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
-"새로 %d개의 메세지를 받았습니다.\n"
+"새로 %d개의 메시지를 받았습니다.\n"
 "(%s 폴더)"
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "새로 %d개의 메세지를 받았습니다."
+msgstr[0] "새로 %d개의 메시지를 받았습니다."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "새 메일"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "알림 영역에서 아이콘 표시(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "알림 영역에서 아이콘 깜박이기(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
-msgstr "아이콘과 같이 메세지 팝업 표시(_M)"
+msgstr "아이콘과 같이 메시지 팝업 표시(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
-msgstr "새 메세지가 도착하면 사운드 재생(_P)"
+msgstr "새 메시지가 도착하면 사운드 재생(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "삑 소리(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "사운드 파일 재생(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "파일 이름 지정(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "사운드 파일을 고르십시오"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "재생(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
-msgstr "받은 편지함의 경우에만 새 메세지 알림(_I)"
+msgstr "받은 편지함의 경우에만 새 메시지 알림(_I)"
 
 #: ../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 ""
-"새로운 메세지가 도착할 때마다 D-Bus 메세지를 보내거나 알림 영역의 아이콘과 알"
-"림 메세지로 사용자에게 알립니다."
+"새로운 메시지가 도착할 때마다 D-Bus 메시지를 보내거나 알림 영역의 아이콘과 알"
+"림 메시지로 사용자에게 알립니다."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -19025,7 +19256,7 @@ msgstr "새 메일 알림"
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr "메일 메세지 내용에서 모임을 만드는 플러그인."
+msgstr "메일 메시지 내용에서 모임을 만드는 플러그인."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -19052,7 +19283,7 @@ msgstr ""
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "메일 메세지 내용에서 작업을 만드는 플러그인."
+msgstr "메일 메시지 내용에서 작업을 만드는 플러그인."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -19065,7 +19296,7 @@ msgstr "메일에서 작업으로"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
-msgstr "선택한 메세지를 새 작업으로 바꿉니다"
+msgstr "선택한 메시지를 새 작업으로 바꿉니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19095,7 +19326,7 @@ msgstr "일반적인 메일링 리스트 명령을 제공합니다 (가입, 탈�
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
-msgstr "리스트에 메세지 보내기(_P)"
+msgstr "리스트에 메시지 보내기(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
@@ -19117,10 +19348,10 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"전자메일 메세지를 \"{0}\" URL로 보냅니다. 자동으로 메세지를 보낼 수도 있고, "
+"전자메일 메시지를 \"{0}\" URL로 보냅니다. 자동으로 메시지를 보낼 수도 있고, "
 "먼저 보고 바꿀 수도 있습니다.\n"
 "\n"
-"메세지를 보낸 후 조금만 기다리면 메일링 리스트에서 응답을 받게 됩니다."
+"메시지를 보낸 후 조금만 기다리면 메일링 리스트에서 응답을 받게 됩니다."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -19148,8 +19379,8 @@ msgstr "메일링 리스트로 전자메일을 보내시겠습니까?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19164,7 +19395,7 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
-"이 메세지의 {0} 헤더 형식이 잘못되어 처리할 수 없습니다.\n"
+"이 메시지의 {0} 헤더 형식이 잘못되어 처리할 수 없습니다.\n"
 "\n"
 "헤더: {1}"
 
@@ -19172,15 +19403,15 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "메세지에 이 동작에 필요한 헤더 정보가 들어 있지 않습니다."
+msgstr "메시지에 이 동작에 필요한 헤더 정보가 들어 있지 않습니다."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
-msgstr "메세지 편집(_E)"
+msgstr "메시지 편집(_E)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 msgid "_Send message"
-msgstr "메세지 보내기(_S)"
+msgstr "메시지 보내기(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
@@ -19188,7 +19419,7 @@ msgstr "리스트 담당자에게 연락(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트의 소유자에게 연락합니다"
+msgstr "이 메시지가 속한 메일링 리스트의 소유자에게 연락합니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -19200,27 +19431,27 @@ msgstr "리스트 사용 정보 받기(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트의 아카이브를 받습니다"
+msgstr "이 메시지가 속한 메일링 리스트의 아카이브를 받습니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트의 사용방법 정보를 받습니다"
+msgstr "이 메시지가 속한 메일링 리스트의 사용방법 정보를 받습니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트에 메세지를 게시합니다"
+msgstr "이 메시지가 속한 메일링 리스트에 메시지를 게시합니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트에 가입합니다"
+msgstr "이 메시지가 속한 메일링 리스트에 가입합니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "이 메세지가 속한 메일링 리스트에서 탈퇴합니다"
+msgstr "이 메시지가 속한 메일링 리스트에서 탈퇴합니다"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "리스트에 메세지 보내기(_P)"
+msgstr "리스트에 메시지 보내기(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
@@ -19232,13 +19463,15 @@ msgstr "리스트에서 탈퇴(_U)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
-msgstr "아래 폴더의 메세지도 표시하시겠습니까?"
+msgstr "아래 폴더의 메시지도 표시하시겠습니까?"
 
 #: ../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 "현재 폴더만 읽은 메세지로 표시하시겠습니까? 아니면 현재 폴더와 그 아래 폴더의 모든 메세지를 모두 읽은 메세지로 표시하시겠습니까?"
+msgstr ""
+"현재 폴더만 읽은 메시지로 표시하시겠습니까? 아니면 현재 폴더와 그 아래 폴더"
+"의 모든 메시지를 모두 읽은 메시지로 표시하시겠습니까?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
@@ -19254,27 +19487,11 @@ msgstr "모두 읽은 것으로 표시"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
-msgstr "메세지를 읽은 것으로 표시(_S)"
+msgstr "메시지를 읽은 것으로 표시(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr "폴더에 들어 있는 모든 메세지를 읽은 것으로 표시할 때 사용합니다"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "달력을 오프라인으로 표시"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "선택한 달력을 오프라인에서 볼 수 있도록 표시합니다."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "오프라인에서 사용할 수 없게 하기(_D)"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "오프라인에서 사용할 수 있게 하기(_M)"
+msgstr "폴더에 들어 있는 모든 메시지를 읽은 것으로 표시할 때 사용합니다"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -19344,19 +19561,19 @@ msgstr "일반 텍스트 모드"
 msgid "Prefer plain-text"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "HTML이 있으면 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "일반 텍스트만 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML 모드(_M)"
 
@@ -19368,6 +19585,18 @@ msgstr "에볼루션 프로파일러"
 msgid "Writes a log of profiling data events."
 msgstr "프로파일 데이터 이벤트를 기록합니다."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "PST 파일의 아웃룩 메시지를 가져옵니다"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "아웃룩 PST 가져오기"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "아웃룩 개인 폴더 (.pst)"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "달력을 웹에 게시할 수 있게 합니다"
@@ -19384,9 +19613,9 @@ msgstr "위치"
 msgid "_Publish Calendar Information"
 msgstr "달력 정보 게시(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "정말로 이 URL을 지우시겠습니까?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "정말로 이 위치를 제거하시겠습니까?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19425,7 +19654,7 @@ msgstr "게시 주기(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19433,9 +19662,9 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
-"공용 FTP\n"
-"FTP (로그인)\n"
+"보안 FTP (SSH)\n"
+"공개 FTP\n"
+"FTP (로그인 사용)\n"
 "Windows 공유\n"
 "WebDAV (HTTP)\n"
 "보안 WebDAV (HTTPS)\n"
@@ -19474,6 +19703,14 @@ msgstr ""
 "iCal\n"
 "약속 있음/없음"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "새 위치"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "위치 편집"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "헬로 파이썬"
@@ -19491,58 +19728,58 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "파이썬 EPlugin 로더 테스트 플러그인."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "파이썬으로 작성한 다른 플러그인을 읽어들이는 플러그인."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "파이썬 로더"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "스팸어새신 (내부에 포함)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "스팸어새신이 없습니다. 코드: %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 "파이프를 만드는 데 실패했습니다: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "프로세스 만든 뒤에 오류: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "스팸어새신 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "스팸어새신 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "스팸어새신에 대한 파이프가 실패했습니다. 오류 코드: %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 "스팸어새신을 사용할 수 없습니다."
 
-#: ../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 "이렇게 하면 스팸어새신이 더 안정적으로 작동하지만, 더 느립니다"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "원격 테스트 포함(_N)"
 
@@ -19555,20 +19792,20 @@ msgstr ""
 "신을 설치해야 합니다."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "스팸어새신 정크메일 플러그인"
+msgid "SpamAssassin Options"
+msgstr "스팸어새신 옵션"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "스팸어새신 옵션"
+msgid "SpamAssassin junk plugin"
+msgstr "스팸어새신 정크메일 플러그인"
 
 #: ../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 "메세지의 모든 첨부물이나 그 일부를 한 번에 저장하는 플러그인."
+msgstr "메시지의 모든 첨부물이나 그 일부를 한 번에 저장하는 플러그인."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "첨부 저장"
 
@@ -19580,15 +19817,15 @@ msgstr "첨부 저장..."
 msgid "Save all attachments"
 msgstr "모든 첨부 저장"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "저장할 위치 선택"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME 형식"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "저장"
 
@@ -19596,85 +19833,85 @@ msgstr "저장"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "설명 목록"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "분류 목록"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "메모 목록"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "만듦"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "연락처 목록"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "시작"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "끝"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "퍼센트 완료"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "참석자 목록"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "바뀜"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "CSV 형식의 고급 옵션"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "앞에 헤더 붙임"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "값 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "레코드 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "값을 둘러싸는 문자:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "콤마로 구분한 값 형식 (.csv)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
-msgstr "선택한 것 저장"
+msgstr "선택한 사항 저장"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
@@ -19689,15 +19926,15 @@ msgstr "디스크에 저장(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF 형식 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "대상 파일 선택"
 
@@ -19729,15 +19966,15 @@ msgstr "최초에 계정 설정을 할 때 안내합니다."
 msgid "Setup Assistant"
 msgstr "설정 도우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "에볼루션 설정 도우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "환영합니다"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19748,30 +19985,30 @@ msgstr ""
 "으로 전자메일 계정에 연결하도록 설정하고, 다른 프로그램에서 쓰던 파일들을 가"
 "져오게 됩니다.\n"
 "\n"
-"계속하시려면 \"다음\" 단추를 누르십시오. "
+"계속하시려면 \"앞으로\" 단추를 누르십시오. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "파일 가져오기"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "다음에서 가져오고 싶은 정보를 선택하십시오:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "데이터를 가져오는 중입니다."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
@@ -19779,7 +20016,7 @@ msgstr "잠시 기다리십시오"
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
-"메세지 글타래로 만들 때 글타래가 없으면 제목에 따라서 글타래를 만들 지 나타냅"
+"메시지 글타래로 만들 때 글타래가 없으면 제목에 따라서 글타래를 만들 지 나타냅"
 "니다."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
@@ -19788,28 +20025,28 @@ msgstr "제목 글타래"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr "제목에 따라 메세지를 글타래로 표시합니다"
+msgstr "제목에 따라 메시지를 글타래로 표시합니다"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
-msgstr "연관된 메세지가 아니더라도 제목에 따라 글타래로 만들기(_A)"
+msgstr "연관된 메시지가 아니더라도 제목에 따라 글타래로 만들기(_A)"
 
 #: ../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."
-msgstr "서식 플러그인에서 메세지 본문 대신 사용할 키/값 쌍의 목록."
+msgstr "서식 플러그인에서 메시지 본문 대신 사용할 키/값 쌍의 목록."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "제목 없음"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "서식으로 저장(_T)"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "서식으로 저장"
 
@@ -19818,7 +20055,7 @@ msgid "Drafts based template plugin"
 msgstr "메일 초안 기준 서식 플러그인"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "YTNEF를 사용해 TNEF 첨부를 디코딩하는 간단한 플러그인."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19844,7 +20081,7 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch 피하기(_A) (아파치 2.2.8 미만 버전에서 필요)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19922,7 +20159,11 @@ msgid ""
 "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 "참이면 프록시 서버에 연결할 때 인증이 필요합니다. 사용자 이름과 암호는 \"/apps/evolution/shell/network_config/authentication_user\" gconf 키에서 정의하고, 암호는 gnome-keyring이나 .gnome2_private/Evolution 암호 파일에서 가져옵니다."
+msgstr ""
+"참이면 프록시 서버에 연결할 때 인증이 필요합니다. 사용자 이름과 암호는 \"/"
+"apps/evolution/shell/network_config/authentication_user\" gconf 키에서 정의하"
+"고, 암호는 gnome-keyring이나 .gnome2_private/Evolution 암호 파일에서 가져옵니"
+"다."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
@@ -19980,7 +20221,7 @@ msgstr "보조 모음을 표시합니다"
 msgid "Skip development warning dialog"
 msgstr "개발 버전 경고 건너 뛰기"
 
-#: ../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 "오프라인 모드에서 시작"
 
@@ -20145,7 +20386,8 @@ msgstr "실행할 가져오기 종류를 선택하십시오:"
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
-msgstr "에볼루션으로 가져 올 파일을 선택하시고, 그 파일의 종류를 목록에서 고르십시오."
+msgstr ""
+"에볼루션으로 가져 올 파일을 선택하시고, 그 파일의 종류를 목록에서 고르십시오."
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -20188,7 +20430,7 @@ msgstr "에볼루션 기본 설정"
 
 #. 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 - 에볼루션"
@@ -20213,31 +20455,27 @@ msgstr "Bug buddy를 실행할 수 없습니다."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr-hackers@lists.kldp.net>"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "에볼루션 웹사이트"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "FAQ 웹페이지를 여는 중에 오류가 발생했습니다."
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20245,11 +20483,11 @@ msgstr ""
 "에볼루션은 현재 온라인 상태입니다.\n"
 "오프라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "에볼루션은 오프라인 상태로 가는 중입니다."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20257,33 +20495,33 @@ msgstr ""
 "에볼루션은 현재 오프라인 상태입니다.\n"
 "온라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "알 수 없는 시스템 오류."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld 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 "확인"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "인자가 잘못되었습니다"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF에 등록할 수 없습니다"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "설정 데이터베이스를 찾을 수 없습니다"
 
@@ -20327,8 +20565,8 @@ msgid "Importer Type"
 msgstr "가져오기 종류"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "가져오기 기능 선택"
+msgid "Select Information to Import"
+msgstr "가져올 정보를 선택하십시오"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20345,7 +20583,7 @@ msgstr ""
 "르십시오."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20379,7 +20617,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에\n"
 "기여해 주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20387,43 +20625,43 @@ msgstr ""
 "고맙습니다\n"
 "에볼루션 팀\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "에볼루션 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "강제로 모든 에볼루션 컴포넌트를 끝냅니다"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 에볼루션 1.4에서 다시 옮겨 옵니다"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "플러그인을 아무것도 읽어들이지 않습니다."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전자메일, 연락처, 작업의 미리 보기 창을 사용하지 않습니다."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- 에볼루션 개인정보 관리 및 메일 클라이언트"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20437,18 +20675,22 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "정말로 기억했던 모든 암호를 초기화하시겠습니까?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "에볼루션을 시작할 수 없습니다"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "계속"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
-msgstr "{0} 버전에서 과거 데이터를 지우시겠습니까?"
+msgstr "{0} 버전에서 과거 데이터를 삭제하시겠습니까?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "에볼루션을 시작할 수 없습니다."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20456,15 +20698,15 @@ msgstr ""
 "암호를 초기화하면 기억햇던 모든 암호를 지웁니다. 다음에 암호가 필요할 때 다"
 "시 물어보게 됩니다."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "업그레이드에 필요한 디스크 공간이 부족합니다."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
-msgstr "정말로 과거의 데이터를 지우시겠습니까?"
+msgstr "정말로 과거의 데이터를 삭제하시겠습니까?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20476,7 +20718,7 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"&quot;evolution&quot; 디렉토리의 전체 내용을 지우게 됩니다.\n"
+"&quot;evolution&quot; 디렉터리의 전체 내용을 지우게 됩니다.\n"
 "\n"
 "과거 데이터를 지우기 전에 수동으로 모든 메일, 연락처, 달력 데이터가 온전하게 "
 "남아 있는 지, 그리고 이 버전의 에볼루션이 올바르게 동작하는 지 확인하는 게 좋"
@@ -20485,9 +20727,9 @@ msgstr ""
 "일단 데이터를 지우면 수동으로 조작하지 않고서는 과거 버전 에볼루션으로 다운그"
 "레이드할 수 없습니다.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20496,15 +20738,13 @@ msgid ""
 msgstr ""
 "이전 버전의 에볼루션은 데이터를 지금 버전과 다른 위치에 저장했습니다.\n"
 "\n"
-"이 데이터를 지운다면, &quot;evolution&quot; 디렉토리의 모든 내용을 완전히 지"
-"우게 됩니다. 이 데이터를 유지한다면, 나중에 지우고 싶을 때 수동으로 &quot;"
-"evolution*&quot;의 내용을 지울 수 있습니다.\n"
+"이 데이터를 지운다면, &quot;evolution&quot; 디렉터리의 모든 내용을 완전히 제거하게 됩니다. 이 데이터를 유지한다면, 나중에 지우고 싶을 때 수동으로 &quot;evolution*&quot;의 내용을 제거하면 됩니다.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "이전 버전에서 업그레이드하는 데 실패했습니다: {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"
@@ -20515,9 +20755,9 @@ msgstr ""
 "데이터와 설정을 업그레이드하면 {0}의 디스크 공간이 필요합니다. 하지만 {1}만 "
 "남아 있습니다.\n"
 "\n"
-"계속 하시기 전에, 홈 디렉토리에 공간을 더 확보해야 합니다."
+"계속 하시기 전에, 홈 디렉터리에 공간을 더 확보해야 합니다."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20527,7 +20767,7 @@ msgstr ""
 "\n"
 "자세한 정보는 도움말을 누르십시오."
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20541,20 +20781,20 @@ msgstr ""
 "\n"
 "자세한 정보는 도움말을 누르십시오."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "암호 초기화(_F)"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "데이터 유지(_K)"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "나중에 알림(_R)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20622,7 +20862,7 @@ msgid "Purposes"
 msgstr "목적"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "일련 번호"
 
@@ -20740,7 +20980,7 @@ msgstr ""
 "어떤 목적이든 이 인증기관을 신뢰하기 전에, 그 인증서와 정책과 (있다면) 프로시"
 "저를 확인해야 합니다."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "인증서"
 
@@ -20817,11 +21057,11 @@ msgstr "소속 구분 (Organizational Unit, OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 핑거프린트"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL 클라이언트 인증서"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL 서버 인증서"
 
@@ -20867,182 +21107,182 @@ msgid "_Edit CA Trust"
 msgstr "인증 기관 신뢰수준 편집(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "서명"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "암호화"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "버전"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "버전 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "버전 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "버전 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2, RSA 암호화"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5, RSA 암호화"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1, RSA 암호화"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 암호화"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "인증서 키 용도"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "넷스케이프 인증서 타입"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "인증 기관 키 ID"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "오브젝트 ID (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "알고리즘 ID"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "알고리즘 인수"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "소유자 공개 키 정보"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "소유자 공개 키 알고리즘"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "소유자의 공개 키"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "오류: 추가 항목을 처리할 수 없습니다"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "오브젝트 서명자"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL 인증 기관"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "전자메일 인증 기관"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "서명"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "거부할 수 없음"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "키 암호화"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "데이터 암호화"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "키 계약"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "인증서 서명자"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL 서명자"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "중요함"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "중요하지 않음"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "확장 기능"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "인증서 서명 알고리즘"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "발급자"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "발급자 고유 ID"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "소유자 고유 ID"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "인증서 서명 값"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 파일 암호"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 파일의 암호를 입력하십시오:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "가져온 인증서"
 
@@ -21063,6 +21303,7 @@ msgstr "%s (%s) 프로그램을 강제로 끝내는 중입니다\n"
 msgid "Address _Book Properties"
 msgstr "주소록 속성(_B)"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
 msgstr "선택한 폴더의 속성을 바꿉니다"
@@ -21080,22 +21321,26 @@ msgstr "연락처 미리 보기(_P)"
 msgid "Copy"
 msgstr "복사"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "선택한 연락처를 다른 폴더로 복사..."
+msgid "Copy selected contacts to another folder"
+msgstr "선택한 연락처를 다른 폴더로 복사"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "선택한 폴더의 연락처를 다른 폴더로 복사합니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "선택한 것을 복사합니다"
+msgstr "선택한 사항을 복사합니다"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "폴더로 복사..."
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new address book folder"
 msgstr "새 주소록 폴더를 만듭니다"
@@ -21105,21 +21350,24 @@ msgstr "새 주소록 폴더를 만듭니다"
 msgid "Cut"
 msgstr "잘라내기"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "선택한 것을 잘라냅니다"
+msgstr "선택한 사항을 잘라냅니다"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "주소록 지우기(_E)"
+msgstr "주소록 삭제(_E)"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
-msgstr "선택한 연락처를 지웁니다"
+msgstr "선택한 연락처를 삭제합니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "선택한 폴더를 지웁니다"
+msgstr "선택한 폴더를 삭제합니다"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
@@ -21129,10 +21377,12 @@ msgstr "주소 전달"
 msgid "Mo_ve All Contacts To..."
 msgstr "모든 연락처 이동(_V)..."
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "선택한 연락처를 다른 폴더로 옮기기..."
+msgid "Move selected contacts to another folder"
+msgstr "선택한 연락처를 다른 폴더로 옮기기"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
 msgstr "선택한 폴더의 연락처를 다른 폴더로 옮깁니다"
@@ -21144,23 +21394,27 @@ msgstr "폴더로 이동..."
 #: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
-msgstr "붙여 넣기"
+msgstr "붙여넣기"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "클립보드에서 붙여 넣습니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "인쇄할 연락처를 미리 봅니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "선택한 연락처를 인쇄합니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "선택한 폴더 이름 바꾸기"
+msgstr "선택한 폴더 이름을 바꿉니다"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
@@ -21170,15 +21424,17 @@ msgstr "주소록을 VCard로 저장(_A)"
 msgid "Save as VCard..."
 msgstr "VCard로 저장..."
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "선택한 연락처를 VCard로 저장합니다."
+msgid "Save selected contacts as a VCard"
+msgstr "선택한 연락처를 VCard로 저장합니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "선택한 폴더의 연락처를 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 "모두 선택"
 
@@ -21190,18 +21446,22 @@ msgstr "전부 선택(_A)"
 msgid "Select all contacts"
 msgstr "모든 연락처 선택"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "선택한 연락처로 메세지를 보냅니다."
+msgid "Send a message to the selected contacts"
+msgstr "선택한 연락처로 메시지를 보냅니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
-msgstr "연락처로 메세지 보내기"
+msgstr "연락처로 메시지를 보냅니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "선택한 연락처를 다른 사람에게 보냅니다."
+msgid "Send selected contacts to another person"
+msgstr "선택한 연락처를 다른 사람에게 보냅니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "연락처 미리 보기 창을 봅니다"
@@ -21214,15 +21474,17 @@ msgstr "중지(_O)"
 msgid "Stop"
 msgstr "중지"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "읽어들이기를 중지합니다"
 
+# tooltip
 #: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "현재 연락처를 봅니다"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "실행(_A)"
@@ -21237,7 +21499,7 @@ msgstr "폴더 연락처를 복사(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
-msgstr "연락처 지우기(_D)"
+msgstr "연락처 삭제(_D)"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
@@ -21269,7 +21531,7 @@ msgstr "폴더 연락처를 VCard로 저장(_S)"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "연락처로 메세지 보내기(_S)..."
+msgstr "연락처로 메시지 보내기(_S)..."
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -21277,19 +21539,19 @@ msgstr "하루"
 
 #: ../ui/evolution-calendar.xml.h:6
 msgid "Delete _all Occurrences"
-msgstr "모든 경우 지우기(_A)"
+msgstr "모든 경우 삭제(_A)"
 
 #: ../ui/evolution-calendar.xml.h:7
 msgid "Delete all occurrences"
-msgstr "모든 경우를 지웁니다"
+msgstr "모든 경우를 삭제합니다"
 
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
-msgstr "약속을 지웁니다"
+msgstr "약속을 삭제합니다"
 
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
-msgstr "이 항목을 지웁니다"
+msgstr "이 항목을 삭제합니다"
 
 #: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
@@ -21312,7 +21574,7 @@ msgid "Month"
 msgstr "한 달"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "다음"
 
@@ -21321,7 +21583,7 @@ msgid "Previews the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "이전"
 
@@ -21331,11 +21593,11 @@ msgstr "이 달력을 인쇄합니다"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
-msgstr "비우기(_E)"
+msgstr "완전히 지우기(_E)"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "지나간 약속과 모임을 지웁니다"
+msgstr "지나간 약속과 모임을 완전히 지웁니다"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
@@ -21377,15 +21639,23 @@ msgstr "한 주의 근무일을 봅니다"
 msgid "View the current appointment"
 msgstr "현재 약속을 봅니다"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "디버깅 콘솔에서 로그 메시지를 봅니다"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "한 주씩"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "근무 주"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "디버깅 기록(_D)"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
@@ -21411,7 +21681,7 @@ msgstr "새 메일 필터 규칙을 만들거나 편집합니다"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr "오프라인으로 표시한 계정/폴더에 대한 메세지를 다운로드합니다"
+msgstr "오프라인으로 표시한 계정/폴더에 대한 메시지를 다운로드합니다"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
@@ -21428,7 +21698,7 @@ msgstr "선택한 폴더를 다른 폴더로 옮깁니다"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "모든 폴더의 지워진 메세지를 완전히 지웁니다"
+msgstr "모든 폴더의 삭제한 메시지를 완전히 제거합니다"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -21436,15 +21706,15 @@ msgstr "찾기 폴더(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
-msgstr "메세지 미리보기 보기(_P)"
+msgstr "메시지 미리보기 보기(_P)"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
-msgstr "메세지 목록 아래에 메세지 미리 보기를 표시합니다"
+msgstr "메시지 목록 아래에 메시지 미리 보기를 표시합니다"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "메세지 미리 보기를 메세지 목록 옆에 나란히 표시합니다"
+msgstr "메시지 미리 보기를 메시지 목록 옆에 나란히 표시합니다"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
@@ -21454,10 +21724,6 @@ msgstr "미리 보기 창을 표시합니다"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "원격 서버의 폴더를 구독/구독해지 합니다"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "디버깅 콘솔에서 로그 메세지를 봅니다"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "전통적으로 보기(_C)"
@@ -21466,17 +21732,13 @@ msgstr "전통적으로 보기(_C)"
 msgid "_Copy Folder To..."
 msgstr "폴더 복사(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "디버깅 기록(_D)"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
-msgstr "오프라인 사용 용도로 메세지 다운로드(_D)"
+msgstr "오프라인 사용 용도로 메시지 다운로드(_D)"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
-msgstr "메세지 필터(_M)"
+msgstr "메시지 필터(_M)"
 
 #: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
@@ -21494,8 +21756,8 @@ msgstr "미리 보기(_P)"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "구독(_S)"
+msgid "_Subscriptions..."
+msgstr "구독(_S)..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -21515,16 +21777,16 @@ msgstr "모든 글타래 접기(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
-msgstr "모든 메세지 글타래를 접습니다"
+msgstr "모든 메시지 글타래를 접습니다"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
-msgstr "선택한 메세지를 클립보드로 복사합니다"
+msgstr "선택한 메시지를 클립보드로 복사합니다"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
-msgstr "선택한 메세지를 클립보드로 잘라 냅니다"
+msgstr "선택한 메시지를 클립보드로 잘라 냅니다"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
@@ -21532,52 +21794,48 @@ msgstr "모든 글타래 펼치기(_X)"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
-msgstr "지운 메세지 비우기(_X)"
+msgstr "완전히 삭제(_X)"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "모든 메세지 글타래의 지운 메세지를 비웁니다."
+msgstr "모든 메시지 글타래의 지운 메시지를 비웁니다."
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "선택한 메세지 숨기기(_E)"
+msgstr "선택한 메시지 숨기기(_E)"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
-msgstr "지운 메세지 숨기기(_D)"
+msgstr "지운 메시지 숨기기(_D)"
 
 #: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
-msgstr "읽은 메세지 숨기기(_R)"
+msgstr "읽은 메시지 숨기기(_R)"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "지운 메세지를 취소선을 긋는 대신 숨깁니다"
+msgstr "지운 메시지를 취소선을 긋는 대신 숨깁니다"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
-msgstr "모든 메세지를 읽은 것으로 표시(_K)"
+msgstr "모든 메시지를 읽은 것으로 표시(_K)"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Mark all messages in the folder as read"
-msgstr "폴더의 모든 메세지를 읽은 것으로 표시합니다"
+msgstr "폴더의 모든 메시지를 읽은 것으로 표시합니다"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
-msgstr "클립보드에서 메세지를 붙여 넣습니다"
+msgstr "클립보드에서 메시지를 붙여 넣습니다"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "이 폴더의 지워진 모든 메세지를 완전히 지웁니다"
+msgstr "이 폴더의 삭제한 모든 메시지를 완전히 제거합니다"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
-msgstr "이 폴더를 완전히 지웁니다"
-
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "새로 고침(_F)..."
+msgstr "이 폴더를 완전히 제거합니다"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
@@ -21585,51 +21843,51 @@ msgstr "폴더를 새로 고침"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select Message S_ubthread"
-msgstr "메세지 아래 글타래 선택(_U)"
+msgstr "메시지 아래 글타래 선택(_U)"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
-msgstr "메세지 글타래 선택(_T)"
+msgstr "메시지 글타래 선택(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
-msgstr "모든 메세지 선택(_A)"
+msgstr "모든 메시지 선택(_A)"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr "현재 선택되지 않은 메세지만 선택합니다"
+msgstr "현재 선택되지 않은 메시지만 선택합니다"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
-msgstr "선택한 메세지와 같은 글타래의 모든 메세지를 선택합니다"
+msgstr "선택한 메시지와 같은 글타래의 모든 메시지를 선택합니다"
 
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Select all replies to the currently selected message"
-msgstr "현재 선택한 메세지의 답장을 모두 선택합니다"
+msgstr "현재 선택한 메시지의 답장을 모두 선택합니다"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
-msgstr "모든 보이는 메세지 선택"
+msgstr "모든 보이는 메시지 선택"
 
 #: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
-msgstr "숨긴 메세지 보기(_N)"
+msgstr "숨긴 메시지 보기(_N)"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr "임시로 숨긴 메세지를 보이게 합니다"
+msgstr "임시로 숨긴 메시지를 보이게 합니다"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
-msgstr "이미 읽은 모든 메세지를 임시로 숨깁니다"
+msgstr "이미 읽은 모든 메시지를 임시로 숨깁니다"
 
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
-msgstr "선택한 메세지를 임시로 숨깁니다"
+msgstr "선택한 메시지를 임시로 숨깁니다"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
-msgstr "연관된 메세지 목록"
+msgstr "연관된 메시지 목록"
 
 #: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
@@ -21638,7 +21896,7 @@ msgstr "글타래로 묶음(_G)"
 #: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "메세지(_M)"
+msgstr "메시지(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -21651,15 +21909,15 @@ msgstr "필터 적용(_P)"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "보낸 사람을 주소록에 더합니다"
+msgstr "보낸 사람을 주소록에 추가합니다"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
-msgstr "모든 메세지 머리말(_H)"
+msgstr "모든 메시지 머리말(_H)"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
-msgstr "선택한 메세지에 필터 규칙을 적용합니다"
+msgstr "선택한 메시지에 필터 규칙을 적용합니다"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
@@ -21667,27 +21925,27 @@ msgstr "정크메일 검사(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "새 메세지 작성(_N)"
+msgstr "새 메시지 작성(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "이 메세지를 받은 모든 사람에게 회신을 만듭니다"
+msgstr "이 메시지를 받는 모든 사람에게 회신을 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "선택한 메세지의 메일링 리스트로 회신을 만듭니다"
+msgstr "선택한 메시지의 메일링 리스트로 회신을 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
-msgstr "이 메세지를 보낸사람에게 회신을 만듭니다"
+msgstr "이 메시지를 보낸사람에게 회신을 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
-msgstr "선택한 메세지를 다른 폴더로 복사합니다"
+msgstr "선택한 메시지를 다른 폴더로 복사합니다"
 
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
-msgstr "선택한 메세지를 클립보드로 복사합니다"
+msgstr "선택한 메시지를 클립보드로 복사합니다"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
@@ -21711,23 +21969,23 @@ msgstr "이 제목으로 찾기 폴더를 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
-msgstr "이 보낸 사람이 보낸 메세지를 필터 규칙으로 만듭니다"
+msgstr "이 보낸 사람이 보낸 메시지를 필터 규칙으로 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr "이 받는 사람에게 보낸 메세지를 필터 규칙으로 만듭니다"
+msgstr "이 받는 사람에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "이 메일링 리스트에게 보낸 메세지를 필터 규칙으로 만듭니다"
+msgstr "이 메일링 리스트에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
-msgstr "이 제목으로 도착한 메세지를 필터 규칙으로 만듭니다"
+msgstr "이 제목으로 도착한 메시지를 필터 규칙으로 만듭니다"
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
-msgstr "선택한 메세지를 클립보드로 잘라 냅니다"
+msgstr "선택한 메시지를 클립보드로 잘라 냅니다"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -21735,11 +21993,11 @@ msgstr "글자 크기를 줄입니다"
 
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
-msgstr "다음의 중요한 메세지를 보여줍니다"
+msgstr "다음의 중요한 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
-msgstr "다음의 메세지를 보여줍니다"
+msgstr "다음의 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
@@ -21747,19 +22005,19 @@ msgstr "다음의 글타래를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
-msgstr "다음의 읽지 않은 메세지를 보여줍니다"
+msgstr "다음의 읽지 않은 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
-msgstr "이전의 중요한 메세지를 보여줍니다"
+msgstr "이전의 중요한 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
-msgstr "이전의 메세지를 보여줍니다"
+msgstr "이전의 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
-msgstr "이전의 읽지 않은 메세지를 보여줍니다"
+msgstr "이전의 읽지 않은 메시지를 보여줍니다"
 
 # inline, attached, quoted 따위
 #: ../ui/evolution-mail-message.xml.h:33
@@ -21784,11 +22042,11 @@ msgstr "제목에 대한 필터(_S)..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "선택한 메세지를 정크메일인지 필터링합니다"
+msgstr "선택한 메시지를 정크메일인지 필터링합니다"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "선택한 메세지에 추가 작업 플래그를 표시합니다"
+msgstr "선택한 메시지에 추가 작업 플래그를 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -21796,23 +22054,23 @@ msgstr "추가 작업(_U)..."
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
-msgstr "HTML 메일의 그림들을 강제로 읽어들입니다"
+msgstr "HTML 메일의 그림을 강제로 읽어들입니다"
 
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr "선택한 메세지를 새 메세지의 본문으로 전달합니다"
+msgstr "선택한 메시지를 새 메시지의 본문으로 전달합니다"
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr "선택한 메세지를 회신처럼 인용하여 전달합니다"
+msgstr "선택한 메시지를 회신처럼 인용하여 전달합니다"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
-msgstr "선택한 메세지를 다른 사람에게 전달합니다"
+msgstr "선택한 메시지를 다른 사람에게 전달합니다"
 
 #: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
-msgstr "선택한 메세지를 다른 사람에게 첨부하여 전달합니다"
+msgstr "선택한 메시지를 다른 사람에게 첨부하여 전달합니다"
 
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
@@ -21824,39 +22082,39 @@ msgstr "표시(_K)"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
-msgstr "선택한 메세지를 읽은 것으로 표시합니다"
+msgstr "선택한 메시지를 읽은 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
-msgstr "선택한 메세지를 중요한 것으로 표시합니다"
+msgstr "선택한 메시지를 중요한 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
-msgstr "선택한 메세지를 정크메일로 표시합니다"
+msgstr "선택한 메시지를 정크메일로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
-msgstr "선택한 메세지를 정크메일이 아닌 것으로 표시합니다"
+msgstr "선택한 메시지를 정크메일이 아닌 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
-msgstr "선택한 메세지를 읽지 않은 것으로 표시합니다"
+msgstr "선택한 메시지를 읽지 않은 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
-msgstr "선택한 메세지를 중요하지 않은 것으로 표시합니다"
+msgstr "선택한 메시지를 중요하지 않은 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
-msgstr "선택한 메세지를 지운 것으로 표시합니다"
+msgstr "선택한 메시지를 지운 것으로 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "선택한 메세지를 다른 폴더로 옮깁니다"
+msgstr "선택한 메시지를 다른 폴더로 옮깁니다"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
-msgstr "다음 중요한 메세지(_I)"
+msgstr "다음 중요한 메시지(_I)"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
@@ -21865,7 +22123,7 @@ msgstr "다음 글타래(_T)"
 # 주의: 아래의 Previous Unread Message와 같은 형태로 번역
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
-msgstr "읽지 않은 다음 메세지(_U)"
+msgstr "읽지 않은 다음 메시지(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
@@ -21873,29 +22131,29 @@ msgstr "정크 아님"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
-msgstr "메일 메세지를 작성하는 창을 엽니다"
+msgstr "메일 메시지를 작성하는 창을 엽니다"
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
-msgstr "선택한 메세지를 새 창에서 엽니다"
+msgstr "선택한 메시지를 새 창에서 엽니다"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
-msgstr "선택한 메세지를 메일 작성에서 열어서 편집합니다"
+msgstr "선택한 메시지를 메일 작성에서 열어서 편집합니다"
 
 # 주의: 위의 Next Unread Message와 같은 형태로 번역
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
-msgstr "읽지 않은 이전 메세지(_R)"
+msgstr "읽지 않은 이전 메시지(_R)"
 
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
-msgstr "클립보드에서 메세지를 붙여 넣습니다"
+msgstr "클립보드에서 메시지를 붙여 넣습니다"
 
 # post -> 게시, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
-msgstr "폴더에 새 메세지 게시(_T)"
+msgstr "폴더에 새 메시지 게시(_T)"
 
 # post -> 게시, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:69
@@ -21906,17 +22164,17 @@ msgstr "회신 게시(_Y)"
 # public -> 공용, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
-msgstr "메세지를 공용 폴더에 게시합니다"
+msgstr "메시지를 공용 폴더에 게시합니다"
 
 # post -> 게시, Microsoft Office XP 참고
 # public -> 공용, Microsoft Office XP 참고
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
-msgstr "공용 폴더의 메세지에 대해 회신을 게시합니다"
+msgstr "공용 폴더의 메시지에 대해 회신을 게시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
-msgstr "이전의 중요한 메세지(_E)"
+msgstr "이전의 중요한 메시지(_E)"
 
 #: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
@@ -21924,7 +22182,7 @@ msgstr "인쇄할 메시지를 미리봅니다"
 
 #: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
-msgstr "이 메세지를 인쇄합니다"
+msgstr "이 메시지를 인쇄합니다"
 
 #: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
@@ -21932,7 +22190,7 @@ msgstr "수신만 변경(_D)"
 
 #: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "선택한 메세지의 수신자를 누군가로 변경합니다 (반송합니다)"
+msgstr "선택한 메시지의 수신자를 누군가로 변경합니다 (반송합니다)"
 
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
@@ -21940,7 +22198,7 @@ msgstr "글자를 원래 크기로 맞춥니다"
 
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
-msgstr "선택한 메세지를 텍스트 파일로 저장합니다"
+msgstr "선택한 메시지를 텍스트 파일로 저장합니다"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
@@ -21960,7 +22218,7 @@ msgstr "보낸 사람에 대한 찾기 폴더(_D)..."
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
+msgstr "보이는 메시지의 본문에서 텍스트를 찾습니다"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
@@ -21968,7 +22226,7 @@ msgstr "모든 텍스트 선택(_A)"
 
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "메세지의 모든 텍스트를 선택합니다"
+msgstr "메시지의 모든 텍스트를 선택합니다"
 
 #: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
@@ -21976,19 +22234,19 @@ msgstr "현재 프린터의 페이지 설정을 합니다"
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "표시하는 메세지의 본문 안에 깜박이는 커서를 표시합니다"
+msgstr "표시하는 메시지의 본문 안에 깜박이는 커서를 표시합니다"
 
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages with all email headers"
-msgstr "메일의 모든 헤더와 함께 메세지를 보여줍니다"
+msgstr "메일의 모든 헤더와 함께 메시지를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
-msgstr "메세지의 메일 소스를 보여줍니다"
+msgstr "메시지의 메일 소스를 보여줍니다"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
-msgstr "선택한 메세지를 되살립니다"
+msgstr "선택한 메시지를 되살립니다"
 
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
@@ -22008,15 +22266,15 @@ msgstr "캐릿 모드(_C)"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
-msgstr "플래그 비우기(_C)"
+msgstr "플래그 지우기(_C)"
 
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
-msgstr "메세지 지우기(_D)"
+msgstr "메시지 삭제(_D)"
 
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "메세지에서 찾기(_F)..."
+msgstr "메시지에서 찾기(_F)..."
 
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
@@ -22044,11 +22302,11 @@ msgstr "그림 읽어들이기(_L)"
 
 #: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
-msgstr "메세지 원본(_M)"
+msgstr "메시지 원본(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
-msgstr "다음 메세지(_N)"
+msgstr "다음 메시지(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
@@ -22064,7 +22322,7 @@ msgstr "새 창에서 열기(_O)"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
-msgstr "이전 메세지(_P)"
+msgstr "이전 메시지(_P)"
 
 #: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
@@ -22077,11 +22335,11 @@ msgstr "읽기(_R)"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "메세지 저장(_S)..."
+msgstr "메시지 저장(_S)..."
 
 #: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "메세지 되살리기(_U)"
+msgstr "메시지 되살리기(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
@@ -22113,7 +22371,7 @@ msgstr "선택한 메모를 잘라냅니다"
 
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
-msgstr "선택한 메모를 지웁니다"
+msgstr "선택한 메모를 삭제합니다"
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
@@ -22145,11 +22403,11 @@ msgstr "선택한 작업을 잘라냅니다"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "끝마친 작업을 지웁니다"
+msgstr "끝마친 작업을 삭제합니다"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "선택한 작업을 지웁니다"
+msgstr "선택한 작업을 삭제합니다"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
@@ -22429,7 +22687,7 @@ msgstr "제목별로(_B)"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "추가 작업 메세지 플래그별로(_F)"
+msgstr "추가 작업 메시지 플래그별로(_F)"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
@@ -22437,7 +22695,7 @@ msgstr "옆으로 길게 보기(_W)"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
-msgstr "메세지(_M)"
+msgstr "메시지(_M)"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
@@ -22507,18 +22765,18 @@ msgid "Define Views for \"%s\""
 msgstr "\"%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "도표"
 
 # NOTE: 겉으로 나오는 번역이 아니므로 번역이 별로 의미없음.  view의 instance.
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "인스턴스"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "현재 뷰 저장"
 
@@ -22531,42 +22789,42 @@ msgid "_Replace existing view"
 msgstr "현재 뷰 바꾸기(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "사용자 보기"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "사용자 보기 저장"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "보기 지정..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "현재 보기(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "보기 선택: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "현재 보기는 사용자 정의 보기입니다"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "사용자 보기 저장..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "현재 사용자 보기 저장"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "보기 만들기 또는 편집"
 
@@ -22590,17 +22848,17 @@ msgstr "뷰 종류"
 msgid "Type of view:"
 msgstr "뷰 종류:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "첨부 모음"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%s 파일을 첨부할 수 없습니다: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s 파일을 첨부할 수 없습니다: 일반 파일이 아닙니다"
@@ -22622,84 +22880,84 @@ msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 권하기"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1272
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%Y년 %B"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "달별 달력"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "채우기 색"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "GDK 채우기 색"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "스티플 채우기"
 
-#: ../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 "최소 너비"
 
-#: ../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 "최소 너비"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "공백"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "현재"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "퍼센트 값은 0과 100을 포함하여 그 사이어야 합니다."
 
@@ -22721,7 +22979,7 @@ msgstr "중국어"
 
 #: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
-msgstr "키릴어"
+msgstr "키릴 문자"
 
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
@@ -22798,86 +23056,86 @@ msgstr "그 외..."
 msgid "Ch_aracter Encoding"
 msgstr "문자 인코딩(_A)"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "날짜 및 시간"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "날짜 입력하는 텍스트 엔트리"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "달력을 보려면 단추를 누르십시오"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "시간을 선택하는 드롭다운 콤보 상자"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "현재(_W)"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "오늘(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "날짜 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "시간 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "확장됨"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "확장 단추가 확장되었는 지 여부"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "확장 단추의 레이블 텍스트"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "밑줄 사용"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 "참일 경우, 텍스트에서 밑줄을 쓰면 그 다음 문자가 빨리 가기 키로 쓰입니다"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "레이블과 하위 위젯 사이에 넣을 공백"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "레이블 위젯"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "일반적인 확장 단추 레이블 대신에 표시할 위젯"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "확장 단추 크기"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "확장 화살표의 크기"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "표시 여백"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "확장 화살표 주위의 여백"
 
@@ -22926,7 +23184,7 @@ msgstr "현재 폴더"
 
 #: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
-msgstr "현재 메세지"
+msgstr "현재 메시지"
 
 #: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
@@ -22944,11 +23202,11 @@ msgstr ""
 "마우스를 이용해 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 드롭다운 "
 "콤보 상자를 이용해 시간대를 선택해야 합니다."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "인라인"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "단추 상태가 온라인입니다."
 
@@ -22964,75 +23222,75 @@ msgstr "개인 정보 동기화:"
 msgid "Sync Categories:"
 msgstr "동기화 분류:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
-msgstr "빈 메세지"
+msgstr "빈 메시지"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "리플로우 모델"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "열 너비"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "찾기"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "찾기 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "찾기(_S)"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
-msgstr "비우기(_C)"
+msgstr "지우기(_C)"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "항목 ID"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "텍스트"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "보기(_W): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "찾기(_C): "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " 위치(_N) : "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "커서 행"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "커서 열"
 
@@ -23070,7 +23328,7 @@ msgstr "<b>상태 추적</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "보낸 항목 자동으로 지우기(_U)"
+msgstr "보낸 항목 자동으로 삭제(_U)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -23157,7 +23415,7 @@ msgstr "모든 정보(_A)"
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
-msgstr "메세지 배달 지연(_D)"
+msgstr "메시지 배달 지연(_D)"
 
 #: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
@@ -23180,19 +23438,19 @@ msgid "_When opened:"
 msgstr "열면(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "URL로 가려면 여기를 누르십시오"
 
@@ -23232,23 +23490,23 @@ msgstr "포커스한 열"
 msgid "Unselected Column"
 msgstr "선택 해제한 열"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "취소선 열"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "밑줄 열"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "굵은 글자 열"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "색깔 있는 열"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "배경색 열"
 
@@ -23286,7 +23544,7 @@ msgid "A_vailable Fields:"
 msgstr "사용 가능한 필드(_V):"
 
 #: ../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 "증가"
 
@@ -23299,7 +23557,7 @@ msgid "Clear _All"
 msgstr "모두 지우기(_A)"
 
 #: ../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 "감소"
 
@@ -23360,16 +23618,16 @@ msgid "_Sort..."
 msgstr "정렬(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "끌어놓기 코드"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "완전한 제목"
 
@@ -23405,7 +23663,7 @@ msgstr[0] "%s (%d개 항목)"
 #: ../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 "행에 색 교차"
 
@@ -23413,8 +23671,8 @@ msgstr "행에 색 교차"
 #: ../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:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "가로 격자 그리기"
 
@@ -23422,8 +23680,8 @@ msgstr "가로 격자 그리기"
 #: ../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:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "세로 격자 그리기"
 
@@ -23431,8 +23689,8 @@ msgstr "세로 격자 그리기"
 #: ../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:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "포커스 그리기"
 
@@ -23440,7 +23698,7 @@ msgstr "포커스 그리기"
 #: ../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 "커서 모드"
 
@@ -23448,7 +23706,7 @@ msgstr "커서 모드"
 #: ../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 "선택 모델"
 
@@ -23456,9 +23714,9 @@ msgstr "선택 모델"
 #: ../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:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "길이 한계치"
 
@@ -23466,9 +23724,9 @@ msgstr "길이 한계치"
 #: ../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:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "행 높이 통일"
 
@@ -23479,215 +23737,326 @@ msgstr "행 높이 통일"
 msgid "Frozen"
 msgstr "고정"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "현재 뷰 사용자 설정하기"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "오름차순 정렬 (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "내림차순 정렬(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "정렬 안함(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "이 범위로 묶음(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "상자로 묶음(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
-msgstr "열 지우기(_C)"
+msgstr "열 제거(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "열 추가(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "정렬(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "자동 맞춤(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "열 형식(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "현재 보기 사용자 설정(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "정렬 기준(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "글꼴 설명"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "정렬 정보"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "트리"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "테이블 헤더"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "테이블 모델"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "커서 행"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "언제나 찾기"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "추가하려면 누르기 사용"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ETree 테이블 어댑터"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "리트로 모양"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "선과 +/- 확장 버튼을 그립니다."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "입력기"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "이벤트 처리기"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "굵은 글씨"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "취소선"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "연결"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "맞춤"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "자르기 너비"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "자르기 높이"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "자르기"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "자르기 사각형"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "가로 오프셋"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "세로 오프셋"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "텍스트 너비"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "텍스트 높이"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "말줄임표 사용"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "말줄임표"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "줄 바꿈"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "끊김 문자"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "최대 줄 수"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "테두리 그리기"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "줄바꿈 허용"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "배경 그리기"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "단추 그리기"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "커서 위치"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "입력기 컨텍스트"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "팝업 처리"
 
+#~ msgid ""
+#~ "We were unable to open this address book.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연"
+#~ "결할 수 없습니다."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "연락처 인쇄 모양새 편집 테스트"
+
+# 테스트 프로그램
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "연락처 인쇄 모양새 편집 위젯을 테스트합니다"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "연락처 인쇄 테스트"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "연락처 인쇄 코드를 테스트합니다"
+
+#~ msgid "Business"
+#~ msgstr "업무"
+
+#~ msgid "Competition"
+#~ msgstr "경쟁"
+
+#~ msgid "Favourites"
+#~ msgstr "즐겨찾기"
+
+#~ msgid "Gifts"
+#~ msgstr "선물"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "목표"
+
+#~ msgid "Holiday"
+#~ msgstr "공휴일"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "명절 카드"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "최신 연락처"
+
+#~ msgid "Ideas"
+#~ msgstr "아이디어"
+
+#~ msgid "International"
+#~ msgstr "국제 문제"
+
+#~ msgid "Key Customer"
+#~ msgstr "주요 고객"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "기타"
+
+#~ msgid "Next 7 days"
+#~ msgstr "앞으로 7일"
+
+#~ msgid "Phone Calls"
+#~ msgstr "전화 걸기"
+
+#~ msgid "Strategies"
+#~ msgstr "전략"
+
+#~ msgid "Suppliers"
+#~ msgstr "공급처"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "시간 및 비용"
+
+#~ msgid "VIP"
+#~ msgstr "중요 인물"
+
+#~ msgid "Waiting"
+#~ msgstr "기다리기"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "앞으로 7일"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "필터 조건 추가(_D)"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "날씨: 구름 약간"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "사용자 이름을 먼저 입력하십시오."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "달력을 오프라인으로 표시"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "선택한 달력을 오프라인에서 볼 수 있도록 표시합니다."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "FAQ 웹페이지를 여는 중에 오류가 발생했습니다."
+
+#~ msgid "Select Importers"
+#~ msgstr "가져오기 기능 선택"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "새로 고침(_F)..."
+
+#~ msgid "Recent Docu_ments"
+#~ msgstr "최근 문서(_M)"
+
 #~ msgid "Migrating `%s':"
 #~ msgstr "`%s' 옮기는 중:"
 
@@ -23707,7 +24076,7 @@ msgstr "팝업 처리"
 #~ msgstr "예정된 약속"
 
 #~ msgid "_Save Message"
-#~ msgstr "메세지 저장(_S)"
+#~ msgstr "메시지 저장(_S)"
 
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
@@ -23738,13 +24107,13 @@ msgstr "팝업 처리"
 #~ msgstr "업데이트 주기: "
 
 #~ msgid "Mark all messages in this folder and subfolders as read?"
-#~ msgstr "이 폴더와 하위 폴더의 모든 메세지를 읽은 것으로 표시하시겠습니까?"
+#~ msgstr "이 폴더와 하위 폴더의 모든 메시지를 읽은 것으로 표시하시겠습니까?"
 
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
 
 #~ msgid "Mark All Messages as Read"
-#~ msgstr "모든 메세지를 읽은 것으로 표시"
+#~ msgstr "모든 메시지를 읽은 것으로 표시"
 
 #~ msgid "A plugin that manages the Startup wizard."
 #~ msgstr "시작 마법사를 관리하는 플러그인."
@@ -23780,10 +24149,10 @@ msgstr "팝업 처리"
 #~ "창을 다시 표시할 수 있습니다.\n"
 
 #~ msgid "_Do not show this message again"
-#~ msgstr "이 메세지를 다시 보지 않기(_D)"
+#~ msgstr "이 메시지를 다시 보지 않기(_D)"
 
 #~ msgid "Show messages in the normal style"
-#~ msgstr "보통 형식으로 메세지를 보여줍니다"
+#~ msgstr "보통 형식으로 메시지를 보여줍니다"
 
 #~ msgid "Permission Denied."
 #~ msgstr "권한이 거부되었습니다."
@@ -23821,13 +24190,13 @@ msgstr "팝업 처리"
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
-#~ msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
+#~ msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메시지를 완전히 비우시겠습니까?"
 
 #~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
+#~ msgstr "&quot;{0}&quot;을(를) 삭제하시겠습니까?"
 
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "&quot;{0}&quot; 찾기 폴더 안의 메세지를 지우시겠습니까?"
+#~ msgstr "&quot;{0}&quot; 찾기 폴더 안의 메시지를 삭제하시겠습니까?"
 
 #~ msgid "Only on _Current Folder"
 #~ msgstr "현재 폴더에만(_C)"
@@ -23851,10 +24220,10 @@ msgstr "팝업 처리"
 #~ msgstr "편지 작성에서 인쇄할 수 있는 옵션 사용."
 
 #~ msgid "Print Message"
-#~ msgstr "메세지 인쇄"
+#~ msgstr "메시지 인쇄"
 
 #~ msgid "Prints the message"
-#~ msgstr "메세지를 인쇄합니다"
+#~ msgstr "메시지를 인쇄합니다"
 
 #~ msgid "A string description of the current printer settings."
 #~ msgstr "현재 프린터 설정의 설명 문자열."
@@ -23891,7 +24260,7 @@ msgstr "팝업 처리"
 #~ msgstr "보내기 옵션(_O)"
 
 #~ msgid "Delete all but signature"
-#~ msgstr "서명만 남기고 모두 지웁니다"
+#~ msgstr "서명만 남기고 모두 삭제합니다"
 
 #~ msgid "For_mat"
 #~ msgstr "형식(_M)"
@@ -23914,14 +24283,11 @@ msgstr "팝업 처리"
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME 서명"
 
-#~ msgid "Save As"
-#~ msgstr "다른 이름으로 저장"
-
 #~ msgid "Save in folder..."
 #~ msgstr "폴더로 저장..."
 
 #~ msgid "Save the message in a specified folder"
-#~ msgstr "메세지를 지정한 폴더로 저장합니다"
+#~ msgstr "메시지를 지정한 폴더로 저장합니다"
 
 #~ msgid "Send"
 #~ msgstr "보내기"
@@ -23930,7 +24296,7 @@ msgstr "팝업 처리"
 #~ msgstr "메일을 HTML형식으로 보냄"
 
 #~ msgid "_Delete all"
-#~ msgstr "모두 지우기(_D)"
+#~ msgstr "모두 삭제(_D)"
 
 #~ msgid "_Open..."
 #~ msgstr "열기(_O)..."
@@ -23954,7 +24320,7 @@ msgstr "팝업 처리"
 #~ msgstr "폴더 목록을 다시 읽습니다"
 
 #~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "구독 폴더의 목록에서 폴더를 지웁니다"
+#~ msgstr "구독 폴더의 목록에서 폴더를 제거합니다"
 
 #~ msgid "Subscribe"
 #~ msgstr "구독"
@@ -23988,16 +24354,10 @@ msgstr "팝업 처리"
 #~ "It disables the feature where repeated prompts to ask if delete messages "
 #~ "from search folder."
 #~ msgstr ""
-#~ "찾기 폴더에서 메세지를 지울 지를 반복해서 묻는 질문 기능을 비활성화합니다."
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "기본 폴더 선택"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "보낸 편지함 폴더 선택"
+#~ "찾기 폴더에서 메시지를 지울 지를 반복해서 묻는 질문 기능을 비활성화합니다."
 
 #~ msgid "Notify messages in Inbox only."
-#~ msgstr "받은 편지함의 메세지만 알림."
+#~ msgstr "받은 편지함의 메시지만 알림."
 
 #~ msgid "Select color for label..."
 #~ msgstr "레이블 색 선택..."
@@ -24024,10 +24384,10 @@ msgstr "팝업 처리"
 #~ msgstr "사용자가 사용하려는 새 메일 알림 종류를 지정합니다."
 
 #~ msgid "<span weight=\"bold\">New Message Notification</span>"
-#~ msgstr "<span weight=\"bold\">새 메세지 알림</span>"
+#~ msgstr "<span weight=\"bold\">새 메시지 알림</span>"
 
 #~ msgid "_Beep when new messages arrive"
-#~ msgstr "새 메세지가 도착하면 삑 소리(_B)"
+#~ msgstr "새 메시지가 도착하면 삑 소리(_B)"
 
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "첨부 알림 기본 설정"
@@ -24072,7 +24432,7 @@ msgstr "팝업 처리"
 #~ msgstr "설정(_F)"
 
 #~ msgid "Download messages for Offline"
-#~ msgstr "오프라인으로 메세지 다운로드"
+#~ msgstr "오프라인으로 메시지 다운로드"
 
 #~ msgid "SMTWTFS"
 #~ msgstr "일월화수목금토"
@@ -24084,7 +24444,7 @@ msgstr "팝업 처리"
 #~ msgstr "\n"
 
 #~ msgid "Add an email to the List"
-#~ msgstr "전자메일을 목록에 더합니다"
+#~ msgstr "전자메일을 목록에 추가합니다"
 
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "주소록에서 전자메일 주소를 가져와 넣습니다"
@@ -24093,7 +24453,7 @@ msgstr "팝업 처리"
 #~ msgstr "구성원"
 
 #~ msgid "Remove an email address from the List"
-#~ msgstr "목록에서 전자메일 주소를 지웁니다"
+#~ msgstr "목록에서 전자메일 주소를 제거합니다"
 
 #~ msgid "_Select"
 #~ msgstr "선택(_S)"
@@ -24124,7 +24484,7 @@ msgstr "팝업 처리"
 #~ msgstr "크기가 720바이트보다 작은 (48*48) PNG를 고르십시오"
 
 #~ msgid "<- _Remove"
-#~ msgstr "<- 지우기(_R)"
+#~ msgstr "<- 제거(_R)"
 
 #~ msgid "Sh_ow these fields in order:"
 #~ msgstr "다음 필드를 순서대로 표시(_O):"
diff --git a/po/lv.po b/po/lv.po
index 31ddc45104..65a63962c1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,6 +1,6 @@
 # translation of lv.po to Latvian
 # evolution 1.4 for latvian
-# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
 #
 # Pēteris Krišjānis <peteris.krisjanis@os.lv>, 2003.
 # Linux Centrs <info@linux.edu.lv>, 2006.
@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-19 13:12+0300\n"
-"PO-Revision-Date: 2009-01-04 20:06+0200\n"
+"PO-Revision-Date: 2009-01-29 11:08+0200\n"
 "Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
-"Language-Team: en_US <locale@laka.lv>\n"
+"Language-Team: Latvian <locale@laka.lv>\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%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2009-01-04 14:02+0000\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -837,9 +837,8 @@ msgid "Folder names cannot contain '/'"
 msgstr "Mapes nosaukums nevar saturēt '/'"
 
 #: ../addressbook/gui/component/addressbook-view.c:445
-#, fuzzy
 msgid "A Folder with this name already exists"
-msgstr "Mape jau eksistē"
+msgstr "Mape ar šādu nosaukumu jau eksistē"
 
 #: ../addressbook/gui/component/addressbook-view.c:956
 msgid "_New Address Book"
@@ -1320,7 +1319,6 @@ msgid "Mailing Address"
 msgstr "Pasta Adrese"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
 msgid "Ni_ckname:"
 msgstr "Iesau_ka:"
 
@@ -1373,7 +1371,6 @@ msgid "_Calendar:"
 msgstr "_Kalendārs:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
 msgid "_Categories..."
 msgstr "Ka_tegorijas..."
 
@@ -2777,14 +2774,12 @@ msgid "Insert email addresses from Address Book"
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "Members"
-msgstr "_Biedri"
+msgstr "Biedri"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#, fuzzy
 msgid "Remove an email address from the List"
-msgstr "Sūtītāja e-pasta adrešu kolonna vēstuļu sarakstā"
+msgstr ""
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
@@ -2795,9 +2790,8 @@ msgid "_List name:"
 msgstr "Saraksta vā_rds:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-#, fuzzy
 msgid "_Select"
-msgstr "_Izvēlieties..."
+msgstr "Izvēlietie_s"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
@@ -2838,12 +2832,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Atrasts kontakta dublikāts"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-#, fuzzy
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Mapē jau ir atrodams tāds personas vārds vai e-pasta adrese. Vai vēlaties to "
+"Mapē jau ir atrodams tāds personas vārds vai e-pasta adrese.\n "
+"Vai vēlaties to "
 "pievienot jebkurā gadījumā?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2867,7 +2861,6 @@ msgid "Merge Contact"
 msgstr "Apvienot kontaktus"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
 msgid "Merge"
 msgstr "Apvienot"
 
@@ -2970,9 +2963,8 @@ msgid "New Contact _List..."
 msgstr "Jauns kontaktu _saraksts..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:965
-#, fuzzy
 msgid "_Save as VCard..."
-msgstr "Saglabāt kā VKarti..."
+msgstr "_Saglabāt kā VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "_Forward Contact"
@@ -3726,14 +3718,13 @@ msgid "Copy contacts to"
 msgstr "Kopēt kontaktus uz"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#, fuzzy
 msgid "Multiple VCards"
-msgstr "Vairākas vCard"
+msgstr "Vairākas VCard"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:1007
-#, fuzzy, c-format
+#, c-format
 msgid "VCard for %s"
-msgstr "%s vCard"
+msgstr "%s VCard"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:1048
 #: ../addressbook/gui/widgets/eab-gui-util.c:1066
@@ -3759,14 +3750,12 @@ msgstr[2] "Ir vēl %d kontaktu."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:281
-#, fuzzy
 msgid "Show Full VCard"
-msgstr "Parādīt pilnu vCard"
+msgstr "Parādīt pilnu VCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-#, fuzzy
 msgid "Show Compact VCard"
-msgstr "Parādīt kompakto vCard"
+msgstr "Parādīt kompakto VCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:286
 msgid "Save in addressbook"
@@ -3817,14 +3806,12 @@ msgid "Evolution LDIF importer"
 msgstr "Evoluion LDIF importēšana"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-#, fuzzy
 msgid "VCard (.vcf, .gcrd)"
-msgstr "vCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-#, fuzzy
 msgid "Evolution VCard Importer"
-msgstr "Evolution vCard importētājs"
+msgstr "Evolution VCard importētājs"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -4065,7 +4052,6 @@ msgid "Export in asynchronous mode"
 msgstr "Eksportēt nesinhronā režīmā"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
 msgid ""
 "The number of cards in out output file in asynchronous mode, default size "
 "100."
@@ -4116,12 +4102,11 @@ msgstr ""
 "iespēju labāk saprast par ko ir šis uzdevums."
 
 #: ../calendar/calendar.error.xml.h:3
-#, fuzzy
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
-"Visa šajās atgādnēs pierakstītā informācija tiks dzēsta un to nevarēs "
+"isa šajās atgādnēs pierakstītā informācija tiks dzēsta un to nevarēs "
 "atjaunot."
 
 #: ../calendar/calendar.error.xml.h:4
@@ -5081,13 +5066,11 @@ msgstr "24 stundu laika formāts"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Noklusētā atgādinātāja vienības, \"minūtes\".\"stundas\" vai \"dienas\"."
+msgstr "Noklusētā atgādinātāja vienības, \"minutes\", \"hours\" vai \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Vienības lai noteiktu kad jāslēpj uzdevumi \"minūtes\".\"stundas\" vai "
-"\"dienas\"."
+msgstr "Vienības lai noteiktu kad jāslēpj uzdevumi \"minutes\", \"hours\" vai \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -12589,9 +12572,7 @@ msgstr "Vēstules loga noklusētais platums"
 
 #: ../mail/evolution-mail.schemas.in.h:64
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Vēstules attēlošanas stils (\"standarts\"pilni virsraksti\", \"neko nemainīt"
-"\")"
+msgstr "Vēstules attēlošanas stils (\"normal\", \"full headers\", \"source\")"
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Minimum days between emptying the junk on exit"
@@ -13221,17 +13202,16 @@ msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Parādītās vēstules _galvenes</span>"
 
 #: ../mail/mail-config.glade.h:18
-#, fuzzy
 msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Iezīmes</span>"
+msgstr "<span weight=\"bold\">Iezīmes un krāsas</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Ielādē Attēlus</span>"
+msgstr "<span weight=\"bold\">Ielādē attēlus</span>"
 
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Vēstulēs Attēlošana</span>"
+msgstr "<span weight=\"bold\">Vēstulēs attēlošana</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
@@ -13242,9 +13222,8 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Vēstules saņēmējs</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">Atrašanās vieta</span>"
+msgstr "<span weight=\"bold\">Jauna pasta paziņojumi</span>"
 
 #: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -13563,13 +13542,13 @@ msgid ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"Lūdzu zemāk ievadiet jūsu vārdu un epasta adresi. \"Optionālie\" lauki var "
+"Lūdzu zemāk ievadiet jūsu vārdu un epasta adresi. \"Izvēles\" lauki var "
 "tikt neaizpildīti, kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko "
 "nosūtāt."
 
 #: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
-msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
+msgstr "Lūdzu izvēlieties starp sekojošām iespējām"
 
 #: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
@@ -16685,7 +16664,7 @@ msgid ""
 msgstr ""
 "Sniedziet papildus iesākumus, kurus jums ir jāsaņem papildus šiem standarta "
 "sākumiem. \n"
-"Jūs šo varat ignorēt, ja izvēlaties \"Visus sākumus\"."
+"Jūs šo varat ignorēt, ja izvēlaties \"All Headers\" (Visus sākumus)."
 
 #: ../plugins/imap-features/imap-headers.glade.h:7
 msgid ""
@@ -18286,8 +18265,8 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Stils ar loga pogām. Vār būt \"teksts\", \"ikonas\", \"abas\", \"rīkjosla\". "
-"If \"rīkjosla\" ir uzstadūta, pogu stils tiks noteikts ar GNOME."
+"Stils ar loga pogām. Vār būt \"text\", \"icons\", \"both\", "
+"\"toolbar\". Ja \"toolbar\" ir uzstadūta, pogu stils tiks noteikts ar GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Toolbar is visible"
@@ -22441,641 +22420,3 @@ msgstr "IM konteksts"
 msgid "Handle Popup"
 msgstr "Vadīt izlecošo logu"
 
-#~ msgid "Cannot add new contact"
-#~ msgstr "Nevar pievienot jaunu kontaktu"
-
-#~ msgid "<b>Members</b>"
-#~ msgstr "<b>Locekļi</b>"
-
-#~ msgid "Save as vCard..."
-#~ msgstr "Saglabāt kā vCard..."
-
-#~ msgid "_Save as vCard..."
-#~ msgstr "_Saglabāt kā vCard..."
-
-#~ msgid "_Don't Display"
-#~ msgstr "Nerādīt"
-
-#~ msgid "Display _All Contacts"
-#~ msgstr "Rādīt visus kontaktus"
-
-#~ msgid ""
-#~ "All information on this memo will be deleted and can not be restored."
-#~ msgstr "Visa informācija šajā atgādnē tiks dzēsta un to nevarēs atjaunot."
-
-#~ msgid "Are you sure you want to delete these {0} memos?"
-#~ msgstr "Vai tiešām vēlies dzēst šos {0} ierakstus?"
-
-#~ msgid "Are you sure you want to delete this memo?"
-#~ msgstr "Vai esat pārliecināts, ka vēlaties dzēst šo memo?"
-
-#~ msgid "This memo has been deleted."
-#~ msgstr "Šī atgādne ir izdzēsta."
-
-#~ msgid "This memo has been changed."
-#~ msgstr "Šī atgādne ir mainīta."
-
-#~ msgid "Memo - %s"
-#~ msgstr "Memo - %s"
-
-#~ msgid "The memo could not be deleted due to a corba error"
-#~ msgstr "Corba sistēmas dēļ šo atgādni nevarēja izdzēst"
-
-#~ msgid "The memo could not be deleted because permission was denied"
-#~ msgstr "Netika dotas tiesības dzēst šo atgādni"
-
-#~ msgid "The memo could not be deleted due to an error"
-#~ msgstr "Kļūdu dēļ nevarēja dzēst atgādni"
-
-#~ msgid "You are acting on behalf of %s"
-#~ msgstr "Tu darbojies %s interesēs"
-
-#~ msgid "You are modifying a recurring memo. What would you like to modify?"
-#~ msgstr "Tu modificē atkārtojošos atgādni. Ko tu vēlētos mainīt?"
-
-#~ msgid "Organi_zer:"
-#~ msgstr "Organi_zētājs:"
-
-#~ msgid "P_rint..."
-#~ msgstr "D_rukāt..."
-
-#~ msgid "Pri_nt..."
-#~ msgstr "_Drukāt..."
-
-#~ msgid "Memo information"
-#~ msgstr "Informācija par memo"
-
-#~ msgid "Attendees: "
-#~ msgstr "Dalībnieki: "
-
-#~ msgid "_Continue Editing"
-#~ msgstr "_Turpināt rediģēšanu"
-
-#~ msgid "Evolution Mail and Calendar"
-#~ msgstr "Evolution pasts un kalendārs"
-
-#~ msgid "Manage your email, contacts and schedule"
-#~ msgstr "Pārvaldiet jūsu epastu, kontaktus un plānošanu"
-
-#~ msgid "Read and write emails"
-#~ msgstr "Lasīt un rakstīt e-pastus"
-
-#~ msgid "Label _Name:"
-#~ msgstr "Iezīmes _nosaukums:"
-
-#~ msgid "Edit Label"
-#~ msgstr "Rediģēt iezīmi"
-
-#~ msgid "Add Label"
-#~ msgstr "Pievienot iezīmi"
-
-#~ msgid "Label name cannot be empty."
-#~ msgstr "Iezīmes nosaukums nevar būt tukšs."
-
-#~ msgid "R_ule name:"
-#~ msgstr "N_oteikuma nosaukums:"
-
-#~ msgid "A_dd Filter Criteria"
-#~ msgstr "_Pievienot filtra kritēriju"
-
-#~ msgid "minu_tes"
-#~ msgstr "minū_tes"
-
-#~ msgid "Checking for New Messages"
-#~ msgstr "Pārbaudīt, vai nav jaunas vēstules"
-
-#~ msgid "BCC"
-#~ msgstr "BCC"
-
-#~ msgid "CC"
-#~ msgstr "CC"
-
-#~ msgid "Completed On"
-#~ msgstr "Pabeigts"
-
-#~ msgid "is not set"
-#~ msgstr "nav iestatīts"
-
-#~ msgid "is set"
-#~ msgstr "ir iestatīts"
-
-#~ msgid "Set Label"
-#~ msgstr "Iestatīt iezīmi"
-
-#~ msgid "Then"
-#~ msgstr "Tad"
-
-#~ msgid "Add Ac_tion"
-#~ msgstr "Pievienot _darbību"
-
-#~ msgid "_New Label"
-#~ msgstr "_Jauna iezīme"
-
-#~ msgid "Search Folder based on _Subject"
-#~ msgstr "Meklēšanas mape pēc _subjekta"
-
-#~ msgid "Search Folder based on Se_nder"
-#~ msgstr "Meklēšanas mape pēc _nosūtītāja"
-
-#~ msgid "Search Folder based on _Recipients"
-#~ msgstr "Meklēšanas mape pēc saņēmējie_m"
-
-#~ msgid "Search Folder based on Mailing _List"
-#~ msgstr "Meklēšanas mape pēc a_dresātu saraksta"
-
-#~ msgid "Filter based on Sub_ject"
-#~ msgstr "Filtrs pēc s_ubjekta"
-
-#~ msgid "Filter based on Sen_der"
-#~ msgstr "Filtrs pēc n_osūtītāja"
-
-#~ msgid "Filter based on Re_cipients"
-#~ msgstr "Filtrs pēc s_aņēmējiem"
-
-#~ msgid "Filter based on _Mailing List"
-#~ msgstr "Filtrs pēc ad_resātu saraksta"
-
-#~ msgid "Signature exists, but need public key"
-#~ msgstr "Paraksts eksistē, taču tam nepieciešama publiskā atslēga"
-
-#~ msgid ""
-#~ "This message is signed with a signature, but there is no corresponding "
-#~ "public key."
-#~ msgstr ""
-#~ "Šī vēstule ir parakstīta ar parakstu, taču tam nav atbilstošas publiskās "
-#~ "atslēgas."
-
-#~ msgid "Unknown external-body part."
-#~ msgstr "Nezināma ārējā daļa"
-
-#~ msgid "Formatting Message..."
-#~ msgstr "Formatē ziņu..."
-
-#~ msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-#~ msgstr "Šo vēstuli <b>%s</b> ir nosūtijis/-usi <b>%s</b> vārdā."
-
-#~ msgid "Face"
-#~ msgstr "Seja"
-
-#~ msgid "Add Custom Junk Header"
-#~ msgstr "Pievienot pielāgotu mēstuļu galveni"
-
-#~ msgid "Header Name:"
-#~ msgstr "Galvenes nosaukums:"
-
-#~ msgid "Header Value Contains:"
-#~ msgstr "Galvenes vērtība satur:"
-
-#~ msgid "Contains Value"
-#~ msgstr "Satur vērtību"
-
-#~ msgid "Tag"
-#~ msgstr "Birka"
-
-#~ msgid "Always request read receipt"
-#~ msgstr "Vienmēr pieprasīt kvīti par izlasīšanu"
-
-#~ msgid ""
-#~ "Amount of time in seconds the error should be shown on the status bar."
-#~ msgstr "Laiks sekundēs, cik ilgi kļūdai jābūt parādītai statusa joslā."
-
-#~ msgid "Automatic emoticon recognition"
-#~ msgstr "Automātiska emociju ikonu atpazīšana"
-
-#~ msgid "Composer load/attach directory"
-#~ msgstr "Sastādītāja ielādes/piesaistnes direktorija"
-
-#~ msgid "Determines whether to use custom headers to check for junk"
-#~ msgstr ""
-#~ "Nosaka, vai lietot pielāgotas galvenes, lai pārbaudītu mēstuļu esamību"
-
-#~ 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 ""
-#~ "Nosaka, vai lietot pielāgotas galvenes, lai pārbaudītu mēstuļu esamību. "
-#~ "Ja šī opcija ir aktivizēta un galvenes ir norādītas, tas uzlabos mēstuļu "
-#~ "pārbaudes ātrumu."
-
-#~ msgid ""
-#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
-#~ "\" lines in the \"Messages\" column in vertical view."
-#~ msgstr ""
-#~ "Nosaka, vai lietot tos pašus fontus \"No\" un \"Temats\" rindām \"Vēstules"
-#~ "\" kolonnai vertikālā skatā."
-
-#~ msgid "Directory for loading/attaching files to composer."
-#~ msgstr "Direktorija failu ielādēšanai/piesaistīšanai sastādītājam."
-
-#~ msgid "Enable or disable magic space bar"
-#~ msgstr "Ieslēgt vai izslēgt maģisko tukšuma taustiņu"
-
-#~ msgid "Enable search folders"
-#~ msgstr "Aktivizēt meklēšanas mapes"
-
-#~ msgid "Enable search folders on startup."
-#~ msgstr "Aktivizēt meklēšanas mapes pie startēšanas."
-
-#~ msgid ""
-#~ "Enable this to use Space bar key to scroll in message preview, message "
-#~ "list and folders."
-#~ msgstr ""
-#~ "Aktivizējiet šo, lai izmantotu atstarpes taustiņu vēstules pirmsskata, "
-#~ "vēstuļu un mapju saraksta ritināšanai."
-
-#~ msgid "Hides the per-folder preview and removes the selection"
-#~ msgstr "Noslēpj katras mapes priekšapskati un izņem izvēli"
-
-#~ 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 ""
-#~ "Tas ieslēdz/izslēdz atkārtotus brīdinājumus par to, ka vēstuļu dzēšana no "
-#~ "meklēšanas mapes neatgriezeniski izdzēš vēstuli, nevis to izņem no "
-#~ "meklēšanas rezultātiem."
-
-#~ msgid "Level beyond which the message should be logged."
-#~ msgstr "Līmenis, kuru pārsniedzot vēstulei jātiek saglabātai žurnālā."
-
-#~ msgid "Prompt when deleting messages in search folder"
-#~ msgstr "Prasīt apstiprinājumu dzēšot vēstules no meklēšanas mapes"
-
-#~ 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 ""
-#~ "Šis iestatījums norāda, vai pavedieniem jābūt sakārtotiem pēc pēdējās "
-#~ "vēstules katrā pavedienā, nekā pēc vēstules datuma. Evolution pēc šī "
-#~ "iestatījuma mainīšanas ir jāpārstartē."
-
-#~ msgid ""
-#~ "Whether a read receipt request gets added to every message by default."
-#~ msgstr ""
-#~ "Vai izlasīšanas apstiprinājums tiek pievienots katrai vēstulei pēc "
-#~ "noklusējuma."
-
-#~ msgid "Whether sort threads based on latest message in that thread"
-#~ msgstr "Vai kārtot pavedienus pēc pēdējās vēstules katrā pavedienā"
-
-#~ msgid "Error"
-#~ msgstr "Kļūda"
-
-#~ msgid "Errors"
-#~ msgstr "Kļūdas"
-
-#~ msgid "Warnings and Errors"
-#~ msgstr "Brīdinājumi un kļūdas"
-
-#~ msgid "Debug"
-#~ msgstr "Atkļūdošana"
-
-#~ msgid "Error, Warnings and Debug messages"
-#~ msgstr "Kļūdas, brīdinājumi un atkļūdošanas ziņojumi"
-
-#~ msgid "Debug Logs"
-#~ msgstr "Atkļūdošanas žurnāli"
-
-#~ msgid "Show _errors in the status bar for"
-#~ msgstr "Parādīt _kļūdas statusa joslā"
-
-#~ msgid "Log Messages:"
-#~ msgstr "Žurnāla ziņojumi:"
-
-#~ msgid "Log Level"
-#~ msgstr "Žurnāla līmenis"
-
-#~ msgid "(Note: Requires restart of the application)"
-#~ msgstr "(Piezīme: būs jāpārstartē aplikācija)"
-
-#~ msgid "Always request rea_d receipt"
-#~ msgstr "Vienmēr pieprasīt _izlasīšanas apstiprinājumu"
-
-#~ msgid "Check incoming _messages for junk"
-#~ msgstr "Pārbaudīt ienākošās _vēstules pret mēstulēm"
-
-#~ msgid "Enable Magic S_pacebar "
-#~ msgstr "Aktivizēt maģisko atstarpes taustiņu "
-
-#~ msgid "Enable Sea_rch Folders"
-#~ msgstr "Aktivizē me_klēšanas mapes"
-
-#~ msgid "Labels"
-#~ msgstr "Iezīmes"
-
-#~ msgid ""
-#~ "Note: Underscore in the label name is used as mnemonic identifier in menu."
-#~ msgstr ""
-#~ "Piezīme: pasvītrojums iezīmes nosaukumā izvēlnē tiek izmantots kā "
-#~ "mnemoniskais identifikātors."
-
-#~ msgid "Sending message"
-#~ msgstr "Sūta vēstuli"
-
-#~ msgid "Delete messages in Search Folder?"
-#~ msgstr "Dzēst vēstules meklēšanas mapē?"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Brīdinājums: vēstuļu dzēšana no meklēšanas mapes izdzēsīs īsto vēstuli no "
-#~ "jūsu lokālām vai attālinātām mapēm.\n"
-#~ "Vai jūs tiešām to vēlaties darīt?"
-
-#~ msgid ""
-#~ "List of clues for the attachment reminder plugin to look for in a message "
-#~ "body"
-#~ msgstr ""
-#~ "Pazīmju saraksts, kuras atgādinājuma par piesaistni spraudnis meklē "
-#~ "vēstules ķermenī."
-
-#~ msgid ""
-#~ "List of clues for the attachment reminder plugin to look for in a message "
-#~ "body."
-#~ msgstr ""
-#~ "Pazīmju saraksts, kuras atgādinājuma par piesaistni spraudnis meklē "
-#~ "vēstules ķermenī."
-
-#~ msgid "Keywords"
-#~ msgstr "Atslēgvārdi"
-
-#~ msgid "Attachment Reminder"
-#~ msgstr "Atgādinātājs par piesaistni"
-
-#~ msgid ""
-#~ "Looks for clues in a message for mention of attachments and warns if the "
-#~ "attachment is missing"
-#~ msgstr ""
-#~ "Meklē pazīmes vēstulē, vai tajā nav minētas piesaistnes un brīdina, ja "
-#~ "tās nav pievienotas"
-
-#~ msgid ""
-#~ "Evolution has found some keywords that suggest that this message should "
-#~ "contain an attachment, but cannot find one."
-#~ msgstr ""
-#~ "Evolution ir atradusi dažus atslēgvārdus, kas liek domāt, ka šai vēstulei "
-#~ "vajadzētu būt pievienotai piesaistnei, bet tāda nav atrasta."
-
-#~ msgid "Message has no attachments"
-#~ msgstr "Vēstulei nav piesaistņu"
-
-#~ msgid "With Graphical User Interface"
-#~ msgstr "Ar grafisko lietotāja saskarni"
-
-#~ msgid "Convert mail messages to Unicode"
-#~ msgstr "Konvertēt pasta vēstules uz Unicode"
-
-#~ msgid "Bogofilter Options"
-#~ msgstr "Bogofilter opcijas"
-
-#~ msgid "Filters junk messages using Bogofilter."
-#~ msgstr "Filtrē mēstules, izmantojot Bogofilter programmu."
-
-#~ msgid "Userna_me:"
-#~ msgstr "Lieto_tājvārds:"
-
-#~ msgid "You have been given the following permissions on my folders:"
-#~ msgstr "Jums ir dotas sekojošas tiesības attiecībā uz manām mapēm:"
-
-#~ msgid ""
-#~ "A plugin for using an external editor as the composer. You can send only "
-#~ "plain-text messages."
-#~ msgstr ""
-#~ "Spraudnis ārējā redaktora izmantošanai kā sastādītāju. Jūs varat sūtīt "
-#~ "tikai vienkārša teksta vēstules."
-
-#~ msgid "External Editor"
-#~ msgstr "Ārējais redaktors"
-
-#~ msgid "Compose messages using an external editor"
-#~ msgstr "Sastādiet vēstules izmantojot ārējo redaktoru"
-
-#~ msgid "Select a (48*48) png of size < 700bytes"
-#~ msgstr "Izvēlieties 48*48 png izmērā ne lielākā kā 700 baiti"
-
-#~ msgid "PNG files"
-#~ msgstr "PNG faili"
-
-#~ msgid "_Face"
-#~ msgstr "_Seja"
-
-#~ 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 ""
-#~ "Pievienot sejas galveni izejošajām vēstulēm. Pirmajā reizē lietotājam ir "
-#~ "jānorāda 48*48 png attēls. Tā tiks šifrēta ar base64 un saglabāta ~/."
-#~ "evolution/faces. Tad tā tālāk tiks izmantota vēstulēs, ko sūtīsiet "
-#~ "turpmāk."
-
-#~ msgid "Google"
-#~ msgstr "Google"
-
-#~ msgid "Google sources"
-#~ msgstr "Google avoti"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "Kon_takti..."
-
-#~ msgid "permission to read|_Read"
-#~ msgstr "_Lasīt"
-
-#~ msgid "From:"
-#~ msgstr "No:"
-
-#~ msgid "Hardware Abstraction Layer not loaded"
-#~ msgstr "Aparatūras abstrakcijas slānis nav ielādēts"
-
-#~ msgid ""
-#~ "The \"hald\" service is required but not currently running. Please enable "
-#~ "the service and rerun this program, or contact your system administrator."
-#~ msgstr ""
-#~ "Tiek pieprasīts \"hald\" serviss, taču pašreiz tas nav palaists. Lūdzu "
-#~ "aktivizējiet servisu un pārlaidiet šo programmu, vai sazinieties ar jūsu "
-#~ "sistēmas administratoru."
-
-#~ msgid "Search for an iPod failed"
-#~ msgstr "Neizdevās sameklēt iPod"
-
-#~ msgid "Unable to find this memo in any memo list"
-#~ msgstr "Nevarēja atrast šo atgādni jebkurā atgādņu sarakstā"
-
-#~ msgid "Meeting information sent"
-#~ msgstr "Informācija par tikšanos nosūtīta"
-
-#~ msgid "Task information sent"
-#~ msgstr "Informācija par uzdevumu nosūtīta"
-
-#~ msgid "Memo information sent"
-#~ msgstr "Informācija par atgādni nosūtīta"
-
-#~ msgid "Unable to send meeting information, the meeting does not exist"
-#~ msgstr "Nevarēja nosūtīt informāciju par tikšanos, tikšanās neeksistē"
-
-#~ msgid "Unable to send task information, the task does not exist"
-#~ msgstr "Nevarēja nosūtīt informāciju par uzdevumu, uzdevums neeksistē"
-
-#~ msgid "Unable to send memo information, the memo does not exist"
-#~ msgstr "Nevarēja nosūtīt informāciju par atgādni, atgādne neeksistē"
-
-#~ msgid "This meeting recurs"
-#~ msgstr "Šī sanāksme atkārtojas"
-
-#~ msgid "This task recurs"
-#~ msgstr "Šis uzdevums atkārtojas"
-
-#~ msgid "This memo recurs"
-#~ msgstr "Šī atgādne atkārtojas"
-
-#~ msgid "Show time as _free"
-#~ msgstr "Rādīt laiku kā _brīvu"
-
-#~ msgid "Beep or play sound file."
-#~ msgstr "Pīkstēt vai spēlēt skaņu failu."
-
-#~ msgid "Blink icon in notification area."
-#~ msgstr "Mirkšķināt ikonu ziņojumu laukā."
-
-#~ msgid "Enable D-Bus messages."
-#~ msgstr "Ieslēgt D-Bus ziņas."
-
-#~ msgid "Notify new messages for Inbox only."
-#~ msgstr "Ziņot tikai par jaunām vēstulēm iesūtnē."
-
-#~ msgid "Popup message together with the icon."
-#~ msgstr "Izlecošais paziņojums kopā ar ikonu."
-
-#~ msgid "Show new mail icon in notification area when new messages arrive."
-#~ msgstr ""
-#~ "Parādīt jauna pasta ikonu ziņojumu laukā, kad pienāk jaunas vēstules."
-
-#~ msgid "Sound file name to be played."
-#~ msgstr "Skaņas faila nosaukums, kas jāspēlē."
-
-#~ msgid "Whether play sound or beep when new messages arrive."
-#~ msgstr "Spēlēt skaņu vai pīksēt, kad pienāk jaunas vēstules."
-
-#~ msgid "Whether show message over the icon when new messages arrive."
-#~ msgstr "Vai parādīt ziņu pāri ikonai kad ir pienākušas jaunas vēstules."
-
-#~ msgid "Whether the icon should blink or not."
-#~ msgstr "Vai ikonai būtu jāmirgo vai nē."
-
-#~ msgid "Whether to notify new messages in Inbox folder only."
-#~ msgstr "Paziņot par jaunajām vēstulēm tikai iesūtnē."
-
-#~ msgid "Generate a _D-Bus message"
-#~ msgstr "Ģenerēt _D-Bus ziņu"
-
-#~ msgid "You have received %d new message."
-#~ msgid_plural "You have received %d new messages."
-#~ msgstr[0] "Jūs esat saņēmis %d jaunu vēstuli."
-#~ msgstr[1] "Jūs esat saņēmis %d jaunas vēstules."
-#~ msgstr[2] "Jūs esat saņēmis %d jaunu vēstuļu."
-
-#~ msgid "Show icon in _notification area"
-#~ msgstr "Parādīt ikonu _ziņojumu laukā"
-
-#~ msgid "B_link icon in notification area"
-#~ msgstr "Mi_rkšķināt ikonu ziņojumu laukā"
-
-#~ msgid "Popup _message together with the icon"
-#~ msgstr "Izlēcošā _ziņa līdz ar ikonu"
-
-#~ msgid "_Beep"
-#~ msgstr "Pī_kstēt"
-
-#~ msgid "Play _sound file"
-#~ msgstr "Spēlēt _skaņas failu"
-
-#~ msgid "Pl_ay"
-#~ msgstr "S_pēlēt"
-
-#~ msgid "Notify new messages for _Inbox only"
-#~ msgstr "Brīdināt tikai par jaunajām vēstulēm iesūtnē"
-
-#~ msgid "Cannot open calendar. %s"
-#~ msgstr "Nevar atvērt kalendāru. %s"
-
-#~ msgid ""
-#~ "Selected source is read only, thus cannot create task there. Select other "
-#~ "source, please."
-#~ msgstr ""
-#~ "Izvēlētais avots ir tikai nolasīšanai, jūs nevarat izveidot tajā "
-#~ "uzdevumu. Izvēlieties lūdzu citu avotu."
-
-#~ msgid "Configuration"
-#~ msgstr "Konfigurācija"
-
-#~ msgid "Overview"
-#~ msgstr "Pārskats"
-
-#~ msgid "Spamassassin Options"
-#~ msgstr "Spamassasin opcijas"
-
-#~ msgid "Show _only this Memo List"
-#~ msgstr "Parādīt _tikai šo atgādņu sarakstu"
-
-#~ msgid "A simple plugin which uses ytnef to decode tnef attachments."
-#~ msgstr ""
-#~ "Vienkāršs spraudnis, kas izmanto ytnef, lai atšifrētu tnef piesaistnes."
-
-#~ msgid "TNEF Attachment decoder"
-#~ msgstr "TNEF piesaistņu atšifrētājs"
-
-#~ msgid "%s - Evolution"
-#~ msgstr "%s - Evolution"
-
-#~ msgid "Error opening the FAQ webpage."
-#~ msgstr "Kļūda atverot biežāk uzdoto jautājumu tīmekļa lapu"
-
-#~ msgid "Disable preview pane of Mail, Contacts and Tasks."
-#~ msgstr "Izslēgt pirmsapskates lauku pastam, kontaktiem un uzdevumiem."
-
-#~ msgid "View the debug console for log messages"
-#~ msgstr "Pārādīt žurnāla ziņas atkļūdošanas konsolē"
-
-#~ msgid "_Debug Logs"
-#~ msgstr "_Atkļūdošanas žurnāli"
-
-#~ msgid "Select Message S_ubthread"
-#~ msgstr "Iezīmēt vēstules apakšpavedienu"
-
-#~ msgid "Select all replies to the currently selected message"
-#~ msgstr "Iezīmēt visas atbildes uz šobrīd iezīmēto vēstuli"
-
-#~ msgid "Evolution _FAQ"
-#~ msgstr "Bieži uzdotie jautājumi par Evolution"
-
-#~ msgid "Open the Frequently Asked Questions webpage"
-#~ msgstr "Atvērt bieži uzdoto jautājumu vietnes lapu"
-
-#~ msgid "_Frequently Asked Questions"
-#~ msgstr "_Bieži uzdotie jautājumi"
-
-#~ msgid "Search"
-#~ msgstr "Meklēšana"
-
-#~ msgid "Click here to change the search type"
-#~ msgstr "Klikšķiniet, lai mainītu meklēšanas veidu"
-
-#~ msgid "Clear _All"
-#~ msgstr "Visu _attīrīt"
-
-#~ msgid "Show field i_n View"
-#~ msgstr "Parādīt _lauku skatā"
-
-#~ msgid "Show field in _View"
-#~ msgstr "Parādīt lauku _skatā"
-
-#~ msgid "_Show field in View"
-#~ msgstr "Parādīt lauku _skatā"
-
-#~ msgid "_Custom"
-#~ msgstr "_Pielāgots"
-
diff --git a/po/mk.po b/po/mk.po
index dcfe8cc916..d2bcf1eb6c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2,7 +2,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
 #
-#: ../shell/main.c:683
 # Damjan Georgievski <penguinista@mail.net.mk>, 2003.
 # Marko Ivanoski <marko@programmer.net>, 2003.
 # Ivan Stojmirov <stojmir@linux.net.mk>, 2003.
@@ -12,11 +11,13 @@
 # Jovan Naumovski <jovan@lugola.net>, 2006, 2007, 2008.
 # Arangel Angov <ufo@linux.net.mk>, 2006, 2007, 2008.
 # Arangel Angov <arangel@linux.net.mk>, 2007, 2008.
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.mk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:18+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2009-01-19 17:15+0000\n"
 "PO-Revision-Date: 2008-08-21 16:19+0200\n"
 "Last-Translator: Jovan Naumovski <jovan@lugola.net>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -30,21 +31,23 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:179
+#, fuzzy
+#| msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "адресар за evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Нов контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Нова листа на контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -68,63 +71,63 @@ msgstr "Контакти:"
 msgid "evolution minicard"
 msgstr "evolution миникарта"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Има аларми."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Има повторувања."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Тоа е состанок."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Настан во календарот: Кратката содржина е %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Настан во календарот: Нема кратка содржина."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "настан за поглед во календарот"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Земи фокус"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Ново закажување"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Нов целодневен настан"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Нов состанок"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Оди во „Денес“"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Оди на датум"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr "табела за поглед и избор на тековниот временски опсег"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -134,14 +137,14 @@ msgstr[2] "Има %d настани."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Нема настани."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Приказ на работна недела: %s. %s"
@@ -149,21 +152,21 @@ msgstr "Приказ на работна недела: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Преглед на денови: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "поглед на календарот за работната недела"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "поглед за календарот за еден или повеќе денови"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:757
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -173,30 +176,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../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"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../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"
 
@@ -205,144 +208,144 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Календар за Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "лента за пребарување"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "Лента за пребарување на календарот на evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Копче за скокање"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Ако кликнете овде, можете да најдете повеќе настани."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Приказ на месеци: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Приказ на недели: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "Поглед на календарот за месец"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "Поглед на календарот за една или повеќе недели"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "скокачка"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "скокачки процес-дете"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "уреди"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "почни да ја уредуваш оваа ќелија"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "менување"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "менување на ќелијата"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "прошири"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "го проширува редот во ќелијата на „ETree“"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "спушти"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "го спушта редот во ќелијата на „ETree“"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Ќелија во табела"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "кликни за додавање"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "кликни"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "подреди"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Календар: од %s до %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "предмет од календарот на evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Комбо копче"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Активирај го стандардното"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Скокачко мени"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Пушти лента за приврзоци"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "активирај"
 
@@ -352,8 +355,8 @@ 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}“ е извор на календар кој може само да се чита. Префрлете се на прегледот "
-"на контакти и означете календар кој може да прифаќа состаноци."
+"„{0}“ е извор на календар кој може само да се чита. Префрлете се на "
+"прегледот на контакти и означете календар кој може да прифаќа состаноци."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -395,7 +398,9 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Не можат да се добијат шематски информации за LDAP серверот."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+#, fuzzy
+#| msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Не можам да го отстранам адресарот."
 
 #: ../addressbook/addressbook.error.xml.h:11
@@ -413,7 +418,9 @@ msgid "Delete address book '{0}'?"
 msgstr "Да го избришам адресарот „{0}“?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+#, fuzzy
+#| msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Грешка при вчитување на адресарот."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -426,7 +433,7 @@ msgstr "Не успеав да се автентицирам со LDAP серв�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Не успеав да го избришам контактот"
 
@@ -439,6 +446,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP серверот одговори со валидна информација за шемата."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Верзија на серверот"
 
@@ -447,11 +455,14 @@ msgid "Some features may not work properly with your current server"
 msgstr "Некои опции може да не работат правилно со вашиот тековен сервер"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+#, fuzzy
+#| msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Адресарот на Evolution неочекувано се исклучи."
 
 #: ../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 ""
 "Сликата што ја избравте е голема. Дали сакате да ѝ ја смените големината и "
 "да ја складирате?"
@@ -467,31 +478,41 @@ msgstr ""
 "Прашајте го вашиот администратор за поддржани бази на пребарување."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Овој адресар ќе биде трајно отстранет."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+#, fuzzy
+#| msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Овој адресар не може да се отвори."
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+#, fuzzy
+#| msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book server does not have any suggested search bases."
 msgstr "Овој сервер за адресари ги нема предложените термини за пребарување."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "This addressbook server might be unreachable or the server name may be "
+#| "misspelled or your network connection could be down."
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Овој сервер на адресари може да е недостапен или името на серверот може да е "
 "погрешно напишано или вашето мрежно поврзување е исклучено."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Овој адресар ќе биде трајно отстранет."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Овој сервер не поддржува LDAPv3 информации за шема."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+#, fuzzy
+#| msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "Не можам да го отворам адресарот"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -507,8 +528,12 @@ msgid "Would you like to save your changes?"
 msgstr "Дали сакате да ги зачувате вашите промени?"
 
 #: ../addressbook/addressbook.error.xml.h:33
+#, fuzzy
+#| msgid ""
+#| "You are attempting to move a contact from one addressbook to another but "
+#| "it cannot be removed from the source. Do you want to save a copy instead?"
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"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 ""
 "Пробувате да преместите контакт од еден адресар во друг но тој не може да се "
@@ -532,15 +557,17 @@ msgstr "Немате доволно пермисии за да избришет�
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "Направивте измени на овој контакт. Дали сакате да ги зачувате овие промени?"
+msgstr ""
+"Направивте измени на овој контакт. Дали сакате да ги зачувате овие промени?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Вашите контакти за {0} нема да бидат достапни сѐ додека Evolution не се "
 "рестартира."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -563,9 +590,9 @@ msgstr "_Промени големина"
 msgid "_Use as it is"
 msgstr "_Користи како што е"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -574,21 +601,24 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Стандардна адреса за синхронизација:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
+#, fuzzy
+#| msgid "Could not load addressbook"
+msgid "Could not load address book"
 msgstr "Не може да се вчита адресарот"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Не може да се блокот за адреси на пилот уредот"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Автокомплетирање"
 
@@ -606,10 +636,10 @@ msgstr "Конфигурирајте го автокомплетирањето �
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -647,15 +677,15 @@ msgstr "Менаџирајте со вашите S/MIME сертификати �
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:244
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "На овој компјутер"
 
@@ -664,21 +694,20 @@ msgstr "На овој компјутер"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "На LDAP сервери"
 
@@ -701,7 +730,7 @@ msgid "Create a new contact list"
 msgstr "Креирај нова листа на контакти"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Нов адресар"
 
@@ -718,85 +747,85 @@ msgstr "Креирај нов адресар"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Не успеа надградувањето на поставувањата или папките на адресарот."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Копирај ја содржината на _адресарот локално за офлајн употреба"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Општо"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Адресар"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Информации за серверот"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Автентикација"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Детали"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:982
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Пребарувам"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Преземам"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Својства на адресарот"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Мигрирам..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Мигрирање на „%s“:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Поставувања за автокомплетирање"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -807,7 +836,7 @@ msgstr ""
 "Evolution 1.x.\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -817,7 +846,7 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -827,7 +856,7 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -837,53 +866,60 @@ msgstr ""
 "\n"
 "Ве молам почекајте додека Evolution ги мигрира Вашите Pilot Sync податоци..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:502
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименувај ја папката „%s“ во:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Преименувај папка"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:510
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Имињата на папки не може да содржат „/“"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Нов адресар"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Зачувај како 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 "_Преименувај..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Избриши"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Одбирач на извор на контакти"
 
@@ -892,21 +928,21 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Пристапувам до LDAP серверот анонимно"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Не успеав да се автентицирам.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Внеси лозинка за %s (корисник %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:498
-#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Внесете лозинка"
 
@@ -931,10 +967,14 @@ msgstr ""
 "површината за преглед, во пиксели."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Покажи површина за преглед"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -942,23 +982,39 @@ msgstr ""
 "Број на знаци кои мора да бидат внесени пред Evolution да се обиде со "
 "автокомплетирање."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI за последната папка користена во дијалогот за одбирање имиња"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI за последната папка користена во дијалогот за одбирање имиња."
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "Позиција на вертикалната површина"
 
-#: ../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 "Дали да се покажува површината за преглед."
 
+#: ../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 "_Lookup in local addressbook only"
+msgid "Look up in address books"
+msgstr "_Барај само во локалните адресари"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -1000,7 +1056,7 @@ msgid "Add Address Book"
 msgstr "Додај адресар"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Секогаш"
 
@@ -1026,8 +1082,10 @@ msgid "Email address"
 msgstr "Адреса за е-пошта"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution ќе ја користи оваа адреса е-пошта за автентикација со серверот."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution ќе ја користи оваа адреса е-пошта за автентикација со серверот."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1038,14 +1096,14 @@ msgid "Lo_gin:"
 msgstr "На_јава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Никогаш"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Без енкрипција"
 
@@ -1057,7 +1115,7 @@ msgstr "Едно"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL енкрипција"
 
@@ -1125,7 +1183,7 @@ msgstr "Поддржани основи за пребарување"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS енкрипција"
 
@@ -1152,8 +1210,12 @@ msgstr ""
 "ги вклучи само ставките едно ниво под основата."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
+#| msgid ""
+#| "This is the full name of your ldap server. For example, \"ldap.mycompany."
+#| "com\"."
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Ова е полното име на Вашиот LDAP сервер. На пример, „ldap.mojatafirma.com."
@@ -1168,9 +1230,14 @@ msgstr ""
 "Вашиот адресар ќе стане побавен."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+#| 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."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Ова е методот кој Evolution ќе го користи за да ве автентицира.  Доколку го "
@@ -1224,8 +1291,8 @@ msgid "_Login method:"
 msgstr "Метод на _најава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1240,7 +1307,7 @@ msgid "_Search scope:"
 msgstr "_Опсег на пребарувањето:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Сервер:"
@@ -1258,13 +1325,14 @@ msgid "cards"
 msgstr "картички"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:715
-#: ../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 "минути"
 
@@ -1305,8 +1373,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Работа</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1317,16 +1385,16 @@ msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Уредувач на контакти"
 
@@ -1335,6 +1403,7 @@ msgid "Full _Name..."
 msgstr "Целосно _име..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Слика"
 
@@ -1353,155 +1422,161 @@ msgstr "Пре_кар:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#, fuzzy
+#| msgid "Novell Groupwise"
+msgid "Novell GroupWise"
+msgstr "Novell Groupwise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Лични информации"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Телефон"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Работа"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Годишнина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Асистент:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Роденден:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "Гр_ад:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Компанија:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "Зем_ја:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Оддел:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Датотека под:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Слободен/зафатен:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Домашна страница:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Менаџер:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Забелешки:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "Канцеларија:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Поштенски фах:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Професија:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Со_пруг:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Држава/Провинција:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Титула:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Видео разговор:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Преферира да добива HTML пошта"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Веб лог:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Каде:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Поштенск_и код:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Адреса"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Може да се уредува"
 
@@ -2474,13 +2549,13 @@ msgid "Zimbabwe"
 msgstr "Зимбабве"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Име"
@@ -2490,8 +2565,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2504,99 +2579,108 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#, fuzzy
+#| msgid "Type"
+msgid "Skype"
+msgstr "Тип"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Сервис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Локација"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Корисничко име"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Дома"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Друго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Изворен адресар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Целен адресар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Е нов контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Полиња во кои може да се пишува"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Потребни полиња"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Променето"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уредувач на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Изберете слика за овој контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Нема слика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,47 +2688,47 @@ msgstr ""
 "Податоците на контактот се невалидни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ има невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ има невалиден формат"
 
-#: ../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“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Измени во целост"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Целосно име:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "E-_пошта:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Одбери Адресар"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2653,7 +2737,7 @@ msgstr ""
 "Дали сте сигурен/на дека сакате\n"
 "да ја избришете листата на контакти(%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2661,7 +2745,7 @@ msgstr ""
 "Дали сте сигурни дека сакате\n"
 "да ги избришете овие листи на контакти?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2670,7 +2754,7 @@ msgstr ""
 "Дали сте сигурен/на дека сакате\n"
 "да го избришете контактот(%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2777,9 +2861,9 @@ msgstr "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:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Локација:"
 
@@ -2788,11 +2872,14 @@ msgid "<b>Members</b>"
 msgstr "<b>Членови</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Уредувач на листа со контакти"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Одбери..."
 
@@ -2808,25 +2895,25 @@ msgstr "_Име на листа:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Внесете адреса за е-пошта или довлечете го контактот во листата долу:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Членови на листа на контакти"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "_Членови"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Адресар"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Е нова листа"
 
@@ -2868,33 +2955,33 @@ msgstr ""
 "во оваа папка. Дали сепак сакате да ја додадете?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Спои"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "Спои контакт"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Е-пошта"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Било кое поле содржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "Адресата почнува со"
 
@@ -2902,11 +2989,11 @@ msgstr "Адресата почнува со"
 msgid "Name contains"
 msgstr "Името содржи"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Нема контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2914,56 +3001,56 @@ msgstr[0] "%d контакт"
 msgstr[1] "%d контакти"
 msgstr[2] "%d контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Прашалник"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Грешка при добивање на поглед на адресарот"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Модел"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Грешка при измената на картичката"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Името почнува со"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Извор"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Тип"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Сними како vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвори"
@@ -3017,12 +3104,12 @@ msgid "Cu_t"
 msgstr "От_сечи"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3033,20 +3120,20 @@ msgid "P_aste"
 msgstr "Вм_етни"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Друга грешка"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Несовпаднати"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Асистент"
 
@@ -3076,7 +3163,7 @@ msgstr "Телефон во кола"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3084,7 +3171,7 @@ msgid "Categories"
 msgstr "Категории"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Компанија"
 
@@ -3133,22 +3220,22 @@ msgid "Journal"
 msgstr "Журнал"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Менаџер"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Прекар"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Забелешка"
 
@@ -3177,14 +3264,14 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Улога"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Сопруг/а"
 
@@ -3214,63 +3301,63 @@ msgstr "Единица"
 msgid "Web Site"
 msgstr "Веб сајт"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Ширина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Висина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Има фокус"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Поле"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Име на полето"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Текстуален модел"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Максимална должина на името на полето"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Ширина на колоната"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3280,7 +3367,7 @@ msgstr ""
 "\n"
 "Ги барам контактите..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3294,7 +3381,7 @@ msgstr ""
 "\n"
 "или двоен клик овде за создавање на нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3308,7 +3395,7 @@ msgstr ""
 "\n"
 "Кликнете двапати за да креирате нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3318,7 +3405,7 @@ msgstr ""
 "\n"
 "Барај го контактот."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3328,302 +3415,322 @@ msgstr ""
 "\n"
 "Нема предмети за прикажување во овој поглед."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Е-пошта на работа"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Домашна е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Друга е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Одбрано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Има стрелка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Отвори ја врската во прелистувач"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_Копирај ја локацијата на врската"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Испрати нова порака до..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Копирај ја _адресата за е-пошта"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(map)"
 
-#: ../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 "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Членови на листа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Оддел"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Професија"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Позиција"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Видео разговор"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:113
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Слободен/зафатен"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Домашна страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Веб лог"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Роденден"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Годишнина"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Професија"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Домашна страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Успех"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Backend зафатен"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Складиштето е офлајн"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Адресарот не постои"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Не е дефиниран контакт за себе"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Недозволен пристап"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Контактот не е пронајден"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Контакт ID-то веќе постои"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Протоколот не е поддржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "Откажано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Не може да се откаже"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Автентикацијата не успеа"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Потребна е афтентикација"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS не е достапно"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Нема таков извор"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Не е достапно во офлајн режим"
 
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "Друга грешка"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Невалидна верзија на серверот"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Неподдржан метод за автентикација"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+#| msgid ""
+#| "We were unable to open this addressbook. This either means this book is "
+#| "not marked for offline usage or not yet downloaded for offline usage. "
+#| "Please load the addressbook once in online mode to download its contents"
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "Не можеме да го отвориме овој адресар. Ова или значи дека оваа книга не е "
 "означена за офлајн користење или сѐ уште не е преземен за офлајн користење. "
 "Вчитајте го повторно адресарот во онлајн режим за преземање на неговата "
 "содржина"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
-#, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, fuzzy, c-format
+#| msgid ""
+#| "We were unable to open this addressbook.  Please check that the path %s "
+#| "exists and that you have permission to access it."
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "Не може да се отвори овој адресар.  Проверете дали патеката %s постои и дали "
 "имате пермисии за пристап."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Не може да се отвори овој адресар.  Тоа значи дека или внесовте погрешен URI "
-"или LDAP серверот е недостапен."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+#| 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."
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "Оваа верзија на Evolution нема вклучено поддршка за LDAP. Ако сакате да "
 "користите LDAP во Evolution, мора да инсталирате Evolution пакет со LDAP "
 "поддршка."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:132
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
+#| msgid ""
+#| "We were unable to open this addressbook.  This either means you have "
+#| "entered an incorrect URI, or the server is unreachable."
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "Не можеше да се отвори овој адресар.  Тоа значи дека или сте внеле погрешен "
 "URI, или серверот е недостапен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:138
-msgid "Detailed error:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, fuzzy
+#| msgid "Detailed error:"
+msgid "Detailed error message:"
 msgstr "Детали на грешка:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#, fuzzy
+#| msgid ""
+#| "More cards matched this query than either the server is \n"
+#| "configured to return or Evolution is configured to display.\n"
+#| "Please make your search more specific or raise the result limit in\n"
+#| "the directory server preferences for this addressbook."
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Повеќе картички се совпаднаа со барањето отколку што може да се прикажат,\n"
 "бидејќи или серверот или Evolution е така конфигуриран.\n"
@@ -3631,57 +3738,67 @@ msgstr ""
 "или зголемете ги ограничувањата за приказ на резултатите за серверот за овој "
 "адресар."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
+#| msgid ""
+#| "The time to execute this query exceeded the server limit or the limit\n"
+#| "you have configured for this addressbook.  Please make your search\n"
+#| "more specific or raise the time limit in the directory server\n"
+#| "preferences for this addressbook."
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  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 addressbook."
+"preferences for this address book."
 msgstr ""
 "Времето потребно за ова пребарување го надмина лимитот на\n"
 "серверот или лимитот подесен за овој адресар.\n"
 "Пробајте да дадете поспецифични критериуми за пребарување\n"
 "или зголемете ги лимитите за серверот за овој адресар."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#, fuzzy
+#| msgid "The backend for this addressbook was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Системот за овој адресар не можеше да го парсира ова барање."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#, fuzzy
+#| msgid "The backend for this addressbook refused to perform this query."
+msgid "The backend for this address book refused to perform this query."
 msgstr "Системот за овој адресар нема да го изврши ова барање."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Овој барање не заврши успешно."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Грешка при додавање на листата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
-#: ../addressbook/gui/widgets/eab-gui-util.c:677
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Грешка при додавање на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Грешка при изменувањето на листата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Грешка при изменувањето на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Грешка во отстранувањето на листата"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#: ../addressbook/gui/widgets/eab-gui-util.c:627
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Грешка во отстранувањето на контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3699,16 +3816,16 @@ msgstr[2] ""
 "Отворањето на %d контакти ќе отвори %d нови прозорци.\n"
 "Дали навистина сакате да ги прикажете овие контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:314
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Не прикажувај"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Прикажи ги _сите контакти"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3717,15 +3834,15 @@ msgstr ""
 "%s веќе постои\n"
 "Дали сакате да запишам над неа?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:345
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Запиши над"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:386
-#: ../addressbook/gui/widgets/eab-gui-util.c:389
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3733,59 +3850,59 @@ msgstr[1] "контакти"
 msgstr[2] "контакти"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:472
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Одбери адресар"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "листа"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Премести го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:740
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Копирај го контактот во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Премести ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Копирај ги контактите во"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Повеќе vCаrds"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:897
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
-#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Информации за контактот"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информации за контактот за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Го чекам адресарот..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3793,68 +3910,70 @@ msgstr[0] "Нема уште %d контакт."
 msgstr[1] "Има %d други контакти."
 msgstr[2] "Има %d други контакти."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Покажи целосна vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Покажи компактна vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
+#, fuzzy
+#| msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Зачувај во адресарот"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Приказ на картичка"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Увезувам..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV таб увезувач"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV или Tab Увезувач"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution VCard и таб увезувач"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF увезувач"
 
-#: ../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 "Evolution vCard увезувач"
 
@@ -3899,12 +4018,12 @@ msgid "Format"
 msgstr "Формат"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Заглавие"
 
@@ -4006,9 +4125,9 @@ msgstr "Сенчење"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Големина:"
 
@@ -4025,7 +4144,7 @@ msgid "Top:"
 msgstr "Горе:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Тип:"
 
@@ -4037,68 +4156,49 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "_Фонт..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr "Тест печатење на уредувач на стилови на контакти"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Авторски права (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr ""
-"Ова треба да ја тестира графичката контрола на уредувачот за стил на "
-"печатење на контактот"
-
-#: ../addressbook/printing/test-print.c:43
-msgid "Contact Print Test"
-msgstr "Тест печатење на контакти"
-
-#: ../addressbook/printing/test-print.c:46
-msgid "This should test the contact print code"
-msgstr "Ова треба да го тестира кодот за печатење на контактот"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Не може да се отвори датотеката"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+#, fuzzy
+#| msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Не може да се добие листата на адресари"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "не може да се отвори адресарот"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Одреди ја излезната датотека наместо на стандарден излез"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#: ../addressbook/tools/evolution-addressbook-export.c:52
+#, fuzzy
+#| msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Прикажи ги локални папки со адресари"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Покажи ги картичките како vcard или csv датотека"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Извези во асинхрон режим"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4106,29 +4206,30 @@ msgstr ""
 "Бројот на картички во една излезна датотека во асинхрон режим, стандардна "
 "големина 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "БРОЈ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Грешка во аргументите на командната линија, користи --help за помош при "
 "употребата."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Поддржи само csv или vcard формат."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Во async режим, излезот мора да е датотека."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Во нормален режим, нема потреба за опцијата за големина."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
@@ -4138,8 +4239,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' е календар кој може само да се чита. Ве молам, изберете друг календар од "
-"странчната лента во прегледот на календари."
+"'{0}' е календар кој може само да се чита. Ве молам, изберете друг календар "
+"од странчната лента во прегледот на календари."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -4147,8 +4248,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"„{0}“ е извор на календар кој може само да се чита. Префрлете се на поглед на "
-"календар и означете календар кој може да прифаќа состаноци."
+"„{0}“ е извор на календар кој може само да се чита. Префрлете се на поглед "
+"на календар и означете календар кој може да прифаќа состаноци."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4193,13 +4294,15 @@ msgstr ""
 "вратат."
 
 #: ../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 ""
 "Сите информации за овој состанок ќе бидат избришани и нема да може да се "
 "вратат."
 
 #: ../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 ""
 "Сите информации за овој состанок ќе бидат избришани и нема да може да се "
 "вратат."
@@ -4222,7 +4325,8 @@ msgstr "Дали сте сигурни дека сакате да ја избр�
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Дали сте сигурни дека сакате да го избришете состанокот насловен „{0}“'?"
+msgstr ""
+"Дали сте сигурни дека сакате да го избришете состанокот насловен „{0}“'?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
@@ -4245,72 +4349,81 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој состанок?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој состанок?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Дали сте сигурни дека сакате да го избришете овој мемоар?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Дали си сигурни дека сакате да ја избришете оваа задача?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Дали сте сигурни дека сакате да го испратите меморандумот без краток преглед?"
+msgstr ""
+"Дали сте сигурни дека сакате да го испратите меморандумот без краток преглед?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Дали сте сигурни дека сакате да го испратите состанокот без краток преглед?"
+msgstr ""
+"Дали сте сигурни дека сакате да го испратите состанокот без краток преглед?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Дали сте сигурни дека сакате да ја испратите задачата без краток преглед?"
+msgstr ""
+"Дали сте сигурни дека сакате да ја испратите задачата без краток преглед?"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+#| msgid "Repository offline"
+msgid "Calendar repository is offline."
+msgstr "Складиштето е офлајн"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Не можам да креирам нов документ"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Не можам да го зачувам настанот"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Да го избришам календарот„{0}“?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Да ја избришам мемо листата „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Да ја избришам листата со задачи „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Не испраќај"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Преземање во тек. Дали сакате да го зачувате состанокот?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Преземање во тек. Дали сакате да ја зачувате задачата?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Уредувачот не може да се вчита."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4318,25 +4431,33 @@ msgstr ""
 "Поканите ќе бидат испратени преку пошта на сите учесници и ќе им биде "
 "дозволено да ја прифатат оваа задача."
 
-#: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to reply."
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Поканите ќе бидат испратени преку е-пошта на сите учесници и ќе им биде "
 "дозволено да одговорат."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Грешка при вчитување на календарот"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Грешка при вчитување на листата со меморандуми"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Грешка при вчитување на листата со задачи"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+#| msgid "Error while {0}."
+msgid "Error on '{0}'"
+msgstr "Грешка при {0}."
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4344,7 +4465,7 @@ msgstr ""
 "Ако не испратите известување за отказ, другите учесници може да не знаат "
 "дека состанокот е откажан."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4352,7 +4473,7 @@ msgstr ""
 "Ако не испратите известување за откажување, другите учесници може да не "
 "знаат дека мемоарот е избришан."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4360,7 +4481,30 @@ msgstr ""
 "Ако не испратите известување за отказ, другите учесници може да не знаат "
 "дека задачата е избришана."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+#, fuzzy
+#| msgid "New Appointment"
+msgid "Save Appointment"
+msgstr "Ново закажување"
+
+#: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgid "Save Memo"
+msgstr "_Споделен меморандум"
+
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save Task"
+msgstr "Зачувај како..."
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4368,7 +4512,7 @@ msgstr ""
 "Испраќањето на ажурирани податоци им дозволува на другите учесници да имаат "
 "ажурирани календари."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4376,7 +4520,7 @@ msgstr ""
 "Испраќањето на ажурирани податоци им дозволува на другите учесници да имаат "
 "ажурирани листи со задачи."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4384,7 +4528,7 @@ msgstr ""
 "Има преземено неколку приврзоци. Зачувувањето на закажувањето ќе предизвика "
 "губење на тие приврзоци"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4392,83 +4536,97 @@ msgstr ""
 "Има неколку приврзоци кои се преземаат. Зачувувањето на задачата ќе "
 "предизвика губиток на тие приврзоци."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "Некои опции може да не работат правилно со вашиот тековен сервер."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календарот на Evolution неочекувано откажа."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Календарот на Evolution неочекувано откажа."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution меморандумот неочекувано откажа."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Задачите на Evolution неочекувано откажаа."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Календарот не е означен за офлајн користење"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Листатата со меморандуми не е означена за офлајн користење."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Листата со задачи не е означен за офлајн користење"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Овој календар ќе биде трајно отстранет."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Листата со меморандуми ќе биде трајно отстранет."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Листата со задачи ќе биде трајно отстранет."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+#| msgid "Failed to load the calendar '%s'"
+msgid "Unable to load the calendar"
+msgstr "Не може да се отвори календарот „%s“."
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Дали сакате да ги зачувате промените за овој состанок?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Дали сакате да ги зачувате вашите измени на оваа задача?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Дали сакате да ги зачувате вашите измени на оваа задача?"
 
-#: ../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 "Дали сакате да испратите известување за откажување за овој мемоар?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Дали сакате да им испратите известување за отказ на сите учесници?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Дали сакате да им испратите на учесниците покани за состанок?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Дали сакате да им ја испратите задачава на учесниците?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Дали сакате да им испратите ажурирани податоци за состанок на учесниците?"
+msgstr ""
+"Дали сакате да им испратите ажурирани податоци за состанок на учесниците?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr "Дали сакате да има испратите ажурирани информации за задачи на учесниците?"
+msgstr ""
+"Дали сакате да има испратите ажурирани информации за задачи на учесниците?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4478,115 +4636,118 @@ msgstr ""
 "проблеми со користењето на Evolution. Најдобро е серверот да биде надграден "
 "во поддржана верзија."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Вие направивте измени на овој состанок, но сѐ уште не ги зачувавте."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Вие направивте промени на оваа задача, но сѐ уште не ги зачувавте."
 
-#: ../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 "Вие направивте промени на оваа задача, но сѐ уште не ги зачувавте."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Вашите календари нема да бидат достапни сѐ додека Evolution не се рестартира."
+msgstr ""
+"Вашите календари нема да бидат достапни сѐ додека 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 ""
 "Вашите меморандуми нема да бидат достапни сѐ додека 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 "Вашите задачи нема да бидат достапни сѐ додека Evolution не се рестартира."
+msgstr ""
+"Вашите задачи нема да бидат достапни сѐ додека Evolution не се рестартира."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Отфрли ги промените"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Зачувај"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Зачувај ги промените"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Испрати"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "И_спрати известување"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Подели ги повеќедневните настани:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "Не може да се подигне evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Неможе да го чита блокот на апликацијата за календар на пилот уредот"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
-msgstr "Не можам да го прочитам блокот за апликацијата за меморандуми на пилот уредот"
+msgstr ""
+"Не можам да го прочитам блокот за апликацијата за меморандуми на пилот уредот"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 "Не можам да го пишувам на блокот за апликацијата за меморандуми на пилот "
 "уредот"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Стандарден приоритет:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "Не можам да го прочитам блокот за блокот за апликацијата за „ToDo“ на пилот "
 "уредот"
 
-#: ../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 ""
 "Не можам да го запишувам на блокот за блокот за апликацијата за „ToDo“ на "
 "пилот уредот"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4627,25 +4788,25 @@ msgid "Memo_s"
 msgstr "Меморанду_ми"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Меморандуми"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задачи"
@@ -4663,28 +4824,29 @@ msgstr "_Задачи"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Аларм-сервис за известување од календарот на Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 msgstr[2] "минути"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:716
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "саати"
 msgstr[1] "саати"
 msgstr[2] "саат"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Почетно време"
 
@@ -4695,10 +4857,10 @@ msgstr "Закажувања"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Локација:"
 
@@ -4707,52 +4869,56 @@ msgid "Snooze _time:"
 msgstr "Време на _дремнување:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "_Дремни"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "локација на состанокот"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Нема достапен краток преглед."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "Нема достапен опис."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Нема достапни информации за локација."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4764,7 +4930,7 @@ msgstr ""
 "конфигуриран да испрати е-пошта. Наместо тоа, Evolution ќе прикажува\n"
 "нормален дијалог прозорец за потсетник."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4781,27 +4947,28 @@ msgstr ""
 "\n"
 "Дали сте сигурни дека сакате да ја извршите ова програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Не ме прашувај повторно за ова програма."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Не може да се иницијализира Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "Не може да ја создаде фабрика за аларм известување, можеби веќе работи..."
+msgstr ""
+"Не може да ја создаде фабрика за аларм известување, можеби веќе работи..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "неважечко време"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4810,8 +4977,8 @@ msgstr[1] "%d часа"
 msgstr[2] "%d часа"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4822,8 +4989,8 @@ msgstr[2] "%d минути"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4836,156 +5003,182 @@ msgid "Alarm programs"
 msgstr "Аларм програми"
 
 #: ../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 ""
+"Време во секунди за кое треба да се прикаже грешка на статусната лента."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Прашај за потврда при бришење на предмети"
 
-#: ../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 "Боја на позадина на задачите кои се за денес, во „#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 "Боја на позадина на задачите кои се изминати, во „#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 "Календари за кои ќе се извршуваат аларми"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../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 ""
 "Боја за цртање на Маркус Бејнсовата линија во лентата за време (празно за "
 "стандардно)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Боја за цртање на Маркус Бејнс линијата во поглед на денот."
 
-#: ../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 "Компресирај ги викендите во месечен приказ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Потврди уништување"
 
-#: ../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 "Денови за кои треба да се укаже почетокот и крајот на работното време."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Стандарден потсетник за состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Стандардни единици на потсетникот"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Стандардна вредност на потсетникот"
 
-#: ../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 "Директориум за зачувување на аудио датотеките за аларм"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Прелив за настаните"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Провидност на настаните"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Слободни/зафатени сервер URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Слободен/зафатен мостра url"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "Прелив(градиент) за настаните во прегледите на календарот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Скриј ги завршените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Скриј ги единиците на задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Скриј ја вредноста на задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Хоризонтална позиција на површината"
 
-#: ../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 "Часот во работниот ден завршува, во 24 часовен формат, од 0 до 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 "Часот во работниот ден започнува, во 24 часовен формат, од 0 до 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 "Интервали прикажани во дневен и приказ на работна недела, во минути."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Време на последниот аларм"
 
-#: ../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 "Ниво после кое пораката треба да се логира."
+
+#: ../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 "Листа на неколку urls за слободно/зафатено објавување."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Маркус Бејнс линија"
 
-#: ../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 "Боја на Маркус Бејнс линија - дневен поглед"
 
-#: ../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 "Боја на Маркус Бејнс линија - лента за време"
 
-#: ../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 "Минутата во која работниот ден завршува, 0 до 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 "Минутата во која работниот ден започнува, 0 до 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 "Позиција на хоризонталната површина за поглед на месецот"
 
-#: ../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 "Позиција на вертикалната површина за поглед на месецот"
 
-#: ../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 "Број на делови за одредување за стандарден потсетник."
 
-#: ../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 "Број на делови за одредување кога да се скријат задачите."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Боја на задоцнети задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4993,7 +5186,7 @@ msgstr ""
 "Позиција на хоризонталната површина помеѓу навигаторот за  датум на "
 "календарот и листата со задачи кои не се во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5001,7 +5194,7 @@ msgstr ""
 "Позиција на хоризонталната површина помеѓу навигаторот за  датум на "
 "календарот и листата со задачи кои се во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5009,7 +5202,7 @@ msgstr ""
 "Позиција на вертикалната површина помеѓу навигаторот за  датум на календарот "
 "и листата со задачи кои не се во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5017,7 +5210,7 @@ msgstr ""
 "Позиција на вертикалнат површина помеѓу навигаторот за  датум на календарот "
 "и листата со задачи кои се во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5025,7 +5218,7 @@ msgstr ""
 "Позиција на вертикалниот панел, помеѓу погледот и датум навигатор календарот "
 "и листата со задачи во месечен поглед, во пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5033,69 +5226,85 @@ msgstr ""
 "Позиција на вертикалниот панел, помежу погледот и датум навигатор календарот "
 "и листата со задачи кога не е во месечен поглед, во пиксели."
 
-#: ../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 "Програми кои може да се стартуваат преку аларми."
 
-#: ../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 "Зачувај го директориумот за звуци за аларм"
 
-#: ../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 "Прикажи RSVP поле во уредувач за настан/задача/состанок"
 
-#: ../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 "Прикажи поле за улога во уредувач за настан/задача/состанок"
 
-#: ../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 "Покажи време на завршување на состанок во поглед на недела и месец"
 
-#: ../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 "Прикажи поле со категории во уредувачот за настан/состанок/задача"
 
-#: ../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 "Покажи приказ на аларми во лентата за известувања"
 
-#: ../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 "Прикажи поле за статус во уредувачот за настан/задача/состанок"
 
-#: ../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 "Покажи ја површината „Преглед“"
 
-#: ../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 "Покажи ја површината „Преглед“"
 
-#: ../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 "Прикажи временска зона поле во уредувачот за настан/состанок"
 
-#: ../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 "Прикажи поле за тип во уредувачот за настан/задача/состанок"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Show week numbers in date navigator"
+msgid "Show week number in Day and Work Week View"
+msgstr "Покажи број на недели во навигаторот за датуми"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Покажи број на недели во навигаторот за датуми"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Боја на задачи за денеска"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Позиција на вертикалната површина за задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5104,7 +5313,7 @@ msgstr ""
 "Url мостра за користење како слободно/зафатено резерва на податоци, %u е "
 "заменето од корисничкиот дел на поштенската адреса и %d е заменет од доменот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5112,20 +5321,36 @@ msgstr ""
 "Стандардна временска зона за користење за датум и време во календарот, како "
 "непреведена Олсен локација на база на часовни зони како \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Ова може да има три можни вредности. „0“ за грешки, „1“ за предупредувања и "
+"„2“ за пораки за дебагирање."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Поделба на време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Време кога се вклучи последниот аларм, во time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5133,41 +5358,42 @@ msgstr ""
 "Провидност на настаните во прегледите на календарот, вредност меѓу 0 "
 "(провидно) и 1 (непровидно)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24 часовен формат"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Делови за стандарден потсетник,  „minutes“, „hours“ или „days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Делови за одредување кога да се скријат задачите,  „minutes“, „hours“ или "
 "„days“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Почеток на неделата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ден од неделата кога почнува седмицата, од недела (0) до сабота (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Дали да се користи лентата за известувања за приказ на аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Дали да праша за потврда кога се брише состанок или задача."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Дали да праша за потврда кога се уништуваат состаноци или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5175,146 +5401,153 @@ msgstr ""
 "Дали да се компресираат викендите во месечен поглед, што ги става сабота и "
 "недела во место на еден ден од неделата."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Дали да се прикаже завршното време на настаните во поглед на недела и месец."
+msgstr ""
+"Дали да се прикаже завршното време на настаните во поглед на недела и месец."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Дали да се нацрта Маркус Бејнс линијата (линија на тековно време) во "
 "календарот."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Дали да се скријат завршените задачи во погледот на задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Дали да се постави стандарден потсетник за закажувања."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Дали да се прикажеRSVP уредувач за настан/задача/состанок"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Дали да се прикаже поле за категории во уредувачот за настани/состаноци"
+msgstr ""
+"Дали да се прикаже поле за категории во уредувачот за настани/состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Дали да се прикаже поле за улоги во уредувачот за настани/состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Дали да се прикаже поле за категории во статус во уредувачот на настани/"
 "задачи/состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Дали да се прикаже времето во 24 часовен формат наместо am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Дали да се прикаже поле со временска зона во уредувачот на настани/состаноци"
+msgstr ""
+"Дали да се прикаже поле со временска зона во уредувачот на настани/состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Дали да се прикаже поле за тип во уредувачот на настани/задачи/состаноци"
+msgstr ""
+"Дали да се прикаже поле за тип во уредувачот на настани/задачи/состаноци"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Дали да се прикаже бројот на недели во навигаторот за датуми."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Дали да се прикаже бројот на недели во навигаторот за датуми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Дали да користам летно време прикажвање на настаните."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Работни денови"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Последен час на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Последна минута на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Почетен час на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Почетна минута на работен ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "летно сметање на времето"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Кратката содржина содржи"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Описот содржи"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Категоријата е"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Коментарот содржи"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Локацијата содржи"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Несовпаднати"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи од следните 7 дена"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Активни задачи"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Пропуштени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Завршени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Задачи со приврзоци"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Активни закажувања"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Закажувања во следните 7 дена"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печати"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5323,16 +5556,17 @@ msgstr ""
 "Оваа операција засекогаш ќе ги избрише сите настани постари од избраната "
 "количина време. Ако продолжите, нема да можете да ги обновите овие настани."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Уништи настани постари од"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:717
-#: ../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 "денови"
@@ -5341,345 +5575,253 @@ msgstr "денови"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
 #: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "На веб"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Родендени и годишнини"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Време"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "_Нов Календар"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Копирај..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+msgid "_Make available for offline use"
+msgstr "_Направи го достапен за офлајн користење"
+
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+msgid "_Do not make available for offline use"
+msgstr "_Не го прави ова достапно офлајн"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "Надградбата на календарите не успеа."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Не успеав да го отворам календарот „%s“ за креирање настани и состаноци"
+msgstr ""
+"Не успеав да го отворам календарот „%s“ за креирање настани и состаноци"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема достапен календар за креирање настани и состаноци"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "Избирач на извор на календар"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "Ново закажување"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1522
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Закажување"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "Креирај ново закажување"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "Нов состанок"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1530
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_останок"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "Креирај ново барање за состанок"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "Ново целодневно закажување"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1538
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Цело_дневно закажување"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "Креирај нови целодневни закажувања"
 
-#: ../calendar/gui/calendar-component.c:1619
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1546
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "Креирај нов календар"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Поглед на денот"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Поглед на работната недела"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Поглед на неделата"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Поглед на месец"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Било кое поле"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Приврзоци"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Посетител"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Бизнис"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Категорија"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Класификација"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Натпревар"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Доверливо"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Описот содржи"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Не постои"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Постои"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Омилени"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Подароци"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Цели/задачи"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Празник"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Честитки за празник"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Жешки контакти"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Идеи"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Интернационално"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Клучен муштерија"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Разно"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Следните 7 дена"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Организатор"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Телефонски повици"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Приватно"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:322 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Јавно"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Повторно појавување"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Статус"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Стратегии"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Кратка содржина"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Кратката содржина содржи"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Добавувачи"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Време и трошоци"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "VIP"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "Чекам"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "содржи"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "не содржи"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "е"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "не е"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Грешка при отворањето на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Методот не е подржан при отворањето на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Одбиена дозволата за отварање на календарот"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -5716,17 +5858,17 @@ msgid "Mes_sage:"
 msgstr "Пор_ака:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Пушти звук"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Покажи скокачко известување"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Изврши програма"
 
@@ -5739,7 +5881,7 @@ msgid "Send To:"
 msgstr "Испрати на:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Испрати е-пошта"
 
@@ -5794,7 +5936,7 @@ msgstr "минута/и"
 msgid "start of appointment"
 msgstr "почеток на закажување"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Акција/Активирање"
 
@@ -5803,25 +5945,54 @@ msgid "A_dd"
 msgstr "Д_одај"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Аларми"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи автоматски приказ на приврзок"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Прикачи датотека(и)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ништо"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Избрани календари за извршување на аларми"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+#| msgid "Show _field in View"
+msgid "(Shown in a Day View)"
+msgstr "Покажи _поле во поглед"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5835,59 +6006,60 @@ msgstr ""
 "10 минути\n"
 "05 минути"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u и %d ќе бидат заменети од корисникот и доменот од адресата на е-пошта."
 "</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Известувања</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Стандарден слободен/зафатен сервер</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Главно</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Листа на задачи</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Време</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Работна седмица</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Прилагодувања за летно сме_тање на времето"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Денот _завршува:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Прикажи"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Петок"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5897,13 +6069,13 @@ msgstr ""
 "Часови\n"
 "Денови"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Понеделник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5921,286 +6093,308 @@ msgstr ""
 "Сабота\n"
 "Недела"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Избери боја"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "С_онце"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Сабота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+#| msgid "Send To:"
+msgid "Se_cond zone:"
+msgstr "Испрати на:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Одбери ги календарите за известување со аларм"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "По_кажи потсетник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+#| msgid "Sh_ow a reminder"
+msgid "Show a _reminder"
+msgstr "По_кажи потсетник"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Прикажи неделни _броеви во навигаторот за датуми"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+#| msgid "Show week numbers in date navigator"
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Покажи број на недели во навигаторот за датуми"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Недела"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "З_адачи до денеска:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "Ч_ет"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Мостра:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Четврток"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Временска _зона:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Формат на време:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Среда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Н_еделата започнува:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Работни денови:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 часа (АМ/ПМ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 часа"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Побарај потврда при бришење на предмети"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Компрезирај ги викендите во месечниот приказ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_Денот започнува:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Пет"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Скриј ги завршените задачи после"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Пон"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "_Пропуштени задачи:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_Саб"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Прикажи ги времето на завршување на закажувањата во погледот на неделата и "
 "месецот"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "_Поделба на време:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Вто"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_Сре"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "пред секое закажување"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Коп_ирај содржина на календар локално за работење офлајн"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Копир_ај ја листата на задачи локално за офлајн работење"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Копира_ј ја листата на меморандуми локално за офлајн работење"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "Б_оја:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Листа на задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Листа со меморандуми"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Својства на календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Својства на листа со задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Нова листа со задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Својства на листа со меморандуми"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Нова листа со меморандуми"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Овој настан беше избришан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Ова задача беше избришана."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Овој мемоар беше избришан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Направивте измени. Да ги заборавам овие промени и да го затворам "
 "уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Не направивте промени. Да го затворам уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Овој настан е променет."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ова задача е променета."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Овој мемоар е променет."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Направивте промени. Да ги заборавам промените и да го ажурирам "
 "уредувачот?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Не направивте промени. Да го ажурирам уредувачот?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Потврдувачка грешка: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr " до "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (До "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "До "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Прикачена порака - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6208,211 +6402,216 @@ msgstr[0] "Прикачена е %d порака"
 msgstr[1] "Прикачени пораки - %d"
 msgstr[2] "Прикачени пораки - %d"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Помести"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Откажи _влечење"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "приврзок"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Објектот не може да се ажурира"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Уреди закажување"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Состанок - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Закажување - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Доделeна задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Мемоар - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Без кратка содржина"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Кликни овде за затворање на тековниот прозорец"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Копирај одбран текст во клипбордот"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Отсечи одбран текст во таблата со исечоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Кликни овде за помош"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Вметни текст од таблата со исечоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Кликни овде за зачувување на тековниот прозорец"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Одбери го целиот текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "К_ласификација"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../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:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Помош"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Вметни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Опции"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Поглед"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Приврзок..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Кликни овде за прикачување датотека"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Категории"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Го менува прикажувањето на категории"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Го менува прикажувањето на временската зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Јав_но"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Класификувај како јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Приватно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Класифицирај како приватно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Доверливо"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Класифицирај како доверливо"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "_Улога поле"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Го менува прикажувањето на полето за улога "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Го менува прикажувањето на RSVP полето"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Статусно поле"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Го менува прикажувањето на статусното поле"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Тип поле"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Го менува прикажувањето полето за тип на присутни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
-msgstr "Скорешни доку_менти"
+#: ../calendar/gui/dialogs/comp-editor.c:1820
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+msgid "Recent _Documents"
+msgstr "Скорешни _документи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1839
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Прикачи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1934
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6420,114 +6619,115 @@ msgstr[0] "<b>%d</b> приврзок"
 msgstr[1] "<b>%d</b> приврзоци"
 msgstr[2] "<b>%d</b> приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1966
 msgid "Hide Attachment _Bar"
 msgstr "Скриј ја _лентата за приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1969
+#: ../calendar/gui/dialogs/comp-editor.c:2272
 msgid "Show Attachment _Bar"
 msgstr "Прикажи лента за при_врзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Отстрани"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Додај приврзок..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Прикажи приврзоци"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2295
 msgid "Press space key to toggle attachment bar"
-msgstr "Притиснете на копчето „space“ за да пуштите/исклучите лента со приврзоци"
+msgstr ""
+"Притиснете на копчето „space“ за да пуштите/исклучите лента со приврзоци"
 
-#: ../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:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2488
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Измените направени на овој предмет ќе бидат отфрлени ако пристигне "
 "ажурирањето"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3363
 msgid "Unable to use current version!"
 msgstr "Не можам да ја користам сегашната верзија!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Не може да се отвори изворот"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Не може да се отвори дестинацијата"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Дестинацијата е само за читање"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Да го _избришам овој предмет од поштенските сандачиња на сите други "
 "приматели?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Настанот не може да биде избришан поради грешка со corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задачата не може да биде избришана поради грешка со corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Мемоарот не може да биде избришан поради грешка со corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Предметот не може да биде избришан поради грешка со corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Настанот не може да биде избришан затоа што пристабот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задачата не може да биде избришана затоа што пристабот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Мемоарот не може да биде избришан затоа што пристабот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Елементот не може да биде избришан затоа што пристабот беше одбиен"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Настанот не може да биде избришан поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Задачата не може да биде избришана поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Мемоарот не може да биде избришан поради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Предметот не може да биде избришан поради грешка"
 
@@ -6536,7 +6736,7 @@ msgid "Contacts..."
 msgstr "Контакти..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "Пренеси на:"
 
@@ -6544,142 +6744,143 @@ msgstr "Пренеси на:"
 msgid "Enter Delegate"
 msgstr "Внеси пренос"
 
-#: ../calendar/gui/dialogs/event-editor.c:194
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Аларми"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Кликни овде за поставување аларми за овој настан"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "Повто_рно појавување"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Направи го овој настан повторувачки"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Опции за испраќање"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Внеси напредни опции за испраќање"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Цело_дневен настан"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Го менува прикажувањето на целодневен настан"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Покажи време како _зафатен"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Го менува прикажувањето на времето како зафатено"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Слободна/зафатена"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Објави слободно/зафатено информации за присутните"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Зака_жување"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "Овој настан има аларми"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "_Делегати"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Прис_утни"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Настан без почетен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Настан без завршен датум"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "Почетната дата е погрешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Крајната дата е погрешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Почетното време е погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Крајното време е прогрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "Избраниот организатор повеќе нема сметка."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Потребен е организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Барем еден присутен е потребен."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Додај "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не може да се отвори календарот „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Делувате во име на %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6687,7 +6888,7 @@ msgstr[0] "%d ден пред состанокот"
 msgstr[1] "%d денa пред состанокот"
 msgstr[2] "%d денa пред состанокот"
 
-#: ../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"
@@ -6695,7 +6896,7 @@ msgstr[0] "%d час пред состанокот"
 msgstr[1] "%d часа пред состанокот"
 msgstr[2] "%d часа пред состанокот"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6703,28 +6904,10 @@ msgstr[0] "%d минута пред состанокот"
 msgstr[1] "%d минути пред состанокот"
 msgstr[2] "%d минути пред состанокот"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "Прилагоди..."
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:69
-msgid "None"
-msgstr "Ништо"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 ден пред состанокот"
@@ -6800,19 +6983,19 @@ msgstr "Ко_нтакти..."
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "Мемо"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Не можам да ги отворам меморандумите во „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../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 "До"
 
@@ -6826,58 +7009,62 @@ msgid "T_o:"
 msgstr "Д_о:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Променувате повторувачки настан, што сакате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Вие делегирате повторувачки настан, што сакате да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Вие променувате повторувачка задача, што сакате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Менувате мемоар што се повторува. Што сакате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Само во овој случај"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Овој и идни случаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Овој и идни случаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Сите случаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Овој состанок содржи повторувања што Evolution не може да ги уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Повторувачкиот датум е неважечки"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "на"
 
@@ -6885,7 +7072,7 @@ msgstr "на"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "прв"
 
@@ -6894,7 +7081,7 @@ msgstr "прв"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "втор"
 
@@ -6902,7 +7089,7 @@ msgstr "втор"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "трет"
 
@@ -6910,7 +7097,7 @@ msgstr "трет"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "четврт"
 
@@ -6918,13 +7105,13 @@ msgstr "четврт"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "последен"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Друг датум"
 
@@ -6932,7 +7119,7 @@ msgstr "Друг датум"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1ви до 10ти"
 
@@ -6940,7 +7127,7 @@ msgstr "1ви до 10ти"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11ти до 20ти"
 
@@ -6948,45 +7135,45 @@ msgstr "11ти до 20ти"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21ви до 31ви"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "ден"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "случувања"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Додај исклучок"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Не можам да добијам избор за изменување."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Измени го исклучокот"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Не можам да добијам избор за бришење."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -7037,12 +7224,16 @@ msgstr "недела(и)"
 msgid "year(s)"
 msgstr "година/и"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Датата на завршување е погрешна"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Веб страница"
 
@@ -7057,55 +7248,55 @@ msgstr "<span weight=\"bold\">Статус</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Завршено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Високо"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "Во тек"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Ниско"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:970 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Нормално"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Не започнато"
 
@@ -7118,7 +7309,7 @@ msgid "Stat_us:"
 msgstr "Стат_ус:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Недефинирано"
 
@@ -7135,37 +7326,37 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:111
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Детали за _статусот"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Кликнете смени/погледни статусни детали на задачата"
 
-#: ../calendar/gui/dialogs/task-editor.c:121
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Опции за ис_праќање"
 
-#: ../calendar/gui/dialogs/task-editor.c:316
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Детали за задачата"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "Датумот на завршување е погрешен"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не може да се отворат задачите во „%s“."
@@ -7187,7 +7378,7 @@ msgid "Time zone:"
 msgstr "Временска зона:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7196,7 +7387,7 @@ msgstr[1] "%d дена"
 msgstr[2] "%d дена"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -7204,116 +7395,116 @@ msgstr[0] "%d недела"
 msgstr[1] "%d недели"
 msgstr[2] "%d недели"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ќе се изврши непознато дејство"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пред почетокот на состанокот"
 
 #. 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 по почетокот на состанокот"
 
 #. 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 на почетокот на состанокот"
 
 #. 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 пред крајот на состанокот"
 
 #. 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 по завршувањето на состанокот"
 
 #. 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 на крајот на состанокот"
 
 #. 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 на %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 за непознат вид на активирање"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликни за отворање на %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Без наслов"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Почетeн датум:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Кратка содржина:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Краен датум:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Приоритет:"
 
@@ -7326,18 +7517,18 @@ msgstr "Краен датум"
 msgid "Start Date"
 msgstr "Почетен датум"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Слободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Зафатено"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7347,225 +7538,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
+#: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Се повторува"
 
-#: ../calendar/gui/e-cal-model.c:974
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Доделено"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Одбери папка за зачувување на одбраните приврзоци..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "слика_без_наслов.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Зачувај како..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Постави како _позадина"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Зачувај го избраното"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори во %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Без кратка содржина *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Старт: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "До: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Бришење на одбраните објекти"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Ги ажурирам објектите"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Зачувај како..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Нова _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Отвори ја _веб страницата"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Печати..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Исе_чи"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Вметни"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Додели задача"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препрати како iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "_Означи како завршено"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Означи ги одбраните задачи како завршени"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "_Означи како незавршено"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Означи ја одбраната задача како незавршена"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "_Избриши ги одбраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Кликнете за да додадете задача"
@@ -7588,8 +7779,8 @@ msgid "Due date"
 msgstr "Краен датум"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -7597,108 +7788,155 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Почетен датум"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Статус"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Поместување на предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Копирање предмети"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Нов _состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Нов целодневен _настан"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Нов _состанок"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Моментален поглед"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Избери _денес"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Избери датум..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "Печ_ати..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "Ко_пирај во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Премести во календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Закажи состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Закажи состанок..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Препрати како iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Одговори им на _сите"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Направи ја ова појава _пренослива"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Избриши ја оваа _појава"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Избриши ги _сите појави"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Прифатено"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Одбиено"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Пробен"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Пренесено"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+#, fuzzy
+#| msgid "Needs Action"
+msgid "Needs action"
+msgstr "Потребно е дејство"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "Локација: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7711,39 +7949,52 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:589
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i делови од минута"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the second time zone"
+msgstr "Покажи ја површината „Преглед“"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+#| msgid "Week"
+msgid "Week %d"
+msgstr "Недела"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложено повторување)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7751,7 +8002,7 @@ msgstr[0] "Секој %d ден"
 msgstr[1] "На секои %d дена"
 msgstr[2] "На секои %d дена"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7759,7 +8010,7 @@ msgstr[0] "Секоја %d недела"
 msgstr[1] "На секоја %d недела"
 msgstr[2] "На секоја %d недела"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7768,21 +8019,21 @@ msgstr[1] "На секоја %d недела во"
 msgstr[2] "На секоја %d недела во"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s ден од "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s од "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7790,7 +8041,7 @@ msgstr[0] "секој %d месец"
 msgstr[1] "секои %d месеци"
 msgstr[2] "секои %d месеци"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7798,56 +8049,58 @@ msgstr[0] "Секоја %d година"
 msgstr[1] "На секои %d години"
 msgstr[2] "На секои %d години"
 
-#: ../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 "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "вкупно %d"
 msgstr[1] "вкупно %d"
 msgstr[2] "вкупно %d"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", завршува на "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Почнува"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Завршува"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "До "
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar информации"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar грешка"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Непозната личност"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7855,289 +8108,281 @@ msgstr ""
 "<br> Ве молам прегледајте ги следните информации, и потоа одберете дејство "
 "од менито подолу."
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "Прифатено"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Пробно прифатено"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "Одбиено"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Овој состанок е откажан, не може да се најде во твоите календари"
 
-#: ../calendar/gui/e-itip-control.c:1285
-msgid "The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1280
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Задачата е откажана, не може да се најде во листата со задачи"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ги објави информациите од состанокот."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Информации од состанокот"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> бара присуство на %s на состанокот."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> бара ваше присуство на состанокот."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Предлог за состанок"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> сака да се додаде на постоечки состанок."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Ажурирање на состанок"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> сака да ги добие најновите информации од состанокот."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Барање за ажурирање на состанок"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> одговори на барање за состанок."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Одговор на состанок"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> откажа состанок."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Откажување на состанок"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> испрати нејасна порака."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Порака од лош состанок"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ги објави информациите за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Информации за задачата"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> бара %s за да изврши задача."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> бара вие да извршите задача."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Предлог за задача"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> сака да се додаде на постоечка задача."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Ажурирање на задача"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> сака да ги добие најновите информации за задачата."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Барање за ажурирање на задача"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> одговори на доделување на задача."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Одговор на задача"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ја откажа задачата."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Откажување на задачата"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Порака за лоша задача"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> објави слободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Слободни/зафатени информации"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> бара слободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Слободни/зафатени информации"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> одговори на слободни/зафатени информации."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Слободен/зафатен одговор"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободна/зафатена порака"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "Изгледа дека пораката не е соодветно формулирана"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Пораката содржи само неподржани барања."
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Додатокот не содржи важечка календарска порака"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Додатокот нема видливи календарски предмети"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Ажурирањето е завршено\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објектот е неважечки и неможе да биде ажуриран\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овој одговор не е од тековен посетител. Да го додадам како посетител?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Статусот на посетителот не може да биде ажуриран заради неважечки статус!\n"
+msgstr ""
+"Статусот на посетителот не може да биде ажуриран заради неважечки статус!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Ажуриран е статусот на посетителот\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статусот на посетителот не  може да биде ажуриран затоа што предметот веќе "
 "не постои"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "Предметот е испратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "Предметот не може да биде испратен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Избери дејство:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Надградба"
 
-#: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2350
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Прифати"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Прифати пробно"
 
-#: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2352
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Испрати слободни/зафатени информации"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Ажурирај го статусот на одговарачот"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Испрати најнови информации"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -8165,112 +8410,93 @@ msgstr "Вчитување календар..."
 msgid "Server Message:"
 msgstr "Серверска порака:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Претседатели"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Потребни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Дополнителни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Ресурси"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Присутни"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Индивидуално"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Ресурс"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Стол"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Потребни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Дополнителни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Не учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Потребно е дејство"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "Пробен"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "Пренесено"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Присутен                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "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 "Во тек"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8278,78 +8504,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Надвор од канцеларија"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Нема информации"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Присут_ни..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "О_пции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Прикажи _само работни часови"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Прикажи _намалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/зафатено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Автоматско одбирање"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Сите луѓе и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Сите_луѓе и еден ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Потребни луѓе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Потребни луѓе и _еден ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Почетно време:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "_Време на завршување:"
 
@@ -8377,16 +8603,15 @@ msgstr "Јазик"
 msgid "Member"
 msgstr "Член"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Избриши ги одбраните меморандуми"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Кликнете за да додадете меморандум"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2960
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8395,16 +8620,16 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Ги вчитувам меморандумите"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ги отворам меморандумите на %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Ги бришам избраните објекти..."
 
@@ -8412,63 +8637,63 @@ msgstr "Ги бришам избраните објекти..."
 msgid "Loading tasks"
 msgstr "Вчитување на задачите"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ги отворам задачите на %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Ги завршувам задачите..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Уништувам"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Изберете временска зона"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "_Прилагоден поглед"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Зачувај го сопствениот поглед"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Дефинирај поглед..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ги вчитувам состаноците на %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ги вчитувам задачите на %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ги вчитувам меморандумите на %s"
 
-#: ../calendar/gui/gnome-cal.c:2919
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање на %s"
 
-#: ../calendar/gui/gnome-cal.c:3873
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Чистење"
 
@@ -8537,19 +8762,19 @@ msgstr "Организаторот мора да биде поставен."
 msgid "At least one attendee is necessary"
 msgstr "Потребно е да има најмалку еден присутен"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Информации за настанот"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "Информации за задачата"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "Информации за мемоар"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "Слободни/зафатени информации"
 
@@ -8557,36 +8782,111 @@ msgstr "Слободни/зафатени информации"
 msgid "Calendar information"
 msgstr "Календарски информации"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+#, fuzzy
+#| msgid "Accepted"
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Прифатено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+#, fuzzy
+#| msgid "Tentatively Accepted"
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Пробно прифатено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+#, fuzzy
+#| msgid "Declined"
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Одбиено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+#, fuzzy
+#| msgid "Delegated"
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Пренесено"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+#, fuzzy
+#| msgid "Updated"
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+#, fuzzy
+#| msgid "Cancel"
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Откажи"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+#, fuzzy
+#| msgid "Refresh"
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+#, fuzzy
+#| msgid "Counter-proposal"
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Предлог за бројач"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободни/Зафатени информации (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "Информации за iCalendar"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "Вие морате да бидете присутен на настанот."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "_Нова листа со меморандуми"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8594,7 +8894,7 @@ msgstr[0] "%d меморандум"
 msgstr[1] "%d меморандуми"
 msgstr[2] "%d меморандуми"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8602,72 +8902,68 @@ msgstr[0] ", %d одбрана"
 msgstr[1] ", %d одбрани"
 msgstr[2] ", %d одбрани"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "Ажурирањето на меморандумите не успеа."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Не можам да ја отворам листата со меморандуми „%s“ за креирање настани и "
 "состаноци"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "Нема достапен календар за креирање меморандуми"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "Одбирач на извор на меморандуми"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "Нов меморандум"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1176
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Мем_орандум"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "Креирај нов меморандум"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "Нов споделен меморандум"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1184
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Споделен меморандум"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "Креирај нов споделен меморандум"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "Нова листа со меморандуми"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1192
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Мемо ли_ста"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "Креирај нова листа со меморандуми"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Печати меморандуми"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Следните 7 дена"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8711,221 +9007,216 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Не може да се мигрираат задачите „%s“"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Белешки"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1-ви"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2-ри"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3-ти"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4-ти"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5-ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6-ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7-ми"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8-ми"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9-ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10-ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11-ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12-ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13-ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14-ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15-ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16-ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17-ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18-ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19-ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20-ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21-ви"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22-ри"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23-ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24-ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25-ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26-ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27-ми"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28-ми"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29-ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30-ти"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31-ви"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "Не"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "По"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Вт"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Пе"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Са"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "Закажување"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "Кратка содржина: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "Присутни: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Проценти завршено: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "Контакти: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2762
-msgid "Upcoming Appointments"
-msgstr "Претстојни закажувања"
-
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "_Нова листа со задачи"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8933,63 +9224,64 @@ msgstr[0] "%d задача"
 msgstr[1] "%d задачи"
 msgstr[2] "%d задачи"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "Ажурирањето на задачи не успеа."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Не може да се отвори листата со задачи „%s“ за креирање настани и состаноци"
+msgstr ""
+"Не може да се отвори листата со задачи „%s“ за креирање настани и состаноци"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "Нема достапен календар за креирање задачи"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "Одбирач на извор на задачи"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "Нова задача"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1240
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "Креирај нова задача"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "Нова доделена задача"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1248
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "До_делена задача"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "Креирај нова доделена задача"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "Нова листа со задачи"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1256
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Листа со _задачи"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "Креирај нова листа со задачи"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9001,11 +9293,11 @@ msgstr ""
 "\n"
 "Дали навистина да ги избришам овие задачи?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "Не ме прашувај повторно."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Печати задачи"
 
@@ -9014,1797 +9306,1824 @@ msgstr "Печати задачи"
 msgid "% Completed"
 msgstr "% завршено"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Откажано"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Во тек"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "е поголемо од"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "е помало од"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Закажувања и состаноци"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Отварање на календар"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar датотеки (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Увезувач на Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Потсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar датотеки (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Увезувач на Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Настани од календарот"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентен увезувач на Evolution Calendar"
 
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Африка/Абиџан"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Африка/Акра"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Африка/Адис Абеба"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Африка/Алжир"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Африка/Асмера"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Африка/Бамако"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Африка/Бангуи"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Африка/Банџул"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Африка/Бисао"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Африка/Блантир"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Африка/Бразавил"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Африка/Буџумбура"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Африка/Каиро"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Африка/Казабланка"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Африка/Сеута"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Африка/Конакри"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Африка/Дакар"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Африка/Дар-ес-Салам"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Африка/Џибути"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Африка/Дуала"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Африка/Ел Ајун"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Африка/Фритаун"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Африка/Габорон"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Африка/Хараре"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Африка/Јоханесбург"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Африка/Кампала"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Африка/Картум"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Африка/Кигали"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Африка/Киншаса"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Африка/Лагос"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Африка/Либревил"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Африка/Лом"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Африка/Луанда"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Африка/Лубумбаши"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Африка/Лусака"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Африка/Малабо"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Африка/Мапуто"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Африка/Масеру"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Африка/Мбабане"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Африка/Могадишу"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Африка/Монровиjа"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Африка/Најроби"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Африка/Нџамена"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Африка/Ниамеј"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Африка/Нуакчот"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Африка/Уагадугу"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Африка/Порто Ново"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Африка/Сао Томе"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Африка/Тимбукту"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Африка/Триполи"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Африка/Тунис"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Африка/Виндхук"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Америка/Адак"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Америка/Енкориџ"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Америка/Ангвила"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Америка/Антигва"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Америка/Арагваина"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Америка/Аруба"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Америка/Асунсион"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Америка/Барбадос"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Америка/Белем"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Америка/Белизе"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Америка/Боа Виста"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Америка/Богота"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Америка/Боисе"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Америка/Буенос Аирес"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Америка/Кембриџ Беј"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Америка/Канкун"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Америка/Каракас"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Америка/Катамарка"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Америка/Кајен"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Америка/Кајман"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Америка/Чикаго"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Америка/Чивава"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Америка/Кордоба"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Америка/Костарика"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Америка/Кујаба"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Америка/Куракао"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Америка/Данмарксхавн"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Америка/Доусон"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Америка/Доусон Крик"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Америка/Денвер"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Америка/Детроит"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Америка/Доминика"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Америка/Едмонтон"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Америка/Еирунепе"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Америка/Ел Салвадор"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Америка/Форталеза"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Америка/Глејс Беј"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Америка/Готхаб"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Америка/Гус Беј"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Америка/Гранд Турк"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Америка/Гранада"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Америка/Гвадалупе"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Америка/Гватемала"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Америка/Гвајаквил"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Америка/Гвајана"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Америка/Халифакс"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Америка/Хавана"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Америка/Хермосиљо"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Америка/Индијана/Индијанаполис"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Америка/Индијана/Нокс"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Америка/Индијана/Маренго"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Америка/Индијана/Вивеј"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Америка/Индијанаполис"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Америка/Инувик"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Америка/Икалуит"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Америка/Јамајка"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Америка/Џуџуи"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Америка/Џуно"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Америка/Кентаки/Луизвил"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Америка/Кентаки/Монтичело"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Америка/Ла Паз"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Америка/Лима"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Америка/Лос Анџелес"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Америка/Луисвил"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Америка/Масеио"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Америка/Манагва"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Америка/Манаус"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Америка/Мартиник"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Америка/Мазатлан"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Америка/Мендоза"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Америка/Меномини"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Америка/Мерида"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Америка/Мексико Сити"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Америка/Микелон"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Америка/Монтереј"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Америка/Монтевидео"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Америка/Монтреал"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Америка/Монсерат"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Америка/Насау"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Америка/Њу Јорк"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Америка/Нипигон"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Америка/Ном"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Америка/Норонха"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Америка/Северна Дакота/Центар"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Америка/Панама"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Америка/Пангниртунг"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Америка/Парамарибо"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Америка/Феникс"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Америка/Порт-о-Пренс"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Америка/Порт оф Спејн"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Америка/Порто Велјо"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Америка/Порторико"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Америка/Рејни Ривер"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Америка/Ранкин Инлет"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Америка/Ресифе"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Америка/Реџина"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Америка/Рио Бранко"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Америка/Росарио"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Америка/Сантјаго"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Америка/Санто Доминго"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Америка/Сао Паоло"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Америка/Скорсбисунд"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Америка/Шипрок"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Америка/Св. Џонс"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Америка/Св. Китс"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Америка/Св. Лусија"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Америка/Св. Томас"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Америка/Св. Винсент"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Америка/Свифт Карент"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Америка/Тегусигалпа"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Америка/Туле"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Америка/Тандер Беј"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Америка/Тихуана"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Америка/Тортола"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Америка/Ванкувер"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Америка/Вајтхорс"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Америка/Винипег"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Америка/Јакутат"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Америка/Јелоунајф"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Антарктик/Кејси"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Антарктик/Дејвис"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Антарктик/Димон дУрвил"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Антарктик/Моусон"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Антарктик/МекМердо"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Антарктик/Палмер"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Антарктик/Јужен пол"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Антарктик/Сиова"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Антарктик/Восток"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Арктик/Лонгјирбјен"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Азија/Аден"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Азија/Алма Ата"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Азија/Аман"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Азија/Анадир"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Азија/Актау"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Азија/Актобе"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Азија/Ашгабат"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Азија/Багдад"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Азија/Бахреин"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Азија/Баку"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Азија/Бангкок"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Азија/Бејрут"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Азија/Бишкек"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Азија/Брунеи"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Азија/Калкута"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Азија/Чоибалсан"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Азија/Чонгчинг"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Азија/Коломбо"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Азија/Дамаск"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Азија/Дака"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Азија/Дили"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Азија/Дубаи"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Азија/Душанбе"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Азија/Газа"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Азија/Харбин"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Азија/Хонг Конг"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Азија/Ховд"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Азија/Иркутск"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Азија/Истанбул"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Азија/Џакарта"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Азија/Гајапура"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Азија/Ерусалим"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Азија/Кабул"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Азија/Камчатка"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Азија/Карачи"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Азија/Кашгар"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Азија/Катманду"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Азија/Краснојарск"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Азија/Куала Лумпур"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Азија/Кучинг"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Азија/Кувајт"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Азија/Макао"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Азија/Макао"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Азија/Магадан"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Азија/Макасар"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Азија/Манила"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Азија/Мускат"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Азија/Никозија"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Азија/Новосибирск"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Азија/Омск"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Азија/Орал"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Азија/Пном Пен"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Азија/Понтијанак"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Азија/Пјонгјанг"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Азија/Катар"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Азија/Кизилорда"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Азија/Рангун"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Азија/Ријад"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Азија/Сајгон"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Азија/Сахалин"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Азија/Самарканд"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Азија/Сеул"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Азија/Шангај"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Азија/Сингапур"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Азија/Тајпеј"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Азија/Ташкент"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Азија/Тбилиси"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Азија/Техеран"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Азија/Тимфу"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Азија/Токио"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Азија/Ујунг Панданг"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Азија/Уланбатор"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Азија/Урумчи"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Азија/Виентиан"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Азија/Владивосток"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Азија/Јакутск"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Азија/Екатеринбург"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Азија/Ереван"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Атлантик/Азури"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Атлантик/Бермуди"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Атлантик/Канарски Острови"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Атлантик/Кејп Верде"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Атлантик/Фарски Острови"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Атлантик/Јан Мајен"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Атлантик/Мадеира"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Атлантик/Рејкјавик"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Атлантик/Јужна Џорџија"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Атлантик/Св. Елена"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Атлантик/Стенли"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Австралија/Аделејд"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Австралија/Бризбејн"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Австралија/Брокен Хил"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Австралија/Дарвин"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Австралија/Хобарт"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Австралија/Линдеман"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Австралија/Лорд Хоу"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Австралија/Мелбурн"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Австралија/Перт"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Австралија/Сиднеј"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Европа/Амстердам"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Европа/Андора"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Европа/Атина"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Европа/Белфаст"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Европа/Белград"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Европа/Берлин"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Европа/Братислава"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Европа/Брисел"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Европа/Букурешт"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Европа/Будимпешта"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Европа/Кишињев"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Европа/Копенхаген"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Европа/Даблин"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Европа/Гибралтар"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Европа/Хелсинки"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Европа/Истанбул"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Европа/Калининград"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Европа/Киев"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Европа/Лисабон"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Европа/Љубљана"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Европа/Лондон"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Европа/Луксембург"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Европа/Мадрид"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Европа/Малта"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Европа/Минск"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Европа/Монако"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Европа/Москва"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Европа/Никозија"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Европа/Осло"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Европа/Париз"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Европа/Прага"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Европа/Рига"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Европа/Рим"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Европа/Самара"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Европа/Сан Марино"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Европа/Сараево"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Европа/Симферопол"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Европа/Скопје"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Европа/Софија"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Европа/Стокхолм"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Европа/Талин"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Европа/Тирана"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Европа/Ужгород"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Европа/Вадуц"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Европа/Ватикан"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Европа/Виена"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Европа/Вилнус"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Европа/Варшава"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Европа/Загреб"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Европа/Запорожје"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Европа/Цирих"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Индија/Тананариве"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Индија/Чагос"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Индија/Крисмас"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Индија/Кокос"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Индија/Комори"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Индија/Кергелен"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Индија/Махе"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Индија/Малдиви"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Индија/Маврициус"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Индија/Мајот"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Индија/Реунион"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Пацифик/Апиа"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Пацифик/Окланд"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Пацифик/Чатам"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Пацифик/Велигденски острови"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Пацифик/Ефејт"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Пацифик/Ендербери"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Пацифик/Факаофо"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Пацифик/Фиџи"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Пацифик/Фунафути"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Пацифик/Галапагос"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Пацифик/Гамбиер"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Пацифик/Гвадалканал"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Пацифик/Гуам"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Пацифик/Хонолулу"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Пацифик/Џонстон"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Пацифик/Киритимати"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Пацифик/Косрае"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Пацифик/Кваџелин"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Пацифик/Махуро"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Пацифик/Маркесас"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Пацифик/Мидвеј"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Пацифик/Науру"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Пацифик/Ниуе"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Пацифик/Норфолк"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Пацифик/Нумеа"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Пацифик/Паго Паго"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Пацифик/Палау"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Пацифик/Питкерн"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Пацифик/Понапе"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Пацифик/Порт Морсби"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Пацифик/Раротонга"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Пацифик/Сајпан"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Пацифик/Тахити"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Пацифик/Тарава"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Пацифик/Тонгатапу"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Пацифик/Трук"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Пацифик/Вејк"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Пацифик/Валис"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Не може да се отвори датотеката која е автоматски зачувана"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Не може да се добие пораката од уредувачот"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Вметни приврзок"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "П_рикачи"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Безимена порака"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Прикачи датотека"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Затвори"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Затвори ја тековната датотека"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Печати..."
 
-#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Преглед за пе_чатење"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Зачувај ја тековната датотека"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Зачувај _како..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Зачувај ја тековната датотека под друго име"
 
-#: ../composer/e-composer-actions.c:514
-msgid "Save _Draft"
-msgstr "Зачувај _скица"
+#: ../composer/e-composer-actions.c:511
+#, fuzzy
+#| msgid "Save as draft"
+msgid "Save as _Draft"
+msgstr "Зачувај како скица"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Зачувај како скица"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "И_спрати"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Испрати ја оваа порака"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Внесете опции за испраќање"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Нова _порака"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Отвори прозорец за нова порака"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Кодна _страница"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Безбедност"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP _енкрипција"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Енкриптирај ја пораката со PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP _потпис"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Потпиши ја пораката со вашиот PGP клуч"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Постави приоритет на пораката"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Постави го приоритетот на порака како висок"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "По_барај потврда за читање"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Означи за земање потврда за достава кога вашата порака е прочитана"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ен_крипција"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Енкриптирајте ја пораката со вашиот S/MIMЕ сертификат за енкрипција"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME потп_ис"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потпишете ја пораката со вашиот S/MIME потпис сертификат"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "Поле за _слепа копија"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Го менува изборот дали „BCC“ полето се прикажува"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "Поле за _копија"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Го менува изборот дали „CC“ полето се прикажува"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "_Од поле"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Го менува изборот дали „Од“ избирачот се прикажува"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "„_Испрати“ до поле"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Го менува изборот дали „Пишувај“ полето се прикажува"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "„_Одговори-на“ поле"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Го менува изборот дали „Одговори-на“ полето се прикажува"
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Поле за _наслов"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Го менува прикажувањето на полето за наслов"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "_До поле"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Го менува изборот дали До полето се прикажува"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#, fuzzy
+#| msgid "Save _Draft"
+msgid "Save Draft"
+msgstr "Зачувај _скица"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Внесете ги примачите на пораката"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Внесете ги адресите кои ќе примат слепа копија на пораката"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10812,69 +11131,66 @@ msgstr ""
 "Внеси ги адресите кои ќе примат слепа копија на пораката без појавување во "
 "листата на примачи на пораката"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "О_д:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Одговори на:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_До:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Копија:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Слепа копија:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Испрати до:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "По_тпис:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Кликнете овде за додавање од адресарот"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Дестинација на пораката"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Одберете папки во кои што ќе се испрати пораката."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Кликнете овде за одбирање папки до кои ќе се испраќа"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "Скорешни _документи"
-
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Покажи лента за при_врзоци"
 
-#: ../composer/e-msg-composer.c:872
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:866
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Не може да се потпише појдовната порака: нема поставен сертификат за потпис "
 "за оваа сметка"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10882,8 +11198,8 @@ msgstr ""
 "Не може да се енкриптира појдовната порака: нема поставен сертификат за "
 "потпис на оваа сметка"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10891,15 +11207,15 @@ msgstr[0] "Приврзок"
 msgstr[1] "Приврзоци"
 msgstr[2] "Приврзоци"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Скриј ја лентата за при_врзоци"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Пишувај порака"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10990,8 +11306,12 @@ msgstr ""
 "пораката ќе Ви дозволи да продолжите каде што сте застанале."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
+#| msgid ""
+#| "Send options available only for Novell Groupwise and Microsoft Exchange "
+#| "accounts."
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Опциите за испраќање се достапни само за сметките на Novell Groupwise и "
@@ -11003,7 +11323,8 @@ msgstr "Опциите за испраќање се недостапни."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Датотеката „{0}“ не е обична датотека и не може да се испрати во порака."
+msgstr ""
+"Датотеката „{0}“ не е обична датотека и не може да се испрати во порака."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -11053,7 +11374,7 @@ msgstr "_Продолжи со уредување"
 msgid "_Do not Recover"
 msgstr "_Не враќај"
 
-#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Врати"
 
@@ -11065,7 +11386,7 @@ msgstr "_Зачувај скица"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution пошта и календар"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -11081,40 +11402,97 @@ msgstr "картичка со адреса"
 msgid "calendar information"
 msgstr "информации за календар"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Грешка со Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Предупредување на Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Информација за Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Барање од Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Внатрешна грешка, непозната грешка „%s“ побарано"
 
-#: ../e-util/e-logger.c:154
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Компонента"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Има не компонентата која се логира"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:339
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Логови за дебагирање"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Покажувај _грешки во статусната лента за"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "секунди."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Пораки за логирање:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Ниво на логирање"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Време"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Пораки"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвори го прозорецов"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Грешка"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Грешки"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Предупредувања и грешки"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Дебагирање"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Грешки, предупредувања и пораки за дебагирање"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Вклучено"
 
@@ -11122,16 +11500,17 @@ msgstr "Вклучено"
 msgid "Whether the plugin is enabled"
 msgstr "Дали приклучокот е овозможен"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Се појави грешка при печатењето"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Системот за печатење пријави грешка, со следните детали за грешката:"
 
-#: ../e-util/e-print.c:171
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:173
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "Системот за печатење не пријави никакви додатни детали за грешката."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
@@ -11162,66 +11541,72 @@ msgstr "Да запишам над датотеката?"
 msgid "_Overwrite"
 msgstr "_Запиши над"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+#, fuzzy
+#| msgid "Could not open autosave file"
+msgid "Could not open the link."
+msgstr "Не може да се отвори датотеката која е автоматски зачувана"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Не може да се прикаже помош за Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "В_ажно"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Работа"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Лично"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "Д_а се направи"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "_Подоцна"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_Име на ознака:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Уреди ознака"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Додај ознака"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Името на ознаката не може да биде празно."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "Веќе постои ознака со истaта етикета. Преименувајте ја Вашата ознака."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf грешка: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Сите понатамошни грешки се прикажуваат само во терминал."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11229,7 +11614,7 @@ msgstr[0] "пред %d секунда"
 msgstr[1] "пред %d секунди"
 msgstr[2] "пред %d секунди"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11237,7 +11622,7 @@ msgstr[0] "%d секунда во иднината"
 msgstr[1] "%d секунди во иднината"
 msgstr[2] "%d секунди во иднината"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11245,7 +11630,7 @@ msgstr[0] "пред %d минута"
 msgstr[1] "пред %d минути"
 msgstr[2] "пред %d минути"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11253,7 +11638,7 @@ msgstr[0] "%d минута во иднината"
 msgstr[1] "%d минути во иднината"
 msgstr[2] "%d минути во иднината"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11261,7 +11646,7 @@ msgstr[0] "пред %d час"
 msgstr[1] "пред %d часа"
 msgstr[2] "пред %d часа"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11269,7 +11654,7 @@ msgstr[0] "%d час во иднината"
 msgstr[1] "%d часови во иднината"
 msgstr[2] "%d часови во иднината"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11277,7 +11662,7 @@ msgstr[0] "пред %d ден"
 msgstr[1] "пред %d дена"
 msgstr[2] "пред %d дена"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11285,7 +11670,7 @@ msgstr[0] "%d ден во иднината"
 msgstr[1] "%d денови во иднината"
 msgstr[2] "%d денови во иднината"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11293,7 +11678,7 @@ msgstr[0] "пред %d недела"
 msgstr[1] "пред %d недели"
 msgstr[2] "пред %d недели"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11301,7 +11686,7 @@ msgstr[0] "%d недела во иднината"
 msgstr[1] "%d недели во иднината"
 msgstr[2] "%d недели во иднината"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11309,7 +11694,7 @@ msgstr[0] "пред %d месец"
 msgstr[1] "пред %d месеци"
 msgstr[2] "пред %d месеци"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11317,7 +11702,7 @@ msgstr[0] "%d месец во иднината"
 msgstr[1] "%d месеци во иднината"
 msgstr[2] "%d месеци во иднината"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11325,7 +11710,7 @@ msgstr[0] "пред %d година"
 msgstr[1] "пред %d години"
 msgstr[2] "пред %d години"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11333,21 +11718,21 @@ msgstr[0] "%d година во иднината"
 msgstr[1] "%d години во иднината"
 msgstr[2] "%d години во иднината"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<кликнете овде за да одберете датум>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "сега"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Одберете време за споредба"
 
@@ -11360,56 +11745,64 @@ msgstr "Одберете датотека"
 msgid "Test"
 msgstr "Тест"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Име на пр_авило:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+#| msgid "Find items that meet the following criteria"
+msgid "Find items that meet the following conditions"
 msgstr "Најди предмети кои ги задоволуваат следниве критериуми"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "До_дај правило за филтер"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+#| msgid "Add Ac_tion"
+msgid "A_dd Condition"
+msgstr "Додај деј_ство"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+#| msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "ако сите критериуми се задоволени"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+#| msgid "If any criteria are met"
+msgid "If any conditions are met"
 msgstr "ако било кој критериум е задоволен"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Најди предмети:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Сите во врска со"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Одговори и родители"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Без одговор или родител"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "В_клучи нишки"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Дојдовни"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Појдовни"
 
@@ -11509,7 +11902,7 @@ msgstr "во иднината"
 msgid "months"
 msgstr "месеци"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "секунди"
 
@@ -11521,10 +11914,11 @@ msgstr "тековното време"
 msgid "the time you specify"
 msgstr "времето кое го назначувате"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:718
-#: ../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 "недели"
 
@@ -11532,15 +11926,15 @@ msgstr "недели"
 msgid "years"
 msgstr "години"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Измени правило"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Име на правило"
 
@@ -11549,8 +11943,10 @@ msgid "Composer Preferences"
 msgstr "Преференции на пишувачот"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "Конфигурирај параметри за пошта, вклучувајќи приказ на пораки и безбедност"
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Конфигурирај параметри за пошта, вклучувајќи приказ на пораки и безбедност"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
@@ -11592,10 +11988,10 @@ msgstr "Контрола на преференци за Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Контрола на конфигурациите за мрежа на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
-#: ../mail/mail-component.c:760
+#: ../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 "Пошта"
@@ -11606,7 +12002,7 @@ msgid "Mail Accounts"
 msgstr "Сметки за пошта"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "Преференции за пошта"
 
@@ -11618,12 +12014,12 @@ msgstr "Преференции за мрежа"
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s договор за лиценца"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11636,64 +12032,64 @@ msgstr ""
 "за %s прикажан подолу\n"
 "и означете го полето за прифаќање\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Одбери папка"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Автогенериран"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Прашај за секоја порака"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Примање на е-пошта"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Автоматски проверувај дали има _нови пораки на секои"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "мину_ти"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Испраќање на е-пошта"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Стандардно"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Безбедност"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Опции за примање"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Проверувам дали има нови пораки"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Уредувач на сметки"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Асистент за Evolution сметки"
 
@@ -11711,34 +12107,43 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Безимено"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Јазик"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Додај скрипта за потпис"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Препратена порака --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "непознат испраќач"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11746,7 +12151,7 @@ msgstr ""
 "На ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} во ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} напиша:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "--------Оригинална порака--------"
 
@@ -11796,7 +12201,7 @@ msgid "Date sent"
 msgstr "Датум на испраќање"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11875,7 +12280,7 @@ msgstr "не е поставено"
 msgid "is set"
 msgstr "е поставено"
 
-#: ../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 "Отпад"
@@ -11884,7 +12289,7 @@ msgstr "Отпад"
 msgid "Junk Test"
 msgstr "Тест на отпад"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Ознака"
 
@@ -11924,48 +12329,53 @@ msgstr "Насочи(pipe) во програма"
 msgid "Play Sound"
 msgstr "Испушти звук"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Прочитана"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Примачи"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex совпаѓање"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Одговорено на"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "враќа"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "враќа поголемо од"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "враќа помало од"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Изврши програма"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Бодови"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Испраќач"
 
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+#| msgid "Send Receipt"
+msgid "Sender or Recipients"
+msgstr "Испрати потврда"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Постави ознака"
@@ -11998,11 +12408,11 @@ msgstr "почнува со"
 msgid "Stop Processing"
 msgstr "Престани со процесирање"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../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 "Тема"
 
@@ -12011,64 +12421,64 @@ msgid "Unset Status"
 msgstr "Отстрани статус"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Потоа"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Додај деј_ство"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "Креирај папка за пребарување од пребарувањето..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Сите пораки"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Непрочитани пораки"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Нема ознака"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Прочитани пораки"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Скорешни пораки"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Пораки од последните 5 дена"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Пораки со приврзоци"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Важни пораки"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Пораката не е отпад"
 
-#: ../mail/em-folder-browser.c:1170
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Барање на сметка"
 
-#: ../mail/em-folder-browser.c:1223
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Барање на сите сметки"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Непрочитана порака:"
@@ -12077,27 +12487,34 @@ msgstr[2] "Непрочитани пораки:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Вкупнo пораки:"
 msgstr[1] "Вкупно пораки:"
 msgstr[2] "Вкупно пораки:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+#| msgid "Quota usage"
+msgid "Quota usage (%s):"
+msgstr "Употреба на квотата"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
 msgstr "Употреба на квотата"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:583
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Сандаче"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Својства на папката"
@@ -12114,9 +12531,9 @@ msgstr "К_реирај"
 msgid "Folder _name:"
 msgstr "Име на _папка:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Папки за пребарување"
 
@@ -12125,19 +12542,24 @@ msgstr "Папки за пребарување"
 msgid "UNMATCHED"
 msgstr "НЕСОВПАДНАТО"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Скици"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Мостри:"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "За испраќање"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Испратени"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "Се вчитува..."
 
@@ -12176,12 +12598,12 @@ msgstr "Преместување на папката %s"
 msgid "Copying folder %s"
 msgstr "Копирање на папката %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преместувам пораки во папка %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам пораки во папка %s"
@@ -12198,291 +12620,294 @@ msgstr "Копирај во папка"
 msgid "_Move to Folder"
 msgstr "Премести во папка"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Скенирам папки во „%s“"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Отвори во _нов прозорец"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Нова папка..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Премести..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Преименувај..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Ос_вежи"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Пуш_ти ги пораките кои се за испраќање"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Испразни отпад"
 
-#: ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+#| msgid "Create _Search Folder"
+msgid "_Unread Search Folder"
+msgstr "Креирај _папка за пребарување"
+
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Копирам „%s“ во „%s“"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Одбери папка"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "К_опирај"
 
-#: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:532
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Креирам папка „%s“"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Креирај папка"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Назначи каде да се креира папката:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Бришењето на поштата не успеа"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате доволно пермисии за да ја избришете оваа пошта."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори му на испраќачот"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Препрати"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Уреди како нова порака..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Врати и_збришано"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "_Премести во папка..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "_Копирај во папка..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "Означи како _прочитана"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Означи како _непрочитана"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Означи како _важна"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Означи како не_важно"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Означи како _отпад"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Означи дека _не е отпад"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Означи за сле_дење..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_Ознака"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Ништо"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Нова ознака"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Зна_мето е завршено"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Ис_чисти знаме"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "Кре_ирај правило од пораката"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Папка за пребарување од _темата"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Папка за пребарување од _испраќачот"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Папка за пребарување од _примачите"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка за пребарување од поштенската _листа"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Филтер на т_ема"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Филтер базиран на  исп_раќач"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Филтер базиран на при_мачи"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Филтер базиран на п_оштенска листа"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
-#: ../plugins/google-account-setup/google-source.c:301
-#: ../plugins/google-account-setup/google-source.c:586
-#: ../plugins/google-account-setup/google-source.c:772
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
+#: ../plugins/google-account-setup/google-source.c:251
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "Стандардно"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Не може да се преземе пораката"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Примам порака..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "П_овик до..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Креирај _папка за пребарување"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Од оваа адреса"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_На оваа адреса"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Притисни за пошта %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Притисни за повикување на %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Кликни за покажување/криење на адресите"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпаѓања: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Про_најди:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Следно"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "Р_азликувај мали-големи букви"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Непотпишано"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Пораката не е потпишана. Нема гаранција дека оваа порака е автентична."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Важечки потпис"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr "Оваа порака е потпишана и е валидна, што значи дека оваа порака е автентична."
+msgstr ""
+"Оваа порака е потпишана и е валидна, што значи дека оваа порака е автентична."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Неважечки потпис"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12490,11 +12915,11 @@ msgstr ""
 "Потписот на оваа порака не може да се провери, може да е променет при "
 "преносот."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Валиден потпис, но не може да се провери испраќачот"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12502,21 +12927,22 @@ msgstr ""
 "Оваа порака е потпишана со валиден потпис, но испраќачот на пораката не може "
 "да се провери."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Потписот постои, но потребен е јавен клуч"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
-msgstr "Оваа порака е потпишана со валиден потпис, но нема совпаѓачки јавен клуч."
+msgstr ""
+"Оваа порака е потпишана со валиден потпис, но нема совпаѓачки јавен клуч."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Неенкриптирано"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12524,11 +12950,11 @@ msgstr ""
 "Оваа порака не е енкриптирана. Нејзината содржина може некој да ја види при "
 "преносот на Интернет."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Слабо енкриптирано"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12538,11 +12964,11 @@ msgstr ""
 "тешко, но не и неможно некој од надворешноста да ја види содржината на оваа "
 "порака во догледно време."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Енкриптирано"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12550,11 +12976,11 @@ msgstr ""
 "Оваа порака е енкриптирана. Ќе биде тешко некој од надворешноста да ја види "
 "содржината на оваа порака."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Јако енкриптирано"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12563,56 +12989,56 @@ msgstr ""
 "Оваа порака е енкриптирана, со јак алгоритам за енкрипција. Ќе биде многу "
 "тешко некој од надворешноста да ја види содржината во разумно време."
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Види сертификат"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Овој сертификат не може да се види"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено на %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Пречекорени:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "со %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Види внатре"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Скриј"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Собери во ширина"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "_Оригинална големина"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Зачувај го приврзокот како"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Одберете папка за зачувување на сите приврзоци"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Зачувај го одбраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12620,31 +13046,31 @@ msgstr[0] "%d пр_иврзок"
 msgstr[1] "%d пр_иврзоци"
 msgstr[2] "%d пр_иврзоци"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "З_ачувај"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "З_ачувај ги сите"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Нема приврзоци"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Прегледај _неформатирано"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Скриј го _неформатираното"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "О_твори со"
 
-#: ../mail/em-format-html-display.c:2468
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12705,20 +13131,20 @@ msgid "Formatting Message..."
 msgstr "Форматирање на порака..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "Копија на пораката"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "Слепа копија"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Испраќач"
 
@@ -12735,25 +13161,25 @@ 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 "Оваа порака е испратена од <b>%s</b> во име на <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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 "Од"
 
-#: ../mail/em-format-quote.c:209 ../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 "Одговори на"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Датум"
 
@@ -12761,104 +13187,110 @@ msgstr "Датум"
 msgid "Newsgroups"
 msgstr "Дискусиони групи"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Фаца"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s приврзок"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Не може да се парсира S/MIME пораката: Непозната грешка"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не може да се парсира MIME пораката. Приказ како извор."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподдржан тип на енкрипција за повеќеделно/енкриптирано"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Не може да се парсира PGP/MIME пораката"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Не може да се парсира PGP/MIME пораката: Непозната грешка"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Неподдржан формат на потпис"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Грешка при утврдувањето на потписот"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка при проверка на потписот"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Не можам да ја парсирам PGP пораката"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Не може да се парсира PGP/MIME пораката: Непозната грешка"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Секојпат"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Еднаш дневно"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Еднаш неделно"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Еднаш месечно"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Додај сопствен хедер за отпад"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Име на хедер:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Вредноста на хедерот содржи:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Содржи вредност"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Етикета"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Приклучокот %s е недостапен, а бинарната датотека е инсталирана."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr "Приклучокот %s е недостапен. Проверете дали пакетот е инсталиран."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Нема приклучок за отпадот"
 
@@ -12902,7 +13334,8 @@ msgstr ""
 #: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Не може да се отворат старите POP податоци кои се чуваат на сервер „%s“: %s"
+msgstr ""
+"Не може да се отворат старите POP податоци кои се чуваат на сервер „%s“: %s"
 
 #: ../mail/em-migrate.c:2083
 #, c-format
@@ -12914,30 +13347,38 @@ msgstr ""
 #: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Не може да се копираат POP3 податоците кои се чуваат на серверот „%s“: %s"
+msgstr ""
+"Не може да се копираат POP3 податоците кои се чуваат на серверот „%s“: %s"
 
 #: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Не може да се креира место за сместување локална пошта „%s“: %s"
 
-#: ../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"
+#| "\n"
+#| "Please be patient while Evolution migrates your folders..."
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Форматот на папките за пошта на Evolution се промена, откако е заменат со sqlite од Evolution верзија 2.24.\n"
+"Форматот на папките за пошта на Evolution се промена, откако е заменат со "
+"sqlite од Evolution верзија 2.24.\n"
 "\n"
 "Ве молам, почекајте додека Evolution ги мигрира Вашите папки..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Не може да се креираат папки за локална пошта во „%s“: %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12945,74 +13386,74 @@ msgstr ""
 "Не може да се прочитаат поставувањата од претходната инсталација на "
 "Evolution, „evolution/config.xmldb“ не постои или е оштетена."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "_Одговори на испраќачот"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Одговори на _листата"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Додај во адресар"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ова сместување не поддржува претплати, или тие не се вклучени."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Претплатено"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Ве молам, одберете сервер."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Нема одбрано сервер"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Не ја прикажувај повторно оваа порака."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Филтри на порака"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "порака"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Зачувај порака..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Додај адреса"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Пораки од %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Пребарај _папки"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Пребарај го изворот на папката"
 
@@ -13029,17 +13470,16 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Ширина на прозорецот „Испрати и прими пошта“"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
-msgstr "Му дозволува на evolution да прикаже дел од текст со ограничена големина"
+#, fuzzy
+#| msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
+msgstr ""
+"Му дозволува на evolution да прикаже дел од текст со ограничена големина"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Секогаш барај потврда за читање"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Време во секунди за кое треба да се прикаже грешка на статусната лента."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Автоматско препознавање на емоции"
@@ -13088,7 +13528,9 @@ msgstr ""
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
-msgstr "Контролирај колку често локалните промени се синхронизираат со оддалечените сервери за пошта. Интервалот мора да е најмалку 30 секунди."
+msgstr ""
+"Контролирај колку често локалните промени се синхронизираат со оддалечените "
+"сервери за пошта. Интервалот мора да е најмалку 30 секунди."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
@@ -13098,7 +13540,9 @@ msgstr "Сопствени заглавија кои ќе се користат
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
-msgstr "Сопствени заглавија кои ќе се користат за проверка на отпад. Листата на елементи се низи во формат „име=вредност“."
+msgstr ""
+"Сопствени заглавија кои ќе се користат за проверка на отпад. Листата на "
+"елементи се низи во формат „име=вредност“."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13153,20 +13597,34 @@ msgid "Default width of the subscribe dialog."
 msgstr "Стандардна ширина на дијалогот за претплати."
 
 #: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+#| msgid ""
+#| "Determines whether to look up addresses for junk filtering in local "
+#| "addressbook only"
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
-msgstr "Одредува дали адресата на испраќачот да се пребарува во адресарот, при филтрирање од отпад"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Одредува дали адресата на испраќачот да се пребарува во адресарот, при "
+"филтрирање од отпад"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
+#, fuzzy
+#| msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "Одредува дали адресата на испраќачот да се пребарува во адресарот"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+#, fuzzy
+#| msgid ""
+#| "Determines whether to loopup the sender email in addressbook. If found, "
+#| "it shouldn't be a spam. It looks up in the books marked for "
+#| "autocompletion. It can be slow, if remote addressbooks (like ldap) are "
+#| "marked for autocompletion."
+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 addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Одредува дали да се провери адресата на испраќачот во адресарот. Ако биде "
@@ -13198,15 +13656,20 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
-msgstr "Директориум за вчитување/прикачување на датотеки во пишувачот на пораки."
+msgstr ""
+"Директориум за вчитување/прикачување на датотеки во пишувачот на пораки."
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
-msgstr "Директориум за зачувување на датотеките на составните компоненти на поштата."
+msgstr ""
+"Директориум за зачувување на датотеките на составните компоненти на поштата."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Оневозможи или овозможи скратување на имињата на папките во дрвата на папки"
+#, fuzzy
+#| msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+"Оневозможи или овозможи скратување на имињата на папките во дрвата на папки"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13230,7 +13693,8 @@ msgstr "Испразни ги сите папки за ѓубре при изл�
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "Овозможи caret режим, така да може да ја видите стрелката кога читате пошта."
+msgstr ""
+"Овозможи caret режим, така да може да ја видите стрелката кога читате пошта."
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
@@ -13238,7 +13702,8 @@ msgstr "Овозможи или оневозможи магично Space коп
 
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
-msgstr "Овозможи ја или оневозможи ја карактеристиката „барај како што пишуваш“"
+msgstr ""
+"Овозможи ја или оневозможи ја карактеристиката „барај како што пишуваш“"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
@@ -13276,19 +13741,30 @@ msgstr "Овозможи исцртување на дел од текстот с
 msgid "Enable/disable caret mode"
 msgstr "Вклучи/исклучи caret режим"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "Висина на површината за листа со пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "Висина на површината за листа со пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Го крие прегледот по папка и го отстранува избраното"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13296,7 +13772,7 @@ msgstr ""
 "Ако корисникот се обиде да отвори 10 или повеќе пораки истовремено, прашај "
 "го дали навистина сака да го направи тоа."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13304,26 +13780,32 @@ msgstr ""
 "Ако површината за „Преглед“ е приклучена, тогаш прикажи ја една до друга "
 "наместо вертикално."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
+#, 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."
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
 "Ако нема вграден прегледник за одредени mime типови во Evolution, било кои "
 "mime типови кои се појавуваат во оваа листа кои мапираат во bonobo "
 "прегледник на компоненти во базата на mime типови на GNOМЕ може да се "
 "користат за приказ на содржина."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Почетна висина на прозорецот „Испрати и прими пошта“. Вредноста се ажурира ако "
-"корисникот ја промени големината на прозорецот вертикално."
+"Почетна висина на прозорецот „Испрати и прими пошта“. Вредноста се ажурира "
+"ако корисникот ја промени големината на прозорецот вертикално."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13331,24 +13813,25 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"Иницијалната состојба за максимизирање на прозорецот „Испрати или прими пошта“. Оваа "
-"вредност се ажурира кога корисникот го максимизира или одмаксимизира прозорецот. Забележете "
-"дека оваа предност не се користи од Evolution бидејќи прозорецот „Испрати и прими пошта“ не може да "
-"се максимизира. Овој клуч постои како детал на имплементација."
+"Иницијалната состојба за максимизирање на прозорецот „Испрати или прими "
+"пошта“. Оваа вредност се ажурира кога корисникот го максимизира или "
+"одмаксимизира прозорецот. Забележете дека оваа предност не се користи од "
+"Evolution бидејќи прозорецот „Испрати и прими пошта“ не може да се "
+"максимизира. Овој клуч постои како детал на имплементација."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"Иницијална ширина на прозорецот „Испрати и прими пошта“. Вредноста се ажурира "
-"со менувањето на големината на прозорецот хоризонтално."
+"Иницијална ширина на прозорецот „Испрати и прими пошта“. Вредноста се "
+"ажурира со менувањето на големината на прозорецот хоризонтално."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Го исклучува/вклучува прашањето при означување на повеќе пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13356,7 +13839,7 @@ msgstr ""
 "Ја овозможува/оневозможува опцијата каде што се повторува прашањето дали е "
 "потребна синхронизација за офлајн."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13366,31 +13849,33 @@ msgstr ""
 "пораки од папка за пребарување трајно ја брише пораката, а не само ја "
 "отстранува од резултатите за пребарување."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "Последен пат кога се испразна папката со отпад"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "Последен пат кога е испразнето ѓубрето"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Ниво после кое пораката треба да се логира."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Листа на ознаки и нивните асоцирани бои"
 
-#: ../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"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Листа на mime типови за проверка за bonobo прегледници на компоненти"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Листа на прифатени пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Листа на сметки"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13399,15 +13884,17 @@ msgstr ""
 "содржи знаковни низи кои именуваат потпапки слични на /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 "Листа на прилагодени заглавја и дали тие се вклучени."
 
-#: ../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 "Листа на кодови на јазици за речници кои ќе се користат за проверка на правопис."
+msgstr ""
+"Листа на кодови на јазици за речници кои ќе се користат за проверка на "
+"правопис."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13416,125 +13903,130 @@ msgstr ""
 "содржи знаковни низи кои содржат name:color каде бојата го користи hex "
 "кодирањето на HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Листа на mime типови за проверка за bonobo прегледници на компоненти"
-
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
 msgstr "Листа на имиња на протоколи чии лиценци се прифатени."
 
-#: ../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"
+msgid "Load images for HTML messages over HTTP"
 msgstr "Вчитај пораки за HTML пораки преку http"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../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."
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
 "Вчитај слики за HTML пораки преку http(s). Можни вредности се: „0“ - никогаш "
-"невчитувај слики од интернет „1“ - Вчитај слики во поштата од контактите „2“ - "
-"Секогаш вчитувај слики од интернет."
+"невчитувај слики од интернет „1“ - Вчитај слики во поштата од контактите „2“ "
+"- Секогаш вчитувај слики од интернет."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Води запис за дејствата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Води запис за дејствата на филтрите во назначената лог датотека."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Лог датотека за запис на дејствата на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Лог датотека за запис на дејствата на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Означи како видени по одредено време"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Означи како видени по одредено време."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означи цитати во пораката „Преглед“"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означи цитати во пораката „Преглед“."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Стандардна висина на прозорецот со пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Стандардна ширина на прозорецот за пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Вид на приказ на поракта („нормален“, „цело заглавие“, „извор“)"
+msgstr "Вид на приказ на поракта (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимум денови меѓу празнењето отпад при излез"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимум денови меѓу празнењето ѓубре при излез"
 
-#: ../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 "Минимум време меѓу празнењето отпад при излез, во денови."
 
-#: ../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 "Минимум време меѓу празнењето ѓубре при излез, во денови."
 
-#: ../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 "Број на адреси за прикажување во До/Копија/Слепа копија"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Извести кога е без тема"
 
-#: ../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 "Извести го корисникот кога сака да уништи папка."
 
-#: ../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 "Извести го корисникот кога сака да испрати порака без тема."
 
-#: ../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 "Прашај за проверка ако корисникот сака да оди офлајн веднаш"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Прашај пред бришење на пораки од папката за пребарување"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Извести кога корисникот уништува"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Извести кога корисникот внесува само слепа копија"
 
-#: ../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 "Извести кога корисникот сака да отвори 10 или повеќе пораки истовремено"
+msgstr ""
+"Извести кога корисникот сака да отвори 10 или повеќе пораки истовремено"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13542,77 +14034,80 @@ msgstr ""
 "Извести кога корисникот сака да испрати HTML пошта на корисници кои не "
 "сакаат да примаат HTML пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Извести кога корисникот сака да испрати порака без „До“ или „Копија“ до "
 "примачи."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Извести кога корисникот сака да испрати несакан HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Прашај за означување на повеќе пораки"
 
-#: ../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 "Препознај смешковци во текст и замени ги со слики."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Препознај врски во текст и замени ги."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Тестирај ја доаѓачката пошта дали е отпад."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Зачувај го директориумот"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:116
+#, fuzzy
+#| msgid "Search for the sender photo in local addressbooks"
+msgid "Search for the sender photo in local address books"
 msgstr "Барај слика од испраќачот во локалните адресари"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Стандардно испраќај HTML пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Стандардно испраќај 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 "Прикажи ја е-поштата на испраќачот во колоната за адреси во листата на пораки"
+msgstr ""
+"Прикажи ја е-поштата на испраќачот во колоната за адреси во листата на пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Интервал на синхронизација со серверот"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Покажи анимации"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Покажувај ги анимираните слики како анимации."
 
-#: ../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 "Покажи избришани пораки (прецртани) во листата со пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Покажи ги избришаните пораки во листата со пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Прикажи фотографија од испраќачот"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13620,76 +14115,80 @@ msgstr ""
 "Прикажи ја е-поштата на испраќачот во посебна колона на пораките во листата "
 "на пораки."
 
-#: ../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 "Прикажи слика од испраќачот во површината за читање на пораката."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Направи проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Боја на проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Јазици за проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Стандардна висина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Стандардна ширина на дијалог за претплати"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Терминал фонт"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Лимит на ограничување на дел од текстот на пораката"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "Стандардниот приклучок за закачување на отпад"
 
-#: ../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 "Последниот пат кога се празнеше отпадот, во денови."
 
-#: ../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 "Последен пат кога е испразнето ѓубрето, во денови."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "Терминал фонтот за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "Променлива ширина на фонт за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Ова може да има три можни вредности. „0“ за грешки, „1“ за предупредувања и „2“ за "
-"пораки за дебагирање."
+"Ова може да има три можни вредности. „0“ за грешки, „1“ за предупредувања и "
+"„2“ за пораки за дебагирање."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, 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 interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Ова ја одредува максималната големина на делот од текст кој може да биде "
 "форматиран под evolution. Стандардната големина е 4MB / 4096 KB и се "
 "одредува во KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13699,7 +14198,7 @@ msgstr ""
 "Ако стандардниот приклучок е оневозможен, тогаш тој нема да премине на "
 "другите достапни приклучоци."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13707,7 +14206,7 @@ msgstr ""
 "Овој клуч е read only само еднаш и потоа се ресетира на „false“. Ова ја "
 "исклучува цела пошта во листата и го отстранува прегледот за таа папка."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13718,23 +14217,28 @@ msgstr ""
 "не се прикажуваат. Форматот на XML структурата е &ltч заглавие вклучено^gt; "
 "- постави вклучено ако заглавието треба да се прикжи во приказот на поштата."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
+#, fuzzy
+#| msgid ""
+#| "This option is related to the key lookup_addressbook and is used to "
+#| "determine whether to look up addresses in local addressbook only to "
+#| "exclude mail sent by known contacts from junk filtering."
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"Оваа опција е поврзана со key lookup_addressbook и се користи за одредување дали "
-"да се бараат адресите во локален адресар, само да не се вклучуваат пораките "
-"испратени од познатите контакти филтрирани како отпад."
+"Оваа опција е поврзана со key lookup_addressbook и се користи за одредување "
+"дали да се бараат адресите во локален адресар, само да не се вклучуваат "
+"пораките испратени од познатите контакти филтрирани како отпад."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 "Оваа опција би требало да помогне во зголемувањето на брзината на земање на "
 "пораки."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13742,7 +14246,7 @@ msgstr ""
 "Ова го поставува бројот на адреси за прикажување во стандардниот преглед на "
 "пораката, после кој се прикажуваат „...“"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13750,7 +14254,7 @@ msgstr ""
 "Ова поставување одредува дали нишките стандардно ќе се прошират или спуштат. "
 "За ова Evolution бара рестартирање."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13760,115 +14264,118 @@ msgstr ""
 "најновата порака во секоја нишка, наместо според датумот на пораката. "
 "Evolution за ова бара рестартирање."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Стави ја листата со пораки во нишка."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Стави ја листата со пораки во нишка"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Постави нишка за листата со пораки според темата"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Време за означување пораки како видени"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Време за означување пораки како видени."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "UID стринг на стандардната сметка."
 
-#: ../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 "Боја со која ќе се подвлекуваат зборовите со грешен правопис."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Користи SpamAssassin даемон и клиент"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Користи SpamAssassin даемон и клиент (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Користи прилагодени фонтови"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи сопствени фонтови за приказ на пошта."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Користи само локални спам тестови."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи ги само локалните спам тестови (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Користи широк поглед или едно до друго"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Променлива ширина на фонт"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Поглед/Bcc мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Поглед/Bcc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Поглед/Cc мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Поглед/Од мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Поглед/Од мени предметот е означен."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Поглед/Пишувај мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Поглед/Одговори на мени предметот е означен"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Поглед/Одговори на менито предметот е означен."
 
-#: ../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 "Дали да се додава потврда за одговор на секоја порака, стандардно."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Дали да се оневозможи скратувањето на имињата на папките во дрвото со папки."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+#| msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Дали да се оневозможи скратувањето на имињата на папките во дрвото со папки."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13876,15 +14383,16 @@ msgstr ""
 "Дали да се врати на преглед на нишки според теми кога пораките не содржат In-"
 "Reply-To или References заглавја."
 
-#: ../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 "Дали да се подредуваат нишките врз база на последната порака во нишката"
+msgstr ""
+"Дали да се подредуваат нишките врз база на последната порака во нишката"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Ширина на панелот за листа на пораки"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Ширина на панелот за листа на пораки."
 
@@ -13900,79 +14408,73 @@ msgstr "Evolution Elm увезувач"
 msgid "Import mail from Elm."
 msgstr "Увези пошта од Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Дестинациска папка:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Одбери папка за увезување"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увезувач на формат на папките на Berkeley Mailbox"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Увезувам сандаче"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увезување на „%s“"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Скенирам %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Увезување на податоци од „Pine“"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Увезувач од „Pine“за Evolution"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Увези пошта од Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Испрати на %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Испрати од %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Темата е %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s поштенска листа"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Додај правило за филтер"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Мостри:"
-
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13980,7 +14482,7 @@ msgstr[0] "%d одбрана, "
 msgstr[1] "%d одбрани, "
 msgstr[2] "%d одбрани, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13988,7 +14490,7 @@ msgstr[0] "%d избришана"
 msgstr[1] "%d избришани"
 msgstr[2] "%d избришани"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13996,7 +14498,7 @@ msgstr[0] "%d отпад"
 msgstr[1] "%d отпад"
 msgstr[2] "%d отпад"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -14004,7 +14506,7 @@ msgstr[0] "%d скица"
 msgstr[1] "%d скици"
 msgstr[2] "%d скици"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14012,7 +14514,7 @@ msgstr[0] "%d испратена"
 msgstr[1] "%d испратени"
 msgstr[2] "%d испратени"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14020,7 +14522,7 @@ msgstr[0] "%d неиспратена"
 msgstr[1] "%d неиспратени"
 msgstr[2] "%d неиспратени"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14028,7 +14530,7 @@ msgstr[0] "%d непрочитана, "
 msgstr[1] "%d непрочитани, "
 msgstr[2] "%d непрочитани, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14036,92 +14538,36 @@ msgstr[0] "вкупно %d"
 msgstr[1] "вкупно %d"
 msgstr[2] "вкупно %d"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Нова порака"
 
-#: ../mail/mail-component.c:917
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порака"
 
-#: ../mail/mail-component.c:918
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Пишувај нова порака"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Нова папка за пошта"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Папка за _пошта"
 
-#: ../mail/mail-component.c:926
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Креирај нова папка за пошта"
 
-#: ../mail/mail-component.c:1073
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Не може да се надградат поставувањата за поштата или папките."
 
-#: ../mail/mail-component.c:1586
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mail/mail-component.c:1586
-msgid "Errors"
-msgstr "Грешки"
-
-#: ../mail/mail-component.c:1587
-msgid "Warnings and Errors"
-msgstr "Предупредувања и грешки"
-
-#: ../mail/mail-component.c:1588
-msgid "Debug"
-msgstr "Дебагирање"
-
-#: ../mail/mail-component.c:1588
-msgid "Error, Warnings and Debug messages"
-msgstr "Грешки, предупредувања и пораки за дебагирање"
-
-#: ../mail/mail-component.c:1715
-msgid "Debug Logs"
-msgstr "Логови за дебагирање"
-
-#: ../mail/mail-component.c:1729
-msgid "Show _errors in the status bar for"
-msgstr "Покажувај _грешки во статусната лента за"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1745
-msgid "second(s)."
-msgstr "секунди."
-
-#: ../mail/mail-component.c:1751
-msgid "Log Messages:"
-msgstr "Пораки за логирање:"
-
-#: ../mail/mail-component.c:1792
-msgid "Log Level"
-msgstr "Ниво на логирање"
-
-#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Време"
-
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Пораки"
-
-#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвори го прозорецов"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Провери кои се поддржани типови "
@@ -14374,8 +14820,11 @@ msgstr ""
 "текстот преминува"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr "Не _ги обележувај пораките како отпад ако испраќачот е во мојот адресар"
+#, fuzzy
+#| msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+"Не _ги обележувај пораките како отпад ако испраќачот е во мојот адресар"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Do not quote"
@@ -14402,126 +14851,132 @@ msgid "Empty trash folders on e_xit"
 msgstr "Испразни ги папките со отпад при и_злез"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+#| msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
 msgstr "Овозможи магично Space к_опче "
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Овозможи папки за преб_арување"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за е_нкрипција:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "Енкриптирај ги пој_довните пораки (стандардно)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Фик_сна ширина:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Фик_сна ширина на фонт:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Својства на фонт"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Форматирај пораки во _HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "_Цело име:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML пораки"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "H_TTP прокси:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Заглавја"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "Осветли _цитати со"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Внатре"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Внатрешна оригинална порака (во 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 "Ознаки"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Табела со јазици"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Конфигурација на пошта"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Табела со заглавја од пошта"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Локација на сандаче"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Пишувач на пораки"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "Нема _прокси за:"
 
-#: ../mail/mail-config.glade.h:107
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Забелешка: долната цртичка во името на ознаката се користи како ознака за "
 "мени."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Забелешка: нема да се бара лозинка од вас, сѐ додека не се поврзете за првпат"
+msgstr ""
+"Забелешка: нема да се бара лозинка од вас, сѐ додека не се поврзете за првпат"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Оваа опција ќе биде игнорирана ако бидат пронајдени сопствени хедери за отпад."
+msgstr ""
+"Оваа опција ќе биде игнорирана ако бидат пронајдени сопствени хедери за "
+"отпад."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "_Лозинка:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14529,7 +14984,7 @@ msgstr ""
 "Ве молам, внесете описно име за оваа сметка во полето подолу.\n"
 "Ова име ќе се користи само за приказ."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14538,7 +14993,7 @@ msgstr ""
 "сте сигурни, прашајте го Вашиот систем администратор или интернет "
 "провајдерот."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14548,115 +15003,130 @@ msgstr ""
 "„Додатно“ од подолу не треба да се пополнат, доколку не сакате информациите "
 "да се вклучат во Вашите пораки."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Ве молам, одберете од следниве опции"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "Порта:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Из_вести кога испраќаш пораки дефинирани само со примачи на „слепа копија“"
+msgstr ""
+"Из_вести кога испраќаш пораки дефинирани само со примачи на „слепа копија“"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "Запо_мни ја лозинката"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "Од_говори на:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Запомни ја _лозинката"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "S_OCKS хост:"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:128
+#, fuzzy
+#| msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
 msgstr "П_обарај фотографија од испраќачот во локалните адресари"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "Одбе_ри..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "И_спрати потврда на порака:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "С_тандарден фонт:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Drafts Folder"
+msgstr "Одбери папка"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Одберете фиксна ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Одберете фиксна ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Одбери променлива ширина на HTML фонт"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Одбери HTML променлива ширина на HTML фонт за печатење"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Sent Folder"
+msgstr "Одбери папка"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Испраќам пошта"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Папка со ис_пратени пораки:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Сер_верот бара автентикација"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Тип на сервер: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за по_тпис:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "По_тпис:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Табела со потписи"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Проверка на правопис"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "Започнете со _пишување на дното на одговорот"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "Т_ип: "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14664,7 +15134,7 @@ msgstr ""
 "Листата на јазици овде се однесува само на јазиците за кои имаш инсталирано "
 "речник."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14674,7 +15144,7 @@ msgstr ""
 "потпис. Името кое ќе го назначите ќе се користи \n"
 "само за приказ."
 
-#: ../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\""
@@ -14682,26 +15152,26 @@ msgstr ""
 "Внесете го името кое ќе се однесува на оваа сметка.\n"
 "На пример: „Работа“ или „Лично“"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Корисничко _име:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Користи автен_тикација"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:678
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Корисничко _име:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "П_роменлива ширина:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14711,124 +15181,127 @@ msgstr ""
 "\n"
 "Кликнете „Напред“ за да продолжите."
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "_Секогаш вчитувај слики од Интернет"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL за _автоматска конфигурација на прокси:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "_Стандарден приклучок за отпад:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "_Директна врска на Интернет"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Не п_отпишувај барања за состаноци (за Outlook компатибилност)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "_Тип на препраќање:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Чувај го потписот над оригиналната порака кога реплицираш"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Вчитај слики во пошта од контакти"
 
-#: ../mail/mail-config.glade.h:171
-msgid "_Lookup in local addressbook only"
+#: ../mail/mail-config.glade.h:174
+#, fuzzy
+#| msgid "_Lookup in local addressbook only"
+msgid "_Lookup in local address book only"
 msgstr "_Барај само во локалните адресари"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Направи ја оваа сметка стандардна"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "_Рачна конфигурација на прокси:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Означи ги пораките како прочитани после"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_Никогаш не вчитувај слики од Интернет"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Патека:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "_Извести кога испраќаш HTML пораки на контакти кои не сакаат такви пораки"
+msgstr ""
+"_Извести кога испраќаш HTML пораки на контакти кои не сакаат такви пораки"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Извести кога испраќаш пораки со празна насловна линија"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "Т_ип на одговор:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "_Безбедно HTTP прокси:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "Одбе_ри..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "_Покажи анимации"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Покажи ја фотографијата на испраќачот во прегледот на е-поштата"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Смали ги заглавијата До / Копија / Слепа копија до"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Користи безбедна врска:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "Користи _стандардно"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи ги истите фонтови како другите апликации"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "адреси"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "опис"
 
@@ -14928,26 +15401,26 @@ msgstr "_Знаме:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Го прифаќам договорот за лиценца"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингувам %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Ги филтрирам избраните пораки"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Собирам пошта"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не успеаа да се применат појдовните филтри: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14956,109 +15429,109 @@ msgstr ""
 "Не може да се додаде до %s: %s\n"
 "Наместо тоа, додавам на локалната папка „Испратени“."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не може да се додаде на локалната папка „Испратени“: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Ја испраќам пораката"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Испраќам порака %d од %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Не може да се испратат %d од %d пораки"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Откажано."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Зачувувам порака во папка"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Преместувам пораки во %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам пораки во %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Препратени пораки"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отворам папка %s"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Информации за квотата на папката %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Отворам сместување %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Отстранувам папка %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сместувам папка „%s“"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Уништувам и сместувам сметка „%s“"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Сместувам сметка „%s“"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Освежувам папка"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Уништувам папка"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празнам ѓубре во „%s“"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Примам порака %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15066,7 +15539,7 @@ msgstr[0] "Собирам порака %d"
 msgstr[1] "Собирам пораки %d"
 msgstr[2] "Собирам пораки %d"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15074,7 +15547,7 @@ msgstr[0] "Зачувувам %d порака"
 msgstr[1] "Зачувувам %d пораки"
 msgstr[2] "Зачувувам %d пораки"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15083,11 +15556,11 @@ msgstr ""
 "Грешка при зачувување пораки во: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Зачувувам приврзок"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15096,27 +15569,27 @@ msgstr ""
 "Не може да се креира излезна датотека:%s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не може да се запишат податоците: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Одврзи се од %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно врзи се на %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Ја подготвувам сметката „%s„ за офлајн работење"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Проверувам сервис"
 
@@ -15132,39 +15605,39 @@ msgstr "Испрати и прими пошта"
 msgid "Cancel _All"
 msgstr "Откажи _сѐ"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Се ажурирам..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Проверувам дали има нова пошта"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Внеси тајна фраза за %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Внеси тајна фраза"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:217
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Внеси лозинка за %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Внеси лозинка"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Корисникот ја откажа операцијата."
 
@@ -15209,21 +15682,21 @@ msgstr "Невалидна папка: „%s“"
 msgid "Setting up Search Folder: %s"
 msgstr "Поставувам папка за пребарување: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Ги ажурирам папките за пребарување за „%s:%s“"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Ги ажурирам папките за пребарување за „%s“"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Уреди ја папката за пребарување"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Нова папка за пребарување"
 
@@ -15278,7 +15751,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Дали сигурно сакате да ја избришете оваа сметка?"
 
 #: ../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 "Сигурно сакате да ја избришете оваа сметка и сите нејзини проксија?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15297,7 +15771,9 @@ msgstr ""
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "Дали сигурно сакате трајно да ги отстраните сите избришани пораки во папката „{0}“?"
+msgstr ""
+"Дали сигурно сакате трајно да ги отстраните сите избришани пораки во папката "
+"„{0}“?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15570,11 +16046,13 @@ msgstr "Отворањето премногу пораки истовремен�
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
-msgstr "Ве молам, проверете ги поставувањата за сметката и обидете се повторно."
+msgstr ""
+"Ве молам, проверете ги поставувањата за сметката и обидете се повторно."
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr "Ве молам, овозможете ја сметката или испратете користејки друга сметка."
+msgstr ""
+"Ве молам, овозможете ја сметката или испратете користејки друга сметка."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
@@ -15722,8 +16200,10 @@ msgstr ""
 "испраќање не е овозможена"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Оваа порака не може да се испрати бидејќи немате назначено ниеден примач."
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Оваа порака не може да се испрати бидејќи немате назначено ниеден примач."
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15741,7 +16221,8 @@ msgstr "Потписот е изменет, но не е зачуван."
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "Ова ќе ги означи пораки како прочитани во одбраната папка и во потпапките."
+msgstr ""
+"Ова ќе ги означи пораки како прочитани во одбраната папка и во потпапките."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
@@ -15831,87 +16312,87 @@ msgstr "_Уништи"
 msgid "_Open Messages"
 msgstr "_Отвори пораки"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Невидени"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Видени"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Одговорени"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Препратено"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Повеќе невидени пораки"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Повеќе пораки"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Најниско"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Пониско"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Повисоко"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Највисоко"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Денес %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "Генерирам листа на пораки"
 
-#: ../mail/message-list.c:4223
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
-"Ни една порака не ги задоволува Вашите критериуми. Почнете ново пребарување или "
-"променете ги."
+"Ни една порака не ги задоволува Вашите критериуми. Почнете ново пребарување "
+"или променете ги."
 
-#: ../mail/message-list.c:4225
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Нема пораки во оваа папка."
 
@@ -15944,6 +16425,12 @@ msgstr "Испратени пораки"
 msgid "Size"
 msgstr "Големина"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+#| msgid "_Subject Field"
+msgid "Subject - Trimmed"
+msgstr "Поле за _наслов"
+
 #: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Јави"
@@ -16032,8 +16519,8 @@ msgstr ""
 "Листа на траги за приклучокот потсетник за приврзоци кој што го пребарува "
 "телото на пораката."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Клучни зборови"
 
@@ -16067,9 +16554,13 @@ msgid "_Edit Message"
 msgstr "_Уреди ја пораката"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid ""
+#| "A formatter plugin which displays audio attachments inline and allows you "
+#| "to play them directly from evolution."
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Додаток за форматирање кој ги прикажува аудио приврзоците внатре и ви "
 "дозволува да ги пуштите директно од evolution."
@@ -16078,27 +16569,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Внатрешен аудио додаток"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Одберете име за резервната датотека на Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Рестартирај го Evolution после правењето сигурносна копија"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Одберете го името на резервната датотека за враќање"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Рестартирај го Evolution после враќањето"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Врати од сигурносна копија"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16109,124 +16600,125 @@ msgstr ""
 "Исто така, ќе ви бидат вратени сите Ваши лични поставувања, филтри за пошта "
 "итн."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Поврати го Evolution од резервна датотека"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Ве молам, одберете архива за Evolution за враќање:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Одберете датотека за враќање"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Evolution папка за бекап"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolution папка за враќање"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Провери бекап за Evolution"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Рестартирај го Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Со графички кориснички интерфејс"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Го исклучувам Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Правам бекам од сметките и поставувањата на Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Правам бекап од податоците на Evolution (пошти, контакти, календари, задачи, "
 "меморандуми)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Правењето бекап заврши"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolution се рестартира"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Направи бекап на тековните податоци на Evolution"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Ги отпакувам датотеките од бекапот"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Ги вчитувам поставувањата на Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Ги отстранувам привремените бекап датотеки"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Осигурување на локалните извори"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Правам резерва во папката %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Враќам од папката %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Бекап за Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Направи бекап на податоците на Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Ве молам, почекајде додека Evolution прави бекап на Вашите податоци."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Ги враќам податоците на Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Ве молам, почекајте додека Evolution ги враќа Вашите податоци."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ова може да потрае, во зависност од количината на податоци."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Додаток за правење бекап и враќање на Evolution податоци и поставувања."
+msgstr ""
+"Додаток за правење бекап и враќање на Evolution податоци и поставувања."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -16238,8 +16730,10 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Дали сигурно сакате да го затворите Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "Дали сигурно сакате да го вратите Evolution од избраната резервна датотека?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Дали сигурно сакате да го вратите Evolution од избраната резервна датотека?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -16296,41 +16790,49 @@ msgstr "В_рати поставувања..."
 msgid "_Backup Settings..."
 msgstr "_Резервни поставувања..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Автоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
-msgid "_Auto-create addressbook entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:639
+#, fuzzy
+#| msgid "_Auto-create addressbook entries when replying to messages"
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Автоматски креирај записи во адресарот кога одговараш на порака"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изберете адресар за автоматски контакти"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Контакти за инстант пораки"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Повремено синхронизирај информации и слики од листата со пријатели на Pidgin"
+msgstr ""
+"Повремено синхронизирај информации и слики од листата со пријатели на Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Изберете адресар за контактите од Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронизрај со листата на к_онтакти сега"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "Automatically fills your addressbook with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"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 ""
@@ -16343,27 +16845,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Се случи грешка при %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 "Bogofilter процесот не одговара. Го уништувам..."
 
-#: ../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 "Чекањето за Bogofilter е прекинато Го уништувам..."
 
-#: ../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 "Каналот до Bogofilter не успеа. Код на грешката: %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 "Конвертирај го текстот од поштата во _уникод"
 
@@ -16391,21 +16893,31 @@ msgstr "Bogofilter приклучок за отпад"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Филтрирај ги отпадните пораки со помош на Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:671
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "Користи _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "Ос_вежи:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "Извори за календар на CalDAV"
@@ -16422,13 +16934,6 @@ msgstr "Локални календари"
 msgid "Provides core functionality for local calendars."
 msgstr "Овозможува функционалност за локални календари."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:695
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "Ос_вежи:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Безбедно поврзување"
@@ -16445,48 +16950,63 @@ msgstr "HTTP календари"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Овозможува функционалност за webcal и http календари."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Време: облачно"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Време: магливо"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Време: делумно облачно"
+msgid "Weather: Cloudy"
+msgstr "Време: облачно"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Време: врнежливо"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "Време: облачно"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "Време: врнежливо"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "Време: врне снег"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Време: врне снег"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Време: сончево"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Weather: Clear Night"
+msgstr "Временски календари"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Време: грмежливо"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Одбери локација"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Единици:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Метрички (целзиус, цм, итн)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Империски (Фаренхајт, инчи, итн)"
 
@@ -16515,7 +17035,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Провери дали Evolution е стандарден клиент за пошта"
 
 #: ../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."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Секојпат кога се подигнува Evolution, провери дали е стандарден клиент за е-"
 "пошта."
@@ -16533,23 +17054,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Дали сакате да го направите Evolution стандарден клиент за е-пошта?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
 msgstr "Означи како стан_дарден именик"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Означи како стан_дарден календар"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Означи како стан_дардна листа на задачи"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Означи како стан_дардна листа на меморандуми"
 
@@ -16558,23 +17079,27 @@ msgid "Default Sources"
 msgstr "Стандардни извори"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "Provides functionality for marking a calendar or an addressbook as the "
+#| "default one."
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 msgstr ""
 "Овозможува функционалност за обележување календар или адресар како "
 "стандарден."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Прилагодени заглавија"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Клуч"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Вредности"
 
@@ -16610,8 +17135,15 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"Овој клуч одредува листа на прилагодени заглавија кои можете да ги додавате на појдовните "
-"пораки. Форматот за одредување на заглавие и вредност се: име на заглавието проследено со „=“ и вредноста, потоа разделено со „;“"
+"Овој клуч одредува листа на прилагодени заглавија кои можете да ги додавате "
+"на појдовните пораки. Форматот за одредување на заглавие и вредност се: име "
+"на заглавието проследено со „=“ и вредноста, потоа разделено со „;“"
+
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16630,12 +17162,12 @@ msgid "_User:"
 msgstr "_Корисник:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Безбедна лозинка"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16643,11 +17175,11 @@ msgstr ""
 "Оваа опција се поврзува со Exchange серверот користејќи безбедна "
 "автентикација на лозинка (NTLM) ."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Лозинка со обичен текст"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16655,11 +17187,11 @@ msgstr ""
 "Оваа опција се поврзвуа со Exchange серверот користејќи стандардна "
 "автентикација на текст лозинка."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Надвор од канцеларија"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16667,88 +17199,94 @@ msgstr ""
 "Пораката назначена долу автоматски ќе се испрати на\n"
 "секоја личност која испраќа пошта до до вас кога сте надвор од канцеларија."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Јас сум надвор од канцеларија"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Јасу сум во канцеларија"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Смени ја лозинката за Exchange сметката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Смени лозинка"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Уреди ги поставувања за делегирање за Exchange сметката"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Помагач за делегирање"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Разно"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Види ја големината на сите Exchange папки"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Големина на папки"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Поставувања за Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "А_втентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+#| msgid "Specify _filename:"
+msgid "S_pecify the mailbox name"
+msgstr "Назначи _име на датотека:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Поштенско сандаче:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "Тип на _автентикација"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "Про_вери кои се поддржани типови"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16759,7 +17297,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16767,7 +17305,7 @@ msgstr ""
 "Тековната лозинка не е иста со онаа за вашата сметка. Внесете ја точната "
 "лозинка"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Двете лозинки не се совпаѓаат. Повторно внесете ги лозинките."
 
@@ -16787,38 +17325,38 @@ msgstr "Нова лозинка:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Тековната лозинка е истечена. Ве молам, сменете ја вашата лозинка."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Вашата лозинка ќе истече во следните %d дена"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Прилагодено"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Уредувач (читање, креирање, уредување)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Автор (читање, креирање)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Прегледувач (само читање)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Привилегии за делегирање"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Пермисии за %s"
@@ -16826,7 +17364,7 @@ msgstr "Пермисии за %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16836,66 +17374,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Дадени Ви се следниве пермисии врз моите папки:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Можеш да ги гледаш моите приватни предмети."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Како и да е, немате дозвола да ги гледате моите приватни предмети."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Назначени сте за делегат на %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Пренеси на:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Отстрани го делегатот %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Не може да се пристапи до Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Не може да се пронајдам себе си во активната папка"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Не може да се пронајде делегираниот %s во Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Не може да се отстрани делегатот %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Не може да се ажурира листатата на делегати."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Не може да се додаде делегатот %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Грешка при читање на листата на делегати."
 
@@ -16943,25 +17481,25 @@ msgstr "_Сумаризирај пермисии"
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Пермисии..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Име на папка"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Големина на папка"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Корисник"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Претплати се на друга папка"
@@ -16970,20 +17508,20 @@ msgstr "Претплати се на друга папка"
 msgid "Exchange Folder Tree"
 msgstr "Дрво со Exchange папки"
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
 msgid "Unsubscribe Folder..."
 msgstr "Откажи претплата за папка..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Дали навистина да ја откажам претплатата за папката „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Откажи претплата од „%s“"
@@ -17048,18 +17586,18 @@ msgstr "Вашата лозинка ќе истече за 7 дена..."
 msgid "_Change Password"
 msgstr "_Смени Лозинка"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Недозволен пристап.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Додај корисник:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:408
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Додај корисник"
 
@@ -17177,15 +17715,11 @@ msgstr "_Доверливост: "
 msgid "_User"
 msgstr "_Корисник"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "копче-корисник"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Одбери корисник"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Адресар..."
 
@@ -17208,18 +17742,22 @@ msgid "Exchange Operations"
 msgstr "Exchange операции"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Не може да се промени лозинката поради конфигурациски проблеми."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "Не може да се прикажат папките."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "Не можам да ја извршам операцијата."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17227,15 +17765,15 @@ msgstr ""
 "Промените на конфигурацијата на Exchange сметката „{0}“ ќе се случат откако "
 "ќе излезете и го рестартирате Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Не можам да се автентицирам на серверот."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Не може да се смени лозинка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17245,59 +17783,60 @@ msgstr ""
 "настана непозната грешка. Провери го URL-то, \n"
 "корисничкото име и лозинка и обиди се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "Не можам да се поврзам со Exchange серверот."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Не може да се поврзе со серверот {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "Не може да се утврдат привилегии за папка за делегирање."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "Не може да се пронајде Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Не може да се лоцира серверот {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Не може да се направи {0} делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Не може да се прочитаат привилегиите за папката"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "Не може да се прочитаат привилегиите за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "Не може да се прочита надвор-од-канцеларија состојбата"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "Не може да се ажурираат привилегии за папката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "Не може да се ажурира out-of-office состојба"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evolution бара рестартирање за да се вчита поштенското сандаче на корисникот"
+msgstr ""
+"Evolution бара рестартирање за да се вчита поштенското сандаче на корисникот"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Exchange сметката е офлајн."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17325,32 +17864,32 @@ msgstr ""
 "{0}\n"
 ".."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Не може да се ажурира делегирањето:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Папката веќе постои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Папката не постои"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Папката е офлајн"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Општа грешка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog серверот не е достапен"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17358,75 +17897,76 @@ msgstr ""
 "Ако ОWA работи на различна патека, мора да го назначите тоа во дијалогот за "
 "конфигурација на сметката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Сандачето за {0} не е на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Осигурајте се дека URL-то е точно и обидете се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Осигурајте се дали името на серверот е точно напишано и обидете се повторно."
+msgstr ""
+"Осигурајте се дали името на серверот е точно напишано и обидете се повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Осигурајте се дали корисничкото име и лозинката се точни и обидете се "
 "повторно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "Нема конфигурирано Global Catalog сервер за оваа сметка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нема сандаче за корисникот {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Нема таков корисник {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "Лозинката успешно е променета."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Ве молам внесете го ID-то за делегатот или исклучете ја опцијата за праќање "
 "како делегат."
 
-#: ../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 "Ве молам, осигурајте се дека името на Global Catalog серверот е точно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Ве молам рестартирајте го Evolution за промените да стапат во сила"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Ве молам одберете корисник."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "Серверот ја одби лозинката бидејќи е премногу лесна."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange сметката ќе биде исклучена кога ќе го исклучите Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange сметката ќе биде отстранета кога ќе го исклучите Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange серверот не е компатибилен со Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17434,7 +17974,7 @@ msgstr ""
 "Овој сервер работи под Exchange 5.5 Exchange Connector \n"
 "поддржува само Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17448,58 +17988,59 @@ msgstr ""
 "\n"
 "Или можеби само погрешно да е внесена лозинката."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Обиди се повторно со друга лозинка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "Не може да се додаде корисникот за пристап на контролната листа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "Не може да се уреди делегирањето."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "Непозната грешка при барање на {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "Непозната грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Непознат тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "Неподдржана операција"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Се приближувате кон границата за сместување пошта на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr "Дозволено Ви е да праќате пораки само во име на еден делегатор одеднаш."
+msgstr ""
+"Дозволено Ви е да праќате пораки само во име на еден делегатор одеднаш."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Не можете да се направите сами свој делегат."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ја преминавте границата за сместување пошта на овој сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Можете да конфигурирате само една Exchange сметка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17507,7 +18048,7 @@ msgstr ""
 "Тековната искористеност е: {0} KB. Обидете се да ослободите место со бришење "
 "на пошта."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17515,7 +18056,7 @@ msgstr ""
 "Тековната искористеност е: {0} KB. Сега не можете да примате и испраќате "
 "пошта."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17523,19 +18064,19 @@ msgstr ""
 "Тековната искористеност е: {0}KB. Не можете да примате и испраќате пошта сѐ "
 "додека не ослободите место т.е избришете пораки."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Вашата лозинка истече."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не може да се додаде на контролна листа за пристап"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} веќе е делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} веќе е во листата"
 
@@ -17580,15 +18121,17 @@ msgstr "Уредувачот не може да се пушти"
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
-msgstr "Evolution не може да креира привремена датотека за складирање на Вашата пошта. Пробајте подоцна."
+msgstr ""
+"Evolution не може да креира привремена датотека за складирање на Вашата "
+"пошта. Пробајте подоцна."
 
 #: ../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 ""
-"Надворешниот уредувач поставен во преференциите на приклучокот не може да се пушти. Пробајте да "
-"поставите друг уредувач."
+"Надворешниот уредувач поставен во преференциите на приклучокот не може да се "
+"пушти. Пробајте да поставите друг уредувач."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17598,11 +18141,11 @@ msgstr "Состави во _надворешен уредвач"
 msgid "Compose messages using an external editor"
 msgstr "Составувај пораки со користење на надворешен уредувач"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Команда која ќе се изврши за пуштање на уредувач на текст: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17610,15 +18153,15 @@ msgstr ""
 "За Emacs користете „xemacs“\n"
 "За VI користете „gvim“"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Изберете (48*48) png со големина < 700bytes"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG датотеки"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Фаца"
 
@@ -17633,17 +18176,16 @@ msgstr ""
 "во ~/.evolution/faces. Ова ќе се користи во е-поштите кои ќе се испраќаат во "
 "иднина."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Фаца"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Откажување претплата од папката „%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."
+#, fuzzy
+#| msgid ""
+#| "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr ""
 "Дозволи откажување претплата на папки со пошта во контекст менито на дрвото "
 "со папки."
@@ -17658,22 +18200,20 @@ msgstr "_Откажи претплата"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:493
-msgid "Please enter user name first."
-msgstr "Ве молам, прво внесете име."
-
-#: ../plugins/google-account-setup/google-source.c:497
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Внесете лозикнка за корисникот %s за пристап на листа на претплатени календари."
+msgstr ""
+"Внесете лозикнка за корисникот %s за пристап на листа на претплатени "
+"календари."
 
-#: ../plugins/google-account-setup/google-source.c:597
+#: ../plugins/google-account-setup/google-source.c:540
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17682,40 +18222,46 @@ msgstr ""
 "Не можам да читам податоци од Google сервер.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:747
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "Кален_дар:"
 
-#: ../plugins/google-account-setup/google-source.c:782
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "Земи _листа"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Сервер</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+#, fuzzy
+#| msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Приклучок за поставување на google календар и контакти."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google извори"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Листа за проверка"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+#| msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "Додаток за поставуање на групен календар и извори на контакти."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+#| msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "Поставувања за Groupwise сметка"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17740,24 +18286,24 @@ msgstr ""
 "Кликнете „Напред“ за да ја инсталирате споделената папка\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Инсталирај ја споделената папка"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Инсталирање на споделена папка"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Поставувања за отпад"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "Поставувања за отпадна пошта"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Поставувања за отпадната пошта..."
 
@@ -17770,7 +18316,7 @@ msgid "Email:"
 msgstr "Е-пошта:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Исклучи"
 
@@ -17791,8 +18337,8 @@ msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr ""
-"Вовлекувањето на пораката може да ја отстрани од поштенското сандаче на примачот. Дали сте "
-"сигурни дека сакате да го направите тоа?"
+"Вовлекувањето на пораката може да ја отстрани од поштенското сандаче на "
+"примачот. Дали сте сигурни дека сакате да го направите тоа?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17803,15 +18349,21 @@ msgid "Retract Mail"
 msgstr "Собирам пошта"
 
 #: ../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"
+msgid "Add Send Options to GroupWise messages"
 msgstr "Додај опции за испраќање на 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."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Додаток за опциите во Groupwise сметки."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+#| msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Groupwise можности"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17828,26 +18380,30 @@ msgstr "Серверот не дозволи избраната порака д�
 msgid "Invalid user"
 msgstr "Невалиден корисник"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Не може да му се даде прокси пристап на корисникот &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 "Одбери корисник"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Веќе имате дадено прокси пермисии на овој корисник."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "Мора да одредите Валидно корисничко име за да дадете прокси права."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Сметката {0}“ веќе постои. Ве молам, проверете го вашето дрво на папки."
+msgstr ""
+"Сметката {0}“ веќе постои. Ве молам, проверете го вашето дрво на папки."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
@@ -17857,29 +18413,39 @@ msgstr "Сметката веќе постои"
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "Прокси најавата како &quot;{0}&quot; беше неуспешна. Проверете ја Вашата адреса за е-пошта и обидете се пак."
+msgstr ""
+"Прокси најавата како &quot;{0}&quot; беше неуспешна. Проверете ја Вашата "
+"адреса за е-пошта и обидете се пак."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Направи го овој состанок повторувачки"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Дали сакате да прифатите?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Дали сакате да одбиете?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Не можете да ја споделите папката со одредениот корисник &quot;{0}&quot;."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+#| msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr ""
+"Не можете да ја споделите папката со одредениот корисник &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"
-msgstr "Мора да одредите корисничко име на кое што сакате да ја додадете листата."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+#| msgid "You have to specify a user name whom you want to add to the list"
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+"Мора да одредите корисничко име на кое што сакате да ја додадете листата."
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Делумно прифати"
 
@@ -17896,7 +18462,7 @@ msgid "Con_tacts..."
 msgstr "Конт_акти..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Порака"
 
@@ -17965,7 +18531,8 @@ msgstr "_Запиши"
 msgid "permission to read|_Read"
 msgstr "_Читај"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Прокси"
 
@@ -17973,14 +18540,15 @@ msgstr "Прокси"
 msgid "<b>Account Name</b>"
 msgstr "<b>Име на сметка</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Прокси најава"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВнеси лозинка за %s (корисник %s)"
@@ -17988,97 +18556,105 @@ msgstr "%sВнеси лозинка за %s (корисник %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Прокси најава..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Прокси јазичето ќе биде достапно само кога сметката е вклучена."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Прокси јазичето ќе биде достапно само кога сметката е вклучена."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+#| msgid "Insert advanced send options"
+msgid "Advanced send options"
+msgstr "Внеси напредни опции за испраќање"
+
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Корисници"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Внеси корисници и постави пермисии"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Нова _споделена папка..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Споделување"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Сопствено известување"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Додај   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Измени"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Статус на пораката"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "Од:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Датум на креирање:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Примач: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Доставено: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Отворено: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Прифатено: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Избришано: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Одбиено: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Завршено: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Не е доставено: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Следи го статусот на пораката..."
 
@@ -18148,28 +18724,28 @@ msgstr "Додаток за карактеристиките во IMAP смет�
 msgid "IMAP Features"
 msgstr "IMAP карактеристики"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:77
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "Увез_и во Календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "Увез_и во задачи"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:200
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Увези ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:223
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Избери листа со задачи"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:227
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Избери календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Увези"
 
@@ -18182,11 +18758,11 @@ msgstr "Увези во календар"
 msgid "Imports ICS attachments to calendar."
 msgstr "Приврзок за прикачување."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Не е вчитан Hardware Abstraction Layer"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18195,11 +18771,11 @@ msgstr ""
 "го сервисот и потоа пуштете ја оваа програма повторно. Или пак контактирајте "
 "го Вашиот систем администратор."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Барањето за iPod беше неуспешно"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -18207,14 +18783,19 @@ msgstr ""
 "Evolution не најде iPod со кој ќе се синхронизира. Или не е поврзан со "
 "системот или не е приклучен."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar формат (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Синхронизирај ги одбраните задача/меморандум/календар/адресар со Apple iPod"
+#, fuzzy
+#| msgid ""
+#| "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr ""
+"Синхронизирај ги одбраните задача/меморандум/календар/адресар со Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -18224,142 +18805,145 @@ msgstr "Синхронизирај со iPod"
 msgid "iPod Synchronization"
 msgstr "iPod синхронизација"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Не може да се отвори календарот „%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 "Некој дел во календарот „%s“ има конфликт со овој состанок"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Најден е делот во календарот „%s“."
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Не можам да најдам календари"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не можам да го најдам состанокот во овој календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Не можам да ја најдам оваа задача во листата со задачи"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Не можам да го најдам овој мемоар во листата со мемоари"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Пребарувам постоечка верзија на ова поставување"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Не може да се парсира предметот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не може да се испрати предмет во календарот „%s“.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Испратено во календарот „%s“ како прифатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Испратено во календарот „%s“ како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Испратено во календар „%s“ како неприфатено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Испратено во календар „%s“ како откажано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организерот го отстрани делегатот %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Испратено е известување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не можам да испратам известување за отказ на делегатот"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Статусот на посетителот не може да биде ажуриран заради неважечки статус!"
+msgstr ""
+"Статусот на посетителот не може да биде ажуриран заради неважечки статус!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не може да се ажурира посетителот. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Статусот на посетителот е ажуриран"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Информациите за состанокот се испратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Информациите за задачата се испратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Информациите за мемоарот се испратени"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "Не успеав да ги испратам информациите за состанокот, состанокот не постои"
+msgstr ""
+"Не успеав да ги испратам информациите за состанокот, состанокот не постои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не можам да најдам информација за задачата, оваа задача не постои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Не успеав да ги испратам информациите за мемоарот, мемоарот не постои"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Прикачениот календар не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "Пораката тврди дека содржи календар, но календарот не е валиден iCalendar."
+msgstr ""
+"Пораката тврди дека содржи календар, но календарот не е валиден 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:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Предметот во календарот не е валиден"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18367,11 +18951,11 @@ msgstr ""
 "Пораката содржи календар, но календарот не содржи настани, задачи или "
 "слободно/зафатено информации"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Прикачениот календар содржи повеќе предмети"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18379,227 +18963,227 @@ msgstr ""
 "За процесирање на сите предмети, датотеката треба да се зачува и календарот "
 "да се увезе"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Состанок се повторува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Задачата се повторува"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Мемоарот се повторува"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Избриши ја пораката по делувањетп"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Пребарување конфликти"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Одбери ги календарите за барање на конфликтни состаноци"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Денес"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Денес %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Денес %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Денес %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Утре"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Утре %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Утре %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Утре %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Утре %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Ве молам одговорете во име на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Примено во име на <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> преку %s ги објави следниве информации од состанокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ги објави следниве информации од состанокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> го делегираше следниов состанок за вас:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> преку %s бара ваше присуство на следниов состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> бара ваше присуство на следниов состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> преку %s сака да додаде на постоечки состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> сака да додаде на постоечки состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18608,87 +19192,88 @@ msgstr ""
 "<b>%s</b> сака преку %s да ги добие најновите информации за следниов "
 "состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> сака да ги добие најновите информации за следниов состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> преку %s го испрати назад следниов одговор за состанокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> го испрати назад следниов одговор за состанокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> преку %s го откажа следниов состанок:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> го откажа следниот состанок."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> преку %s ги предложи следниве промени на состанокот."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ги предложи следниве промени на состанокот."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> преку %s ги отфрли следниве промени на состанокот:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ги отфрли следниве промени на состанокот."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> преку %s ја објави следнава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>  ја објави следнава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> бара доделување на %s на следнава задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> преку %s ви додели задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ви додели задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> преку %s сака да додаде на постоечка задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> сака да додаде на постоечка задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18697,174 +19282,187 @@ msgstr ""
 "<b>%s</b> преку %s сака да ги добие најновите информации за следнава "
 "доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> сака да ги добие најновите информации за следнава доделена задача:"
+msgstr ""
+"<b>%s</b> сака да ги добие најновите информации за следнава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> преку %s го испрати назад следниов одговор за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b>го испрати назад следниов одговор за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> преку %s ја откажа следнава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ја откажа следнава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> преку %s ги предложи следниве промени за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ги предложи следниве промени за задачата:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> преку %s ја отфрли следнава зададена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ја отфрли следнава доделена задача:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> преку %s го објави следниов меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> го објави следниов меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> преку %s сака да додаде на постоечки меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> сака да додаде на постоечки меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> преку %s го откажа следниов споделен меморандум:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> го откажа следниов споделен меморандум:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Отвори календар"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Одбиј"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Одбиј"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "_Прифати"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "Одбиј _се"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "_Сите пробни"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Пробен"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Прифати се"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Испрати информации"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Ажурирај го статусот на одговарачот"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Надградба"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Почетно време:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Време на завршување:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Одговори на испраќачот"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Испрати а_журирање на присутните"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "При_мени во сите случаи"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Покажи време како _слободен"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "Потсетник за приврзоци"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Задачи :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Меморандуми :"
 
@@ -18889,12 +19487,13 @@ msgid "This meeting has been delegated"
 msgstr "Овој состанок е делегиран"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Овој одговор не е од тековен посетител. Да го додадам го испраќачот како "
 "посетител?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Прокси _одјава"
 
@@ -18958,7 +19557,8 @@ msgstr "Звучна датотека која ќе се пушти."
 
 #: ../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 "Звучна датотека за свирење кога пристигнува нова пошта, ако не ќе бипни."
+msgstr ""
+"Звучна датотека за свирење кога пристигнува нова пошта, ако не ќе бипни."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
@@ -18976,20 +19576,20 @@ msgstr "Дали иконата да трепка."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Дали да известувам за нови пораки само во папката „Сандаче“."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Генерирај _D-Bus порака"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Известување за нова порака на Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Својства за известувањето за пошта"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19007,7 +19607,7 @@ msgstr[2] ""
 "Примивте %d нови пораки\n"
 "во %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19015,48 +19615,48 @@ msgstr[0] "Примивте %d нова порака."
 msgstr[1] "Примивте %d нови пораки."
 msgstr[2] "Примивте %d нови пораки."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Нова е-пошта"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Покажи икона во местото за _известување"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "Тр_епкачка икона во местото за известување"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Скокачка _порака заедно со иконата"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr ")Пушти звучна датотека кога пристигнува нова пошта"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Бипни"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Пушти _звучна датотека"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Назначи _име на датотека:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Одберете звучна датотека"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Пу_шти"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Известувај за нови пораки само во _сандачето"
 
@@ -19086,12 +19686,12 @@ msgstr "Прет_вори во состанок"
 msgid "Mail to meeting"
 msgstr "Испрати на состанок"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не можам да отворам календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19140,7 +19740,8 @@ msgid "Mailing _List"
 msgstr "Поштенска _листа"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Овозможи дејства за обични команди на поштенска листа (претплати, откажи "
 "претплата...)."
@@ -19201,9 +19802,15 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Да ја испратам eлектронската порака на поштенската листа?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+#, fuzzy
+#| msgid ""
+#| "The action could not be performed. This means the header for this action "
+#| "did not contain any action we could process.\n"
+#| "\n"
+#| "Header: {0}"
+msgid ""
+"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 ""
@@ -19226,7 +19833,8 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "Оваа порака не ги содржи информациите за заглавието потребни за ова дејство."
+msgstr ""
+"Оваа порака не ги содржи информациите за заглавието потребни за ова дејство."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -19242,7 +19850,8 @@ msgstr "Контактирај со _сопственикот на листат�
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Контактирај го сопственикот на поштенската листа каде припаѓа оваа порака"
+msgstr ""
+"Контактирај го сопственикот на поштенската листа каде припаѓа оваа порака"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -19284,21 +19893,23 @@ msgstr "_Претплати се на листата"
 msgid "_Unsubscribe from List"
 msgstr "_Откажи претплата од листата"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Да ги означам пораките во потпапките?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../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 "Дали сакате да ги означите пораките како прочитани во одбраната папка и во потпапките?"
+msgstr ""
+"Дали сакате да ги означите пораките како прочитани во одбраната папка и во "
+"потпапките?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "Тековната папка и _потпапки"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Само тековна _папка"
 
@@ -19314,22 +19925,6 @@ msgstr "Означи ги по_раките како прочитани"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Се користи за обележување на сите пораки под папката како прочитани"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Означи го календарот офлајн"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Го означува одбраниот календар за офлајн преглед."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Не го прави ова достапно офлајн"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Направи го достапен за офлајн користење"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Додаток кој имплементира mono додатоци."
@@ -19344,7 +19939,7 @@ msgstr "Додаток за тоа кои додатоци се вклучени
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Менаџер на додатоци"
 
@@ -19356,24 +19951,24 @@ msgstr "Вклучи и исклучи додатоци"
 msgid "_Plugins"
 msgstr "_Додатоци"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Автор(и)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Забелешка: Некои промени нема да се применат додека не се рестартира"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Преглед"
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Додаток"
 
@@ -19398,19 +19993,19 @@ msgstr "Текстуален режим"
 msgid "Prefer plain-text"
 msgstr "Претпочита обичен текст"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Покажи HTML ако е присутно"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Претпочита текст"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Само секогаш покажи текст"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML _режим"
 
@@ -19422,6 +20017,22 @@ msgstr "Evolution профил менаџер"
 msgid "Writes a log of profiling data events."
 msgstr "Пишува лог на профилинг податочни настани."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import mail from Pine."
+msgid "Import Outlook messages from PST file"
+msgstr "Увези пошта од Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook PST import"
+msgstr "Outlook CSV таб увезувач"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Дозволува календари да бидат објавени на веб"
@@ -19438,8 +20049,10 @@ msgstr "Локации"
 msgid "_Publish Calendar Information"
 msgstr "Објави информации за календар"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+#| msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "Сигурно сакате да го избришете овој URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19477,8 +20090,17 @@ msgid "Publishing _Frequency:"
 msgstr "_Опсег на објавување:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"SSH\n"
+#, fuzzy
+#| msgid ""
+#| "SSH\n"
+#| "Public FTP\n"
+#| "FTP (with login)\n"
+#| "Windows share\n"
+#| "WebDAV (HTTP)\n"
+#| "Secure WebDAV (HTTPS)\n"
+#| "Custom Location"
+msgid ""
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19526,6 +20148,18 @@ msgstr ""
 "iCal\n"
 "Слободен/зафатен"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+#| msgid "Location"
+msgid "New Location"
+msgstr "Локација"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+#| msgid "Location"
+msgid "Edit Location"
+msgstr "Локација"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -19543,58 +20177,61 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Тест приклучок за вчитувачот за Python - EPlugin."
 
 #: ../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."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Приклучок кој вчитува други приклучоци со користење на python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Вчитувач за Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (вграден)"
 
-#: ../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 "SpamAssassin не е пронајден, код: %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 "Не успеав да креирам канал: %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 "Грешка после 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 "Процесот SpamAssassin не одговара..."
 
-#: ../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..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Чекам процесот на Spamassassin да се прекине..."
 
-#: ../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 "Каналот до SpamAssassin не успеа, код на грешка: %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 "SpamAssassin не е достапен."
 
-#: ../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 "Ова ќе го направи Spamassasin подобар, но побавен"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "Вк_лучи далечни тестови"
 
@@ -19607,12 +20244,14 @@ msgstr ""
 "SpamAssassin да е инсталиран."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Spamassassin приклучок за отпад"
+#, fuzzy
+#| msgid "Spamassassin Options"
+msgid "SpamAssassin Options"
+msgstr "Опции за SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Опции за SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Spamassassin приклучок за отпад"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19620,7 +20259,7 @@ msgstr "Додаток за зачувување на сите привезоц�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Зачувај приврзоци"
 
@@ -19632,15 +20271,15 @@ msgstr "Зачувај ги приврзоците..."
 msgid "Save all attachments"
 msgstr "Зачувај ги сите приврзоци"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Одбери базно име за зачувување"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Зачувај"
 
@@ -19648,79 +20287,79 @@ msgstr "Зачувај"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Листа со опис"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Листа на категории"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Листа на коментари"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Креирано"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Листа на контакти"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Старт"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Крај"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "проценти готово."
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL:"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Листа на посетители"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Изменето"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Напредни опции за CSV форматот"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Вметни заглавие"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Разграничувач на вредност:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Разграничувач на записи:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Пополни вредности со:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Формат на вредност разделена со запирка (.csv)"
 
@@ -19741,15 +20380,15 @@ msgstr "Зачувај на _диск"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF формат (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Одбери дестинациска датотека"
 
@@ -19781,15 +20420,15 @@ msgstr "Ве води низ иницијалното поставување н�
 msgid "Setup Assistant"
 msgstr "Асистент за поставување"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolution асистент за поставувања"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Добредојдовте"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19802,29 +20441,29 @@ msgstr ""
 "\n"
 "Кликнете на копчето „Напред“ за да продолжите."
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Увезувам датотеки"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:143
+#: ../plugins/startup-wizard/startup-wizard.c:137
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Ве молам, одберете ги информациите кои сакате да ги увезете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../plugins/startup-wizard/startup-wizard.c:152
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
-#: ../shell/e-shell-importer.c:507
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Увезувам податоци."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:521
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Ве молам, почекајте"
 
@@ -19841,7 +20480,7 @@ msgid "Thread messages by subject"
 msgstr "Подреди ги пораките според тема"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "В_рати се на разгранување на пораки според тема"
 
@@ -19849,17 +20488,19 @@ msgstr "В_рати се на разгранување на пораки спо�
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "Листа на парови клучен збор/вредност за приклучокот за скици за заменување во телото на пораката"
+msgstr ""
+"Листа на парови клучен збор/вредност за приклучокот за скици за заменување "
+"во телото на пораката"
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Без наслов"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Зачувај како _скица"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Зачувај како скица"
 
@@ -19868,8 +20509,11 @@ msgid "Drafts based template plugin"
 msgstr "Приклучок за шаблони базиран на скици"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "Едноставен приклучок кој што користи ytnef за декодирање на tnef приврзоци."
+#, fuzzy
+#| msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr ""
+"Едноставен приклучок кој што користи ytnef за декодирање на tnef приврзоци."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19894,7 +20538,9 @@ msgid "URL:"
 msgstr "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)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Избегни ако се совпаднат (треба за apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19926,130 +20572,128 @@ msgid "Configuration version"
 msgstr "Верзија на конфигурацијата"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Одредува дали да се изврши враќање од неуспешна сесија или не."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Стандардна ширина на страничната лента"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Стандардна висина на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Стандардна состојба на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Стандардна ширина на прозорецот"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Ги овозможува поставувањата за прокси при пристап на HTTP/безбеден HTTP преку Интернет."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Ги овозможува поставувањата за прокси при пристап на HTTP/безбеден HTTP "
+"преку Интернет."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "Име на хост на HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "Лозинка за HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "Порта на HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "Корисничко име на HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID или алијас на компонентата за стандарден приказ при стартување."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../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 ""
-"Ако е точно, врските преку прокси сервер ќе бараат автентикација. Корисничкото име "
-"се добива од „/apps/evolution/shell/network_config/authentication_user“ клучот во GConf, а лозинката "
-"од gnome-keyring или датотеката со лозинка ~/.gnome2_private/Evolution."
+"Ако е точно, врските преку прокси сервер ќе бараат автентикација. "
+"Корисничкото име се добива од „/apps/evolution/shell/network_config/"
+"authentication_user“ клучот во GConf, а лозинката од gnome-keyring или "
+"датотеката со лозинка ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Последна надградена конфигурациска верзија"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Листа на патеки за папките кои ќе бидат синхронизирани на дискот за офлајн "
 "користење"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Хостови без прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Лозинка за автентикација при правење на HTTP прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Конфигурација на режим на прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "Име на хост на SOCKS прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "Порта на SOCKS прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Име на хост на безбедно HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Порта за безбедно HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 ""
-"Одберете режим на конфигурација на проксито. Поддржани вредности се 0, 1, 2 и 3 "
-"кои значат „користи системски поставувања“. „без прокси“, „користи рачна конфигурација на прокси“ "
-"и „користи прокси конфигурација овозможена во autoconfig url-то“ соодветно."
+"Одберете режим на конфигурација на проксито. Поддржани вредности се 0, 1, 2 "
+"и 3 кои значат „користи системски поставувања“. „без прокси“, „користи рачна "
+"конфигурација на прокси“ и „користи прокси конфигурација овозможена во "
+"autoconfig url-то“ соодветно."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Страничната лента е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Прескокни го дијалогот за предупредување за развој"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Прескокни го дијалогот за предупредување за неуспешна сесија"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Стартувај во офлајн режим"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Лентата за статус е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20057,19 +20701,19 @@ msgstr ""
 "Конфигурациската верзија на Evolution, со големо/помало/ниво на "
 "конфигурација."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Стандардна висина за главниот прозорец, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Стандардна ширина за главниот прозорец, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандардна ширина на страничната лента, во пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20077,19 +20721,19 @@ msgstr ""
 "Последната надградена конфигурациска верзија на Evolution, со големо/помало/"
 "ниво на конфигурација"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr "Името на машината преку која се прави HTTP прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Името на машината преку која се прави безбедно HTTP прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr "Името на машината преку која се прави прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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."
@@ -20097,7 +20741,7 @@ msgstr ""
 "Портата на машината се дефинира со „/apps/evolution/shell/network_config/"
 "http_host“."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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."
@@ -20105,7 +20749,7 @@ msgstr ""
 "Портата на машината се дефинира со „/apps/evolution/shell/network_config/"
 "secure_host“."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -20113,7 +20757,7 @@ msgstr ""
 "Портата на машината дефинирана со „/apps/evolution/shell/network_config/"
 "socks_host“ преку која правите прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20123,79 +20767,70 @@ msgstr ""
 "„алатник“. Ако „алатник“ е поставен, стилот на копчињата е одреден од GNOME "
 "поставувања за алатникот."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 ""
-"Овој запис содржи листа на хостови кои се поврзани директно, наместо "
-"преку прокси (ако е активно). Вредностите може да бидат имиња на хостови, "
-"домени (со користење на џокери како *.foo.com), IP адреси на хостови (IPv4 и IPv6) "
+"Овој запис содржи листа на хостови кои се поврзани директно, наместо преку "
+"прокси (ако е активно). Вредностите може да бидат имиња на хостови, домени "
+"(со користење на џокери како *.foo.com), IP адреси на хостови (IPv4 и IPv6) "
 "и мрежни адреси со нетмаска (нешто како 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Лентата со алатки е видлива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "URL кое овозможува вредности за конфигурација на прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "Користи HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Корисничко име кое ќе се користи за автентикација при HTTP прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Дали Evolution ќе стартува во офлајн режим наместо онлајн."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Дали да се изврши враќање од неуспешна сесија или не"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Дали прозорецот да биде максимизиран."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Дали лентата со алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Дали лентата за статус треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата со алатки треба да биде видлива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Дали дијалогот за предупредување во развојните верзии на Evolution е "
 "изоставен."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Дали дијалогот за предупредување за враќањето од неуспешна сесија на "
-"Evolution е изоставен."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Дали копчињата на прозорците треба да се видливи."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Стил на копчињата на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Копчињата на прозорците се видливи"
 
@@ -20209,19 +20844,24 @@ msgstr "Активни врски"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr "Кликнинете на „Во ред“ за затворање на овие поврзување за да одам офлајн"
+msgstr ""
+"Кликнинете на „Во ред“ за затворање на овие поврзување за да одам офлајн"
 
 #: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Одбери го типот на увезувач за извршување:"
 
 #: ../shell/e-shell-importer.c:134
+#, fuzzy
+#| msgid ""
+#| "Choose the file that you want to import into Evolution, and select what "
+#| "type of file it is from the list.\n"
+#| "\n"
+#| "You can select \"Automatic\" if you do not know, and Evolution will "
+#| "attempt to work it out."
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
 "Одберете ја датотеката која што сакате да се увезе во Evolution, и одберете "
 "за каков тип на датотека се работи.\n"
@@ -20229,11 +20869,11 @@ msgstr ""
 "Можете да одберете „Автоматски“ ако не знаете и Evolution ќе се обиде да го "
 "направи."
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Одбери дестинација за ова увезување"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20245,27 +20885,27 @@ msgstr ""
 "за увоз. Ако сакате да се\n"
 "обидете повторно, кликнете на копчето „Назад“.\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "И_ме на датотека:"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Одбери датотека"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Тип на _датотека:"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Увези податоци и поставувања од _постари програми"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Увези _една датотека"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Контрола на параметри за Evolution пошта"
 
@@ -20296,7 +20936,7 @@ msgstr "Bug buddy не може да се стартува."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Дамјан Георгиевски, Марко Иваноски, Иван Стојмиров, \n"
@@ -20304,23 +20944,19 @@ msgstr ""
 "Јован Наумовски <jovan@lugola.net> 2007,\n"
 "Арангел Ангов <ufo@linux.net.mk> 2007."
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Веб страницата на Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "Грешка во отворањето на веб страницата за ЧПП."
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Работи онлајн"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Работи офлајн"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Работи офлајн"
 
@@ -20344,52 +20980,52 @@ msgstr ""
 "Evolution моментно е офлајн.\n"
 "Кликнете на ова копче за работење онлајн."
 
-#: ../shell/e-shell-window.c:782
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Премини на %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Непозната системска грешка."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "Во ред"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Невалидни аргументи"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Не може да се регистрира на OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Конфигурациската база не е најдена"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "Ново"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Нов тест"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 msgid "_Test"
 msgstr "_Тест"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Креирај нов тест предмет"
 
@@ -20414,8 +21050,10 @@ msgid "Importer Type"
 msgstr "Тип на увезувач"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Одбери увезувачи"
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select Information to Import"
+msgstr "Одбери папка за увезување"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20432,7 +21070,7 @@ msgstr ""
 "увезување на надворешни датотеки во Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20467,7 +21105,7 @@ msgstr ""
 "Се надеваме дека уживате во резултатите од нашата напорна\n"
 " работа и со задоволство го очекуваме Вашето мислење.\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20475,66 +21113,43 @@ msgstr ""
 "Благодариме,\n"
 "Тимот на Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Не ми кажувај повторно"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Детекција на паѓање на Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Иг_норирај"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution изгледа дека излезе неочекувано последниот пат.\n"
-"Како мерка за претпазливост сите површини за преглед ќе бидат скриени.\n"
-"Можете да ги вратите преку менито „Поглед“.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_Не ја прикажувај повторно оваа порака"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Стартувај го Evolution со активирање на одредената компонента"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Стартувај во онлајн режим"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Насила исклучи ги сите Evolution компоненти"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Насила ре-мигрирај од Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Испрати го излезот од дебагирањето на сите компоненти во датотека."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Оневозможи вчитување на било кои додатоци."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Исклучи го просторот за преглед на пошта, контакти и задачи."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM и е-пошта клиент"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20548,18 +21163,24 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Сигурно сакате да ги заборавам сите запомнати лозинки?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Cannot start Evolution"
+msgstr "Рестартирај го Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Продолжи"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Избриши ги старите податоци од верзија {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution не може да стартува."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20567,15 +21188,15 @@ msgstr ""
 "Заборавањето на лозинките ќе ги исчисти сите запомнати лозинки. Ќе бидете "
 "известени наредниот пат кога ќе бидат потребни."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Недоволно место на дискот за надградба."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Дали навистина да ги избришам старите податоци?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20596,9 +21217,18 @@ msgstr ""
 "Штом се избрише, не може да се врати претходната верзија на Evolution без "
 "рачна интервенција.\n"
 
-#: ../shell/shell.error.xml.h:15
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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 "
@@ -20612,11 +21242,11 @@ msgstr ""
 "задржите податоците, тогаш треба рачно да ја отстраните содржината на &quot;"
 "evolution&quot;.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Надградбата од претходната верзија не успеа: {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"
@@ -20629,7 +21259,7 @@ msgstr ""
 "\n"
 "Ќе треба да ослободите повеќе место во домашната папка пред да продолжите."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20640,7 +21270,7 @@ msgstr ""
 "\n"
 "Кликнете на помош за повеќе детали"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20654,19 +21284,19 @@ msgstr ""
 "\n"
 "Кликнете на помош за повеќе детали."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Заборави"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Зачувај ги податоците"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Потсети ме подоцна"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20734,7 +21364,7 @@ msgid "Purposes"
 msgstr "Цели"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Сериски број"
 
@@ -20754,27 +21384,27 @@ msgstr "Адреса за е-пошта"
 msgid "All CA certificate files"
 msgstr "Сите CA датотеки со сертификати"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Прегледувач на сертификати: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Внеси ја лозинката за „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Внеси нова лозинка за базата со сертификати"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Внеси нова лозинка"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20783,7 +21413,7 @@ msgstr ""
 "Издадено на:\n"
 "  Субјект: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20792,7 +21422,7 @@ msgstr ""
 "Издадено од:\n"
 "  Субјект: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Одбери сертификат"
 
@@ -20852,7 +21482,7 @@ msgstr ""
 "Пред да му верувате на овој CA за било која цел, треба да го испитате "
 "неговиот сертификат, полиса и процедури (ако е достапно)."
 
-#: ../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 "Сертификат"
 
@@ -20928,11 +21558,11 @@ msgstr "Организациска единица"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 отпечаток"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL клиент сертификат"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL сервер сертификат"
 
@@ -20961,7 +21591,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Имате сертификати од овие организации кои те идентификуваат:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Имате сертификат во датотека кои ги идентификуваат овие сертификати за "
 "авторитет:"
@@ -20979,182 +21610,182 @@ msgid "_Edit CA Trust"
 msgstr "_Уреди 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 "Сертификатот веќе постои"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Потпис"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Енкриптирај"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Верзија"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Верзија 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Верзија 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 со RSA енкрипција"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 со RSA енкрипција"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 со RSA енкрипција"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA енкрипција"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Користење на клуч на сертификат"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape тип на сертификат"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Идентификувач на авторитетен клуч на сертификат"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Идентификувач на објекти (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Идентификувач на алгоритам"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Параметри на алгоритам"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Инфо на јавен клуч на субјектот"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Алгоритам на јавен клуч на субјектот"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Јавен клуч на субјектот"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Грешка: не може да се процесира наставка"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Потписник на објекти"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Авторитет на SSL сертификат"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Авторитет на сертификат за е-пошта"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Потпишување"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Признавање"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Шифрирање на клуч"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Шифрирање на податоци"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Договор за клуч"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Потписник на сертификат"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL потписник"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Критично"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Некритично"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Наставки"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Aлгоритам за потпис на сертификат"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Издал"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Единствен ID на издавач"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Единствен ID на субјект"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Вредност за потпис на сертификат"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 датотека со лозинка"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Внеси лозинка за PKCS12 датотека:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Увезен сертификат"
 
@@ -21193,7 +21824,9 @@ msgid "Copy"
 msgstr "Копирај"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
 msgstr "Копирај ги избраните контакти во друга папка..."
 
 #: ../ui/evolution-addressbook.xml.h:8
@@ -21209,7 +21842,9 @@ msgid "Copy to Folder..."
 msgstr "Копирај во папка..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+#, fuzzy
+#| msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Креирај нова папка за адресарот"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -21242,7 +21877,9 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Пре_мести ги сите контакти во..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
 msgstr "Помести ги избраните контакти во друга папка..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -21283,14 +21920,16 @@ msgid "Save as VCard..."
 msgstr "Сними како VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+#| msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
 msgstr "Зачувај одбрани контакти како VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Зачувај ги контактите од избраната папка како 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 "Одбери сѐ"
 
@@ -21303,7 +21942,9 @@ msgid "Select all contacts"
 msgstr "Одбери ги сите контакти"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+#| msgid "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
 msgstr "Испрати порака на одбраните контакти."
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -21311,7 +21952,9 @@ msgid "Send message to contact"
 msgstr "Испрати порака на контакт"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+#| msgid "Send selected contacts to another person."
+msgid "Send selected contacts to another person"
 msgstr "Испрати одбрани контакти на друга личност."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -21334,7 +21977,7 @@ msgstr "Стопирај вчитување"
 msgid "View the current contact"
 msgstr "Види го тековниот контакт"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Дејства"
@@ -21424,7 +22067,7 @@ msgid "Month"
 msgstr "Месец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Следно"
 
@@ -21433,7 +22076,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Се прегледува календарот за печатење"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Претходно"
 
@@ -21489,15 +22132,23 @@ msgstr "Покажи ја работната недела"
 msgid "View the current appointment"
 msgstr "Види го тековното закажување"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Погледни во конзолата за дебагирање за лог пораки"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Недела"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Работна недела"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "Логови за _дебагирање"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Отвори закажување"
 
@@ -21566,10 +22217,6 @@ msgstr "Покажи прозорец за преглед на порака"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Претплати или откажи претплата на папки на оддалечени сервери"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Погледни во конзолата за дебагирање за лог пораки"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Класичен преглед"
@@ -21578,10 +22225,6 @@ msgstr "_Класичен преглед"
 msgid "_Copy Folder To..."
 msgstr "_Копирај ја папката во..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Логови за _дебагирање"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Преземи ги сите пораки за офлајн употреба"
@@ -21606,7 +22249,9 @@ msgstr "_Преглед"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+#, fuzzy
+#| msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "_Претплати"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21663,7 +22308,8 @@ msgid "Hide _Read Messages"
 msgstr "Скриј ги п_рочитаните пораки"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Скриј ги избришаните пораки наместо да ги прикажуваш прецртани"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21686,10 +22332,6 @@ msgstr "Трајно отстрани ги сите избришани пора�
 msgid "Permanently remove this folder"
 msgstr "Трајно отстрани ја оваа папка"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "Ос_вежи..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Освежи ја папката"
@@ -22333,7 +22975,8 @@ msgstr "Излез од програмата"
 
 #: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Заборави ги запомнатите лозинки така што ќе бидеш известен за нив повторно"
+msgstr ""
+"Заборави ги запомнатите лозинки така што ќе бидеш известен за нив повторно"
 
 #: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
@@ -22591,7 +23234,7 @@ msgstr ""
 "Употребете го десното копче за намалување."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Колекција"
 
@@ -22612,17 +23255,17 @@ msgid "Define Views for \"%s\""
 msgstr "Дефинирај поглед за  „%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Табела"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Примерок"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Зачувај го тековниот поглед"
 
@@ -22635,42 +23278,42 @@ msgid "_Replace existing view"
 msgstr "_Замени го постоечкиот поглед"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Прилагоден приказ"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Зачувај го сопствениот преглед"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Дефинирај поглед..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Т_ековен приказ"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Одберете поглед: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Тековниот поглед е прилагоден поглед"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Зачувај прилагоден поглед..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Зачувај го тековниот прилагоден поглед"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Креирај или уредувај погледи"
 
@@ -22694,7 +23337,7 @@ msgstr "Тип на поглед"
 msgid "Type of view:"
 msgstr "Тип на поглед:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Лента за приврзоци"
 
@@ -22726,231 +23369,231 @@ msgid "Suggest automatic display of attachment"
 msgstr "Предложи автоматски приказ на приврзок"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Месечен календар"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Боја на пополнување"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "Боја на пополнување на ГДК"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Пополни со испрекината линија"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Минимална ширина"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Минимална ширина"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Проред"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Сега"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Времето мора да биде во формат: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Вредноста на процентот мора да биде меѓу 0 и 100."
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Арапски"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Балтички"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Централно Европски"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Кинески"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Кириличен"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Еврејски"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Јапонски"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Корејски"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Тајландски"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Турски"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Уникод"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Западно Европски"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Западноевропски, нов"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Традиционален"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Упростен"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Украински"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Визуелно"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Непознато кодирање %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Кодна страница"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Внесете го множеството знаци за употреба"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Друго..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Ко_дна страница"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Текстуален запис за внес на датум"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Кликнете на ова копче за приказ на календар"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Комбо поле за избор на време"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "Се_га"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_Денес"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Невалидна вредност за датум"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Невалидна вредност за време"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Проширено"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Дали проширувачот е отворен"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Текст на ознаката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Користи потцртано"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22958,90 +23601,91 @@ msgstr ""
 "Ако е поставено, подвлекувањето во текстот значи дека наредниот знак треба "
 "да се користи за мнемонично копче за брз пристап"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Место за оставање меѓу ознаката и детето"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Графичка контрола за ознака"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
-msgstr "Графичка контрола за приказ наместо ознаката на вообичаениот проширувач"
+msgstr ""
+"Графичка контрола за приказ наместо ознаката на вообичаениот проширувач"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Големина на проширувачот"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Големина на стрелката на проширувачот"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Растојание на индикатор"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Проред околу стрелката на проширувачот"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "Напредно пребарување"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Зачувај го пребарувањето"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Пребарува"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "_Пребарува"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "Зачувај пребарување..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "Измени ги снимените пребарувања"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "_Напредно пребарување..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Сите сметки"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Тековна сметка"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Тековна папка"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Тековна порака"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Избери слика"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Мапа на светот"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23050,110 +23694,110 @@ msgstr ""
 "часовна зона. Корисниците на тастатура треба да одберат часовна зона од "
 "комбо полето подолу."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "Онлајн"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Состојбата на копчето е офлајн"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Синхронизирај се со:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Синхронизирај ги приватните записи:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Синхронизирај г категориите:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Празна порака"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Reflow модел"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Ширина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Пребарај"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Кликнете овде за промена на типот на пребарување"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Пребарај"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Најди сега"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Исчисти"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ID на предметот"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Текст"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "При_кажи: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "Бар_ај: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " в_о "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Ред на покажувачот"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Колона на покажувачот"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Подредувач"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Начин на избирање"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Режим на работа на покажувачот"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Кога е избри_шано:"
 
@@ -23283,19 +23927,19 @@ msgid "_When opened:"
 msgstr "Кога е отворено:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "кликни овде за одење на url"
 
@@ -23315,7 +23959,7 @@ msgstr "_Достапни категории:"
 msgid "categories"
 msgstr "категории"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "popup листа"
 
@@ -23335,23 +23979,23 @@ msgstr "Фокусирана колона"
 msgid "Unselected Column"
 msgstr "Неселектирана колона"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Прецртана колона"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Подвлечена колона"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Задебелена колона"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Обоена колона"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Колона со бг боја"
 
@@ -23389,7 +24033,7 @@ msgid "A_vailable Fields:"
 msgstr "Д_остапни полиња:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Растечки"
 
@@ -23402,7 +24046,7 @@ msgid "Clear _All"
 msgstr "Исчисти _сѐ"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Опаѓачки"
 
@@ -23463,16 +24107,16 @@ msgid "_Sort..."
 msgstr "_Подреди..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "DnD код"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Полно заглавие"
 
@@ -23492,7 +24136,7 @@ msgstr ""
 "За додавање колона во табелата, влечете ја во\n"
 "локацијата во која сакате да се појави."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23500,7 +24144,7 @@ msgstr[0] "%s : %s (%d предмет)"
 msgstr[1] "%s : %s (%d предмети)"
 msgstr[2] "%s : %s (%d предмети)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23508,290 +24152,439 @@ msgstr[0] "%s (%d предмет)"
 msgstr[1] "%s (%d предмети)"
 msgstr[2] "%s (%d предмети)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Боење на соседните редови со различни бои"
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Нацртана хоризонтална мрежа"
 
+#: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Вертикална нацртана мрежа"
 
+#: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Нацртај фокус"
 
+#: ../widgets/table/e-table-group-container.c:950
 #: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Режим на покажувачот"
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Модел на избирање"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Праг на должина"
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Еднозначна висина на редови"
 
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Смрзнато"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Промени го тековниот поглед"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Сортирај по _растечки редослед"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Сортирај по _опаѓачки редослед"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Поништи го подредувањето"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Групирај според ова _поле"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Групирај според _поле"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Отстрани ја оваа _колона"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Додај к_олона..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "П_оставеност"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Н_ајдобро собрано"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Форматирај ги колони_те..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "По_деси го тековниот поглед..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Подреди по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Прилагодено"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Опис на фонтот"
 
-#: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Информации за подредување"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Дрво"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Заглавие на табела"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Модел на табела"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Ред на покажувачот"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Секогаш пребарувај"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Користи кликнување за додавање"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "„ETree“ адаптер на табела"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Ретро изглед"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Цртај линии и +/- проширувачи."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Методи на внесување"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Процесор на настани"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Задебелено"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Прецртано"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Сидро"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Порамнување"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Ширина на клипот"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Висина на клипот"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Клип"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Пополни го правоаголникот на клипот"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "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 "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 "Ширина на текст"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Висина на текст"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Користи три точки"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Три точки"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Пренос на линија"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Знаци за нов ред"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Максимум линии"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Нацртај граници"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Дозволи нови линии"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Нацртај позадина"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Нацртај копче"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Позиција на покажувачот"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "Контекст на инстант пораки"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Справи се со скокачки прозорци"
 
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "Не може да се отвори овој адресар.  Тоа значи дека или внесовте погрешен "
+#~ "URI или LDAP серверот е недостапен."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Тест печатење на уредувач на стилови на контакти"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Авторски права (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr ""
+#~ "Ова треба да ја тестира графичката контрола на уредувачот за стил на "
+#~ "печатење на контактот"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Тест печатење на контакти"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Ова треба да го тестира кодот за печатење на контактот"
+
+#~ msgid "Business"
+#~ msgstr "Бизнис"
+
+#~ msgid "Competition"
+#~ msgstr "Натпревар"
+
+#~ msgid "Favourites"
+#~ msgstr "Омилени"
+
+#~ msgid "Gifts"
+#~ msgstr "Подароци"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Цели/задачи"
+
+#~ msgid "Holiday"
+#~ msgstr "Празник"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Честитки за празник"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Жешки контакти"
+
+#~ msgid "Ideas"
+#~ msgstr "Идеи"
+
+#~ msgid "International"
+#~ msgstr "Интернационално"
+
+#~ msgid "Key Customer"
+#~ msgstr "Клучен муштерија"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Разно"
+
+#~ msgid "Next 7 days"
+#~ msgstr "Следните 7 дена"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Телефонски повици"
+
+#~ msgid "Strategies"
+#~ msgstr "Стратегии"
+
+#~ msgid "Suppliers"
+#~ msgstr "Добавувачи"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Време и трошоци"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Чекам"
+
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Скорешни доку_менти"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Следните 7 дена"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Претстојни закажувања"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "До_дај правило за филтер"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Време: делумно облачно"
+
+#~ msgid "button-user"
+#~ msgstr "копче-корисник"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Ве молам, прво внесете име."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Означи го календарот офлајн"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Го означува одбраниот календар за офлајн преглед."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Одредува дали да се изврши враќање од неуспешна сесија или не."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Прескокни го дијалогот за предупредување за неуспешна сесија"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Дали да се изврши враќање од неуспешна сесија или не"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr ""
+#~ "Дали дијалогот за предупредување за враќањето од неуспешна сесија на "
+#~ "Evolution е изоставен."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Грешка во отворањето на веб страницата за ЧПП."
+
+#~ msgid "Select Importers"
+#~ msgstr "Одбери увезувачи"
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Детекција на паѓање на Evolution"
+
+#~ msgid "Ig_nore"
+#~ msgstr "Иг_норирај"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution изгледа дека излезе неочекувано последниот пат.\n"
+#~ "Како мерка за претпазливост сите површини за преглед ќе бидат скриени.\n"
+#~ "Можете да ги вратите преку менито „Поглед“.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Не ја прикажувај повторно оваа порака"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "Ос_вежи..."
diff --git a/po/nb.po b/po/nb.po
index 8149632038..bf41162c4a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,16 +1,16 @@
 # Norwegian translation of evolution (bokmål dialect).
 # Copyright (C) 1998-2004, 2005 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2008.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2009.
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:596
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.23.x\n"
+"Project-Id-Version: evolution 2.25.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 06:40+0100\n"
-"PO-Revision-Date: 2009-01-05 07:11+0100\n"
+"POT-Creation-Date: 2009-01-29 19:12+0100\n"
+"PO-Revision-Date: 2009-01-29 19:20+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "evolution address book"
 msgstr "evolution adressebok"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Ny kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
@@ -151,7 +151,7 @@ msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,8 +162,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1579
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -171,9 +171,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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -181,10 +181,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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -194,8 +194,8 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1595
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -413,7 +413,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -563,17 +563,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1321
-#: ../addressbook/conduit/address-conduit.c:1322
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "Kunne ikke laste adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1399
-#: ../addressbook/conduit/address-conduit.c:1402
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -594,10 +594,12 @@ msgstr "Sertifikater"
 msgid "Configure autocomplete here"
 msgstr "Konfigurer automatisk fullføring her"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1215
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -635,75 +637,96 @@ msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "På denne datamaskinen"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personlig"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
@@ -722,18 +745,18 @@ msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 
 #: ../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: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:90
-#: ../plugins/itip-formatter/itip-formatter.c:2466
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressebok"
@@ -827,60 +850,60 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappen «%s» til:"
 
-#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Gi nytt navn på mappe"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-view.c:952
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:953
-#: ../calendar/gui/calendar-component.c:660
-#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
 #: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../addressbook/gui/component/addressbook-view.c:956
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:663
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:681
 #: ../calendar/gui/e-calendar-table.c:1611
-#: ../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:1340
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
 #: ../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 "_Slett"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2087
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
-#: ../composer/e-msg-composer.c:1042 ../mail/em-folder-tree.c:2138
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "Egenska_per..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1225
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
@@ -901,7 +924,7 @@ msgstr "Oppgi passord for %s (bruker %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:442
+#: ../plugins/google-account-setup/google-source.c:423
 #: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -951,7 +974,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
 #: ../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:80
 msgid "Vertical pane position"
 msgstr "Posisjon til vertikalt felt"
 
@@ -1276,8 +1299,8 @@ msgstr "kort"
 #: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:672
-#: ../plugins/google-account-setup/google-contacts-source.c:338
+#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-contacts-source.c:366
 msgid "minutes"
 msgstr "minutter"
 
@@ -1319,7 +1342,7 @@ msgstr "<b>Arbeid</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1348,12 +1371,12 @@ msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2475
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Bilde"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1366,7 +1389,7 @@ msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
 #: ../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"
 
@@ -1384,10 +1407,10 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbeid"
@@ -1412,7 +1435,7 @@ msgstr "_Fødselsdag:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../calendar/gui/dialogs/event-page.c:794
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1500,15 +1523,15 @@ msgstr "_Hvor:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:94
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:93
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:101
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:100
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:93
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
@@ -1523,975 +1546,975 @@ msgstr "Adresse"
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "United States"
 msgstr "De forente stater"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Algeria"
 msgstr "Algerie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belarus"
 msgstr "Hviterussland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havområde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chad"
 msgstr "Tsjad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "China"
 msgstr "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Comoros"
 msgstr "Komorene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cook Islands"
 msgstr "Cookøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Falkland Islands"
 msgstr "Falklandsøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "France"
 msgstr "Frankrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Greenland"
 msgstr "Grønland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guadeloupe"
 msgstr "Guadelope"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Heard And McDonald Islands"
 msgstr "Heard og McDonald-øyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Sør-Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Libya"
 msgstr "Libya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Maldives"
 msgstr "Maldivene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Netherlands Antilles"
 msgstr "De nederlandske antillene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Norway"
 msgstr "Norge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Palestinian Territory"
 msgstr "Palestinsk område"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Romania"
 msgstr "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent og Grenadinene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Serbia And Montenegro"
 msgstr "Serbia og Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Seychelles"
 msgstr "Seychellene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sør-Georgia og de sørlige Sandwichøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Spain"
 msgstr "Spania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Syria"
 msgstr "Syria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende øyer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyene, Britisk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene, USA"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-øyene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:87
 #: ../mail/em-mailer-prefs.c:469
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
@@ -2503,41 +2526,41 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:61
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Tjeneste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
@@ -2545,41 +2568,41 @@ msgstr "Tjeneste"
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hjemme"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:529
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Andre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2649,23 +2672,23 @@ msgstr "%s«%s» er tom"
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -2818,6 +2841,9 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Velg..."
 
@@ -2845,7 +2871,7 @@ msgstr "_Medlemmer"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2903,23 +2929,23 @@ msgstr "Flett 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:593
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-#: ../addressbook/gui/widgets/eab-contact-display.c:601
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
 #: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../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 "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
@@ -2940,7 +2966,7 @@ msgstr[1] "%d kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2963,114 +2989,114 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Kilde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:525
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2090
 #: ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1746 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Send _melding til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Send _melding til kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Kopier til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Flytt til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:487
 #: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1753 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2053 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2104
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1327 ../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 "_Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../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 "Enhver kategori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
+#: ../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 "Ingen treff"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3100,7 +3126,7 @@ msgstr "Biltelefon"
 
 #: ../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
@@ -3108,7 +3134,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Firma"
 
@@ -3157,22 +3183,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Kommentar"
 
@@ -3201,14 +3227,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -3377,61 +3403,61 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2792
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2757
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:371
-#: ../addressbook/gui/widgets/eab-contact-display.c:373
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:307
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
-#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:488
-#: ../addressbook/gui/widgets/eab-contact-display.c:848
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../calendar/gui/calendar-commands.c:94
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2499
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3443,48 +3469,48 @@ msgstr "Videosamtale"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
-#: ../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 "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
-#: ../calendar/gui/e-calendar-view.c:2507
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
-#: ../calendar/gui/e-calendar-view.c:2508
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:902
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:910
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Weblogg"
 
@@ -3540,11 +3566,11 @@ msgstr "Protokollen er ikke støttet"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:241
-#: ../calendar/gui/e-calendar-table.c:655 ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:655 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -3555,12 +3581,13 @@ msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
@@ -4048,28 +4075,6 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Test av redigering av utskriftsstil for kontakter"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Opphavsrett © 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr ""
-"Testprogram for komponent for redigering av stil ved utskrift av kontakt"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Test på utskrift av kontakt"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Testfunksjon for utskrift av kontakter"
-
 #: ../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
@@ -4611,13 +4616,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendere"
 
@@ -4658,19 +4663,18 @@ msgid "Memo_s"
 msgstr "_Notater"
 
 #: ../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:1810 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notater"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:716 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1678 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/e-calendar-table.c:716 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4685,8 +4689,9 @@ msgstr "Oppgaver"
 msgid "_Calendars"
 msgstr "_Kalendere"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
@@ -4707,8 +4712,8 @@ msgstr[1] "minutter"
 #: ../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:673
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
@@ -4725,10 +4730,10 @@ msgstr "Avtaler"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
 #: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "Location:"
 msgstr "Plassering:"
 
@@ -4741,7 +4746,7 @@ msgid "_Dismiss"
 msgstr "_Se bort fra"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4761,32 +4766,32 @@ msgstr "Ut_sett"
 msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4798,7 +4803,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4815,7 +4820,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -4984,50 +4989,64 @@ msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../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 "Farge på Marcus Bains-linje - Dagsvisning"
 
-#: ../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 "Farge på Marcus Bains-linje - tidslinje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minutt arbeidsdagen slutter på fra 0 til 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 "Minutt arbeidsdagen starter på fra 0 til 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 "Plassering på horisontal månedsvisningsfelt"
 
-#: ../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 "Plassering av vertikalt felt for månedsvisning"
 
-#: ../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 "Antall enheter for å bestemme en forvalgt påminnelse."
 
-#: ../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 "Antall enheter for å bestemme når oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../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."
@@ -5035,7 +5054,7 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom månedsvisning, i piksler."
 
-#: ../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."
@@ -5043,13 +5062,13 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../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."
 msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
 
-#: ../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."
@@ -5057,7 +5076,7 @@ msgstr ""
 "Plassering av vertikalt felt mellom oppgavelisten og forhåndsvisningsfeltet "
 "for oppgaver, i piksler."
 
-#: ../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."
@@ -5065,7 +5084,7 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../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."
@@ -5073,69 +5092,83 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten utenom månedsvisning, i piksler."
 
-#: ../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 "Programmer som er tillat å kjøres av alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Katalog for lagring av alarmlyd"
 
-#: ../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 "Vis RSVP-feltet i redigering av hendelser/oppgaver/møter"
 
-#: ../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 "Vis rollefelt i redigering av hendelse/oppgave/møte"
 
-#: ../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 "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../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 "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
 
-#: ../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 "Vis alarmer i varslingsområdet på panelet"
 
-#: ../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 "Vis statusfelt ved redigering av hendelse/oppgave/møte"
 
-#: ../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 "Vis forhåndsvisningsvinduet"
 
-#: ../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 "Vis forhåndsvisningsvinduet."
 
-#: ../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 "Vis tidssonefelt ved redigering av hendelse/møte"
 
-#: ../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 "Vis typefelt ved redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Vis ukenummer i dag- og arbeidsukevisning"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Posisjon for vertikalt oppgavefelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5144,7 +5177,7 @@ msgstr ""
 "URL-mal som brukes som reserveløsning for ledig/opptatt, %u er erstattet med "
 "brukerdelen av e-postadressen og %d er erstattet med domenet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5152,26 +5185,32 @@ msgstr ""
 "Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olsen tidssonedatabaselokasjon som «America/New York»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
-msgstr "Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for feilsøkingsmeldinger."
+msgstr ""
+"Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
+"feilsøkingsmeldinger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for forrige alarm, som time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:111
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5179,45 +5218,45 @@ msgstr ""
 "Gjennomsiktighet for hendelser i kalendervisningen (En verdi mellom 0 "
 "(gjennomsiktig) og 1 (ugjennomsiktig)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller "
 "«days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dag uken starter på. Fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om varslingsfeltet skal brukes for alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved sletting av en avtale eller "
 "oppgave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5225,83 +5264,88 @@ msgstr ""
 "Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
 "til en ukedag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linjen (linjen på nåværende tid) skal vises i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om en forvalgt påminnelse skal bli satt for avtaler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Om kategorifeltet skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Om felt for tidssone skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Om ukenummer skal vises i minikalenderen"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Om «daylight savings time» skal brukes ved visning av hendelser."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Hvilken time arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Hvilket minutt arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Hvilken time arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
@@ -5353,13 +5397,13 @@ msgstr "Aktive avtaler"
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../calendar/gui/calendar-commands.c:94 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:319
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5368,128 +5412,137 @@ msgstr ""
 "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
 "Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
 
-#: ../calendar/gui/calendar-commands.c:325
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/caldav/caldav-source.c:434
 #: ../plugins/calendar-http/calendar-http.c:283
 #: ../plugins/calendar-weather/calendar-weather.c:528
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../plugins/google-account-setup/google-contacts-source.c:340
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-contacts-source.c:368
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dager"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../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
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "På nettet"
 
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
 #: ../plugins/calendar-weather/calendar-weather.c:128
 msgid "Weather"
 msgstr "Vær"
 
-#: ../calendar/gui/calendar-component.c:658
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
 #: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
 msgid "_Make available for offline use"
 msgstr "_Gjør tilgjengelig for bruk i frakoblet modus"
 
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "_Ikke gjør denne tilgjengelig i frakoblet modus"
 
-#: ../calendar/gui/calendar-component.c:995
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Feil under oppgradering av kalendere."
 
-#: ../calendar/gui/calendar-component.c:1176
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/calendar-component.c:1192
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: ../calendar/gui/calendar-component.c:1305
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: ../calendar/gui/calendar-component.c:1521
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1522
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../calendar/gui/calendar-component.c:1523
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1529
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1530
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../calendar/gui/calendar-component.c:1531
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../calendar/gui/calendar-component.c:1537
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1538
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../calendar/gui/calendar-component.c:1539
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1547
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -5535,8 +5588,8 @@ msgstr "Kategori"
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:559
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:559
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -5569,20 +5622,20 @@ msgstr "Eksisterer"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:558
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:558
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
 #: ../calendar/gui/e-calendar-table.c:557 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -5611,12 +5664,12 @@ msgid "does not contain"
 msgstr "inneholder ikke"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "er"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "er ikke"
 
@@ -5632,7 +5685,7 @@ msgstr "Metoden er ikke støttet under åpning av kalender"
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -5756,25 +5809,52 @@ msgid "A_dd"
 msgstr "Le_gg til"
 
 #: ../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 "Varsel"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../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:1155 ../filter/filter-rule.c:947
+#: ../mail/em-account-editor.c:686 ../mail/em-account-editor.c:1410
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:335
+#: ../plugins/calendar-weather/calendar-weather.c:389
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ingen"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(Vises i dagvisning)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5788,59 +5868,59 @@ msgstr ""
 "10 minutter\n"
 "5 minutter"
 
-#: ../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 og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</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\">Varsel</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\">Forvalgt ledig/opptatt-tjener</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\">Generelt</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\">Oppgaveliste</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\">Tid</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\">Arbeidsuke</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 "Juster for «daylight sa_vings time»"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Vis"
 
-#: ../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:735
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5850,13 +5930,13 @@ msgstr ""
 "Timer\n"
 "Dager"
 
-#: ../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:731
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5874,151 +5954,167 @@ msgstr ""
 "Lørdag\n"
 "Søndag"
 
-#: ../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 "Velg en farge"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "S_ø."
 
-#: ../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:736
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "Sekundær sone:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Velg kalendere for varsling"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "Vis en _påminnelse"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Vis uken_ummer i dag- og arbeidsukevisning"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Ti."
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_On."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr "før hvert jubileum/bursdag"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "før hver avtale"
 
@@ -6070,48 +6166,48 @@ msgstr "Egenskaper for notatliste"
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Dette notatet er slettet."
 
-#: ../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  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: ../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  Du har ikke gjort endringer. Lukk redigering?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Dette notatet er endret."
 
-#: ../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  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: ../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  Du har ikke gjort endringer. Oppdater redigering?"
@@ -6121,299 +6217,299 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %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:2365
 msgid " to "
 msgstr " til "
 
-#: ../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:2369
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../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:2371
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../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:2376
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../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:2378
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:243
-#: ../calendar/gui/dialogs/comp-editor.c:416 ../composer/e-msg-composer.c:1767
-#: ../composer/e-msg-composer.c:1986
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2105
+#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:489 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:3302 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:848
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1425
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "klikk her for å legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1461
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1478
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1486
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1494
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1502
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1818
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1837
+#: ../calendar/gui/dialogs/comp-editor.c:1847
 #: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1932
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> vedlegg"
 msgstr[1] "<b>%d</b> vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1964
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1967
-#: ../calendar/gui/dialogs/comp-editor.c:2275
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1200 ../composer/e-msg-composer.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1879
+#: ../calendar/gui/dialogs/task-page.c:1203 ../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 "Fje_rn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2089
-#: ../composer/e-msg-composer.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-#: ../mail/em-format-html-display.c:2380
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2381
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2298
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2442
-#: ../calendar/gui/dialogs/comp-editor.c:2489
-#: ../calendar/gui/dialogs/comp-editor.c:3335
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3364
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -6433,51 +6529,51 @@ msgstr "Destinasjonen er skrivebeskyttet"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppføringen fra andre mottakere's postbokser?"
 
-#: ../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 "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: ../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 "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: ../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 "Notatet kunne ikke slettes pga en CORBA-feil"
 
-#: ../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 "Oppføringen kunne ikke slettes pga en CORBA-feil"
 
-#: ../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 "Hendelsen kunne ikke slettes fordi tilgang ble nektet"
 
-#: ../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 "Oppgaven kunne ikke slettes fordi tilgang nektes"
 
-#: ../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 "Notatet kunne ikke slettes fordi tilgang ble nektet"
 
-#: ../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 "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: ../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 "Hendelsen kunne ikke slettes pga en feil"
 
-#: ../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 "Oppgaven kunne ikke slettes pga en feil"
 
-#: ../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 "Notatet kunne ikke slettes pga en feil"
 
-#: ../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 "Oppføringen kunne ikke slettes pga en feil"
 
@@ -6494,64 +6590,64 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "V_arsel"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Gjør denne hendelsen til repeterende"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../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 "Alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Slår av/på visning av tid som opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
 #: ../calendar/gui/dialogs/event-page.c:738
-#: ../calendar/gui/dialogs/event-page.c:2726
+#: ../calendar/gui/dialogs/event-page.c:2727
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
@@ -6613,66 +6709,48 @@ msgstr "En organisator kreves."
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1879
-#: ../calendar/gui/dialogs/task-page.c:1201
+#: ../calendar/gui/dialogs/event-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1204
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2602
+#: ../calendar/gui/dialogs/event-page.c:2603
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2646
+#: ../calendar/gui/dialogs/event-page.c:2647
 #: ../calendar/gui/dialogs/memo-page.c:898
-#: ../calendar/gui/dialogs/task-page.c:1805
+#: ../calendar/gui/dialogs/task-page.c:1808
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2932
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2938
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2951
+#: ../calendar/gui/dialogs/event-page.c:2952
 msgid "Customize"
 msgstr "Tilpass"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2956
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1155 ../filter/filter-rule.c:947
-#: ../mail/em-account-editor.c:686 ../mail/em-account-editor.c:1410
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:335
-#: ../plugins/calendar-weather/calendar-weather.c:389
-#: ../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:307 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Ingen"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dag før avtalen"
@@ -6748,7 +6826,7 @@ msgstr "Ko_ntakter..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Notat"
 
@@ -6779,39 +6857,39 @@ msgstr "T_il:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrer en repeterende hendelse. Hva ønsker du å endre?"
 
-#: ../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 "Du delegerer en repeterende hendelse. Hva ønsker du å delegere?"
 
-#: ../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 "Du endrer en repeterende oppgave. Hva ønsker du å endre?"
 
-#: ../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 "Du endrer et repeterende notat. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Alle instanser"
 
@@ -6824,9 +6902,13 @@ msgstr ""
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "på"
 
@@ -6834,7 +6916,7 @@ msgstr "på"
 #. * (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 "første"
 
@@ -6843,7 +6925,7 @@ msgstr "første"
 #. * (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 "sekund"
 
@@ -6851,7 +6933,7 @@ msgstr "sekund"
 #. * (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 "tredje"
 
@@ -6859,7 +6941,7 @@ msgstr "tredje"
 #. * (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 "fjerde"
 
@@ -6867,13 +6949,13 @@ msgstr "fjerde"
 #. * (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 "siste"
 
 #. 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 "Annen dato"
 
@@ -6881,7 +6963,7 @@ msgstr "Annen dato"
 #. * 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 "Første til tiende"
 
@@ -6889,7 +6971,7 @@ msgstr "Første til tiende"
 #. * 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 "ellevte til tjuende"
 
@@ -6897,45 +6979,45 @@ msgstr "ellevte til tjuende"
 #. * 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 "tjueførste til trettiførste"
 
 #. 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 "dag"
 
 #. 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 "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6986,6 +7068,10 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:379
 #: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
@@ -7006,54 +7092,54 @@ msgstr "<span weight=\"bold\">Status</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:239
 #: ../calendar/gui/e-calendar-table.c:654 ../calendar/gui/e-itip-control.c:943
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Fullført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:266
 #: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Høy"
 
 #: ../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:237
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2551
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:270
 #: ../calendar/gui/e-calendar-table.c:581 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Lav"
 
 #: ../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:580
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:580
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/print.c:2555
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ikke startet"
@@ -7114,7 +7200,7 @@ msgstr "Organi_sator:"
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1762
+#: ../calendar/gui/dialogs/task-page.c:1765
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -7211,56 +7297,56 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3308
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:860
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:860
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../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 "Startdato:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
 #: ../calendar/gui/e-itip-control.c:1215
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../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 "Nettside:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-cal-component-preview.c:204
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1183
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Prioritet:"
 
@@ -7280,7 +7366,7 @@ msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:632
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -7294,47 +7380,47 @@ 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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1200 ../calendar/gui/e-itip-control.c:1340
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../calendar/gui/e-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/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:58
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../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 "Lagre som..."
 
@@ -7342,19 +7428,19 @@ msgstr "Lagre som..."
 msgid "Select folder to save selected attachments..."
 msgstr "Velg mappe å lagre valgte vedlegg i..."
 
-#: ../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 "bilde_uten_navn.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: ../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 "Sett som _bakgrunn"
 
@@ -7362,7 +7448,7 @@ msgstr "Sett som _bakgrunn"
 msgid "_Save Selected"
 msgstr "_Lagre utvalg"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -7373,7 +7459,7 @@ msgstr "* Ingen sammendrag *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2368
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -7381,7 +7467,7 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:378
-#: ../calendar/gui/e-calendar-view.c:2372
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
@@ -7439,45 +7525,45 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:891
-#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:820
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Lagre som..."
 
 #: ../calendar/gui/e-calendar-table.c:1586
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
 #: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-calendar-view.c:1732 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "Sk_riv ut..."
 
 #: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1752 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
 #: ../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 "Kli_pp ut"
 
 #: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1735
-#: ../calendar/gui/e-calendar-view.c:1754 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
 #: ../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"
@@ -7487,7 +7573,7 @@ msgstr "_Lim inn"
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: ../calendar/gui/e-calendar-table.c:1603 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1603 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
@@ -7547,153 +7633,150 @@ msgstr "Startdato"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2276
-#: ../calendar/gui/e-meeting-list-view.c:562
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1726
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1739
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: ../calendar/gui/e-calendar-view.c:1741
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Velg i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1742
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
-#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "S_kriv ut..."
 
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1760
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1763
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1764 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1770 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:2223
+#: ../calendar/gui/e-calendar-view.c:2254
 #: ../calendar/gui/e-itip-control.c:1188
-#: ../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:2126
+#: ../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:2192
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2255
 #: ../calendar/gui/e-itip-control.c:1196
-#: ../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:2132
+#: ../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:2198
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:2225
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:2226
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:2227
+#: ../calendar/gui/e-calendar-view.c:2258
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2388 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Plassering: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2422
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %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 %H.%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"
@@ -7706,34 +7789,44 @@ 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 minutters oppdeling"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Vis den andre tidssonen"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1562
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "Uke %d"
+
 #: ../calendar/gui/e-itip-control.c:762
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
@@ -7826,12 +7919,12 @@ msgstr "iCalendar-feil"
 
 #: ../calendar/gui/e-itip-control.c:1089 ../calendar/gui/e-itip-control.c:1105
 #: ../calendar/gui/e-itip-control.c:1116 ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "En ukjent person"
 
@@ -7844,8 +7937,8 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: ../calendar/gui/e-itip-control.c:1192 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
@@ -8062,7 +8155,7 @@ msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
 #: ../calendar/gui/e-itip-control.c:2077
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
@@ -8081,7 +8174,7 @@ msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2282
-#: ../calendar/gui/e-meeting-list-view.c:550
+#: ../calendar/gui/e-meeting-list-view.c:549
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -8116,8 +8209,7 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2467 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2467 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -8145,93 +8237,93 @@ msgstr "Laster kalender..."
 msgid "Server Message:"
 msgstr "Tjenermelding:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../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 "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c: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 "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c: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 "Ressurs"
 
-#: ../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 "Rom"
 
-#: ../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 "Styremedlem"
 
-#: ../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 "Obligatorisk deltaker"
 
-#: ../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 "Valgfri deltaker"
 
-#: ../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 "Ikke-deltaker"
 
-#: ../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 "Trenger handling"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:506
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#: ../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 "Under arbeid"
 
 #. 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"
 
@@ -8240,7 +8332,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"
 
@@ -8250,67 +8342,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 "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Del_takere..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../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 "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -8338,11 +8430,11 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "Sle_tt valgte notater"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
@@ -8355,16 +8447,16 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Åpner notat på %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
@@ -8372,63 +8464,63 @@ msgstr "Sletter valgte objekter..."
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
 #. 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:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2624
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "_Egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2625
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Lagre egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2630
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Definer visninger..."
 
-#: ../calendar/gui/gnome-cal.c:2872
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2887
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: ../calendar/gui/gnome-cal.c:2896
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Laster notat på %s"
 
-#: ../calendar/gui/gnome-cal.c:3001
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../calendar/gui/gnome-cal.c:3969
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Sletter"
 
@@ -8488,135 +8580,194 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Godtatt"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Akseptert tentativt"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Avslått"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegert"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/memos-component.c:499
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:582
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: ../calendar/gui/memos-component.c:631
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Feil under oppgradering av notater."
 
-#: ../calendar/gui/memos-component.c:873
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne notatliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/memos-component.c:886
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Ingen kalender tilgjengelig for opppretting av notater"
 
-#: ../calendar/gui/memos-component.c:996
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Valgt av notatkilde"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../calendar/gui/memos-component.c:1177
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Delt notat"
 
-#: ../calendar/gui/memos-component.c:1185
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1192
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Notatli_ste"
 
-#: ../calendar/gui/memos-component.c:1193
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../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 "Skriv ut notater"
 
@@ -8669,273 +8820,273 @@ msgstr "Kan ikke migrere oppgaver «%s»"
 msgid "Notes"
 msgstr "Notater"
 
-#: ../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 "Sø."
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Lø."
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasks-component.c:490
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:573
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../calendar/gui/tasks-component.c:622
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: ../calendar/gui/tasks-component.c:861
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/tasks-component.c:874
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: ../calendar/gui/tasks-component.c:985
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1239
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1240
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/tasks-component.c:1241
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1247
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1248
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1255
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1256
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../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"
@@ -8947,11 +9098,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: ../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 "Skriv ut oppgaver"
 
@@ -8968,11 +9119,11 @@ msgstr "Avbrutt"
 msgid "In progress"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "er større enn"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "er mindre enn"
 
@@ -8982,7 +9133,7 @@ msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Åpner kalender"
 
@@ -10596,7 +10747,7 @@ msgstr "L_ukk"
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
 #: ../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
@@ -10829,18 +10980,18 @@ msgstr "Velg mapper meldingen skal postes til."
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1554
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../composer/e-msg-composer.c:868
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:875
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10848,23 +10999,23 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1496 ../mail/em-format-html-display.c:1949
-#: ../mail/em-format-html-display.c:2596 ../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:2597 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../composer/e-msg-composer.c:1552
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:2801
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4102
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11062,7 +11213,7 @@ msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. 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 "Intern feil, ukjent feil «%s» forespurt"
@@ -11132,7 +11283,7 @@ msgstr "Feilsøk"
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:968
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
@@ -11184,7 +11335,11 @@ msgstr "Overskriv fil?"
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:119
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Kunne ikke åpne lenken."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -11534,8 +11689,8 @@ msgstr "tiden du spesifiserer"
 #: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:435
 #: ../plugins/calendar-http/calendar-http.c:284
 #: ../plugins/calendar-weather/calendar-weather.c:529
-#: ../plugins/google-account-setup/google-source.c:675
-#: ../plugins/google-account-setup/google-contacts-source.c:341
+#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-contacts-source.c:369
 msgid "weeks"
 msgstr "uker"
 
@@ -11543,15 +11698,15 @@ msgstr "uker"
 msgid "years"
 msgstr "år"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Regelnavn"
 
@@ -11605,7 +11760,7 @@ msgstr "Brukervalg-kontroll for Evolution e-post"
 msgid "Evolution Network configuration control"
 msgstr "Konfigurasjonskontroll for nettverk i Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
 #: ../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
@@ -11628,6 +11783,7 @@ msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "_E-post"
 
@@ -11649,13 +11805,13 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:467 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:467 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Velg mappe"
 
 #: ../mail/em-account-editor.c:591 ../mail/em-account-editor.c:636
-#: ../mail/em-account-editor.c:703 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:703 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -11744,14 +11900,23 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11759,7 +11924,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
@@ -11860,169 +12025,177 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Videresend til"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Viktig"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "er etter"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "er før"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "er merket"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "er ikke satt"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Uønsket e-posttest"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etikett"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Treff på alle"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Ikke uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Meldingslokasjon"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Send til program"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:65
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:64
 msgid "Read"
 msgstr "Les"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Svart til"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "returnerer"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Avsender"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "Sender eller mottakere"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Sett etikett"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Sett status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "lyder som"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "starter med"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:314
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:313
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Nullstill status"
 
@@ -12262,13 +12435,14 @@ msgstr "Søkemappe for _uleste meldinger"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%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:1188
+#: ../mail/em-folder-view.c:1203
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -12290,173 +12464,173 @@ msgstr "Opprett mappe"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Videresend"
 
 #. 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:1337 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1343
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1344
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1345
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as Un_important"
 msgstr "Merk som uv_iktig"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "_Label"
 msgstr "_Etikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1360
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1364
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1368
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
 #. 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:1370
 msgid "Search Folder based on _Subject"
 msgstr "Søkemappe ba_sert på emne"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Se_nder"
 msgstr "Søkemappe basert på se_nder"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1372
 msgid "Search Folder based on _Recipients"
 msgstr "Søkemappe basert på mottake_re"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Search Folder based on Mailing _List"
 msgstr "Søkemappe basert på e-post_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Sub_ject"
 msgstr "Filter basert på em_ne"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Sen_der"
 msgstr "Filter basert på sen_der"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1380
 msgid "Filter based on Re_cipients"
 msgstr "Filter basert på motta_kere"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1381
 msgid "Filter based on _Mailing List"
 msgstr "Filter basert på e-_postliste"
 
 #. 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
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:530
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:511
+#: ../plugins/google-account-setup/google-source.c:709
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2518
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2537
 msgid "Retrieving Message..."
 msgstr "Henter melding..."
 
-#: ../mail/em-folder-view.c:2791
+#: ../mail/em-folder-view.c:2756
 msgid "C_all To..."
 msgstr "R_ing til..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2759
 msgid "Create _Search Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2760
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2796
+#: ../mail/em-folder-view.c:2761
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:3289
+#: ../mail/em-folder-view.c:3254
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../mail/em-folder-view.c:3301
+#: ../mail/em-folder-view.c:3266
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../mail/em-folder-view.c:3306
+#: ../mail/em-folder-view.c:3271
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
@@ -12650,7 +12824,7 @@ msgid_plural "%d at_tachments"
 msgstr[0] "%d vedle_gg"
 msgstr[1] "%d vedle_gg"
 
-#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2387
 msgid "S_ave"
 msgstr "L_agre"
 
@@ -12658,23 +12832,23 @@ msgstr "L_agre"
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../mail/em-format-html-display.c:2382
+#: ../mail/em-format-html-display.c:2383
 msgid "No Attachment"
 msgstr "Ingen vedlegg"
 
-#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
+#: ../mail/em-format-html-display.c:2530 ../mail/em-format-html-display.c:2569
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:2531
+#: ../mail/em-format-html-display.c:2532
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:2588
+#: ../mail/em-format-html-display.c:2589
 msgid "O_pen With"
 msgstr "Å_pne med"
 
-#: ../mail/em-format-html-display.c:2664
+#: ../mail/em-format-html-display.c:2665
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12771,7 +12945,7 @@ msgstr "Denne meldingen ble sendt av <b>%s</b> på vegne av <b>%s</b>"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:310
+#: ../mail/message-tag-followup.c:309
 msgid "From"
 msgstr "Fra"
 
@@ -12983,17 +13157,17 @@ msgstr ""
 "Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
 "config.xmldb» er korrupt eller ser ikke ut til å eksistere."
 
-#: ../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 "Sva_r til avsender"
 
-#: ../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 "Svar til _listen"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "Legg til i _adressebok"
 
@@ -13518,7 +13692,7 @@ msgstr "Forvalgt bredde på meldingsvinduet"
 
 #: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Stil på e-postvisning («normal», «fulle overskrifter», «kilde»)"
+msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
@@ -13942,10 +14116,12 @@ msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
@@ -13961,7 +14137,10 @@ msgstr "Importer mapper i Berkeley Mailbox format"
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:514
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
@@ -13983,27 +14162,27 @@ msgstr "Import fra Pine for Evolutions"
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %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 "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -14670,9 +14849,9 @@ msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
 #: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:389
-#: ../plugins/google-account-setup/google-source.c:635
-#: ../plugins/google-account-setup/google-contacts-source.c:288
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:616
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
@@ -14855,7 +15034,7 @@ msgstr "F_inn:"
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:278
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -14907,7 +15086,7 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -15122,26 +15301,26 @@ msgstr "Venter..."
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
@@ -15860,7 +16039,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
@@ -15931,39 +16110,39 @@ msgstr "Størrelse"
 msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:61 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/message-tag-followup.c:63
+#: ../mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:66 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:67 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:66 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/message-tag-followup.c:68
+#: ../mail/message-tag-followup.c:67
 msgid "Review"
 msgstr "Gjennomgå"
 
@@ -16064,27 +16243,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Innebygd programtilleg for lyd"
 
-#: ../plugins/backup-restore/backup-restore.c:129
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:158
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:181
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopi for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:205
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:280
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -16094,117 +16273,117 @@ msgstr ""
 "kalendere, oppgaver, notater og adressebøker kan gjenopprettes.\n"
 "Du kan også gjenopprette alle dine personlige innstillinger, filtre etc."
 
-#: ../plugins/backup-restore/backup-restore.c:286
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:293
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:296
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Sjekk sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Sikkerhetskopiering fullført"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Fjerner midlertidige sikkerhetskopier"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -16331,27 +16510,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting på underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -16390,8 +16569,8 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:374
-#: ../plugins/google-account-setup/google-source.c:628
-#: ../plugins/google-account-setup/google-contacts-source.c:311
+#: ../plugins/google-account-setup/google-source.c:609
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
@@ -16399,8 +16578,8 @@ msgstr "Bruk _SSL"
 #: ../plugins/caldav/caldav-source.c:417
 #: ../plugins/calendar-http/calendar-http.c:266
 #: ../plugins/calendar-weather/calendar-weather.c:511
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:633
+#: ../plugins/google-account-setup/google-contacts-source.c:358
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16531,7 +16710,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:592
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16613,6 +16792,12 @@ msgstr ""
 "og verdi er: Navn på egendefinert meldingshode fulgt av «=» og verdiene "
 "adskilt med «;»"
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Åpne annen brukers mappe"
@@ -17348,7 +17533,7 @@ msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -17468,7 +17653,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:541
+#: ../plugins/google-account-setup/google-source.c:522
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -17604,11 +17789,11 @@ msgstr "Skriv i _eksternt redigeringsprogram"
 msgid "Compose messages using an external editor"
 msgstr "Skriv meldinger i et eksternt redigeringsprogram"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando som skal kjøres for å starte redigering: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17645,7 +17830,8 @@ msgstr "Fjerner abonnement på mappe «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "Lar deg fjerne abonnement på e-postmapper i kontekstmenyen for sidelinjen."
+msgstr ""
+"Lar deg fjerne abonnement på e-postmapper i kontekstmenyen for sidelinjen."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17655,20 +17841,12 @@ msgstr "Fjern abonnement på mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../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:441
+#: ../plugins/google-account-setup/google-source.c:422
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for å aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:541
+#: ../plugins/google-account-setup/google-source.c:522
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17677,16 +17855,21 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:703
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:738
+#: ../plugins/google-account-setup/google-source.c:719
 msgid "Retrieve _list"
 msgstr "Hent _liste"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
 msgid "<b>Server</b>"
 msgstr "<b>Tjener</b> "
 
@@ -17969,7 +18152,8 @@ msgstr "_Skriv"
 msgid "permission to read|_Read"
 msgstr "_Les"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -17977,7 +18161,8 @@ msgstr "Proxy"
 msgid "<b>Account Name</b>"
 msgstr "<b>Kontonavn</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Proxy-innlogging"
 
@@ -18247,117 +18432,117 @@ msgstr "Kunne ikke åpne kalender «%s»"
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender «%s» er i konflikt med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:748
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette møtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:827
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1054
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1066
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1075
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1080
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1174
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1181
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1318
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1322
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1354
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18365,15 +18550,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1490
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-#: ../plugins/itip-formatter/itip-formatter.c:1600
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-#: ../plugins/itip-formatter/itip-formatter.c:1601
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18381,11 +18566,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1530
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1531
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18393,228 +18578,228 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2240
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2243
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2246
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2492
-#: ../plugins/itip-formatter/itip-formatter.c:2524
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2507
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "I morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Vennligst svar på vegne av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Mottatt på vegne av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> har via %s publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegert følgende møte til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> forespør via %s din tilstedeværelse i et møte."
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> forespør din tilstedeværelse i følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18622,89 +18807,89 @@ msgid ""
 msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> har via %s avlyst følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avlyst følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> har foreslått følgende endringer i møte via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har foreslått følgende endringer i møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> har via %s avslått følgende endringer for møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslått følgende endringer for møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> har via %s publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> forespør at %s tildeles følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> har via %s tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> forespør via %s å legge til informasjon i eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18713,7 +18898,7 @@ msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
 "oppgave via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18722,170 +18907,179 @@ msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
 "oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> har via %s avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> har via %s publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> har via %s avlyst følgende delt notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har avlyst følgende delt notat:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "Av_slå"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "Av_slå"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "Godt_a"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "Godta _alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Oppdater"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Start-tid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Påminnelse om vedlegg"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Oppgaver :"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Notater :"
 
@@ -19222,7 +19416,8 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"Handlingen kunne ikke utføres. Meldingshodet for denne handlingen ikke inneholdt en handling som kunne prosesseres.\n"
+"Handlingen kunne ikke utføres. Meldingshodet for denne handlingen ikke "
+"inneholdt en handling som kunne prosesseres.\n"
 "\n"
 "Hode: {0}"
 
@@ -19403,19 +19598,19 @@ msgstr "Tekstmodus"
 msgid "Prefer plain-text"
 msgstr "Foretrekk vanlig tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Foretrekk vanlig tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Vis kun vanlig tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -19427,6 +19622,37 @@ msgstr "Evolution profilering"
 msgid "Writes a log of profiling data events."
 msgstr "Skriver en logg med profildatahendelser."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importer Outlook-meldinger fra PST-fil"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Outlook PST-import"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook personlige mapper (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+msgid "_Address Book"
+msgstr "_Adressebok"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+msgid "A_ppointments"
+msgstr "A_vtaler"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+msgid "_Journal entries"
+msgstr "_Journaloppføringer"
+
+#: ../plugins/pst-import/pst-importer.c:352
+msgid "Importing Outlook data"
+msgstr "Importerer data fra Outlook"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Publiser kalendere på nettet"
@@ -19899,17 +20125,16 @@ msgstr "Et tillegg for å sette opp WebDAV-kontakter."
 msgid "WebDAV contacts"
 msgstr "WebDAV-kontakter"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves med Apache < 2.2.8)"
 
@@ -20047,7 +20272,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -20286,19 +20511,15 @@ msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Feil under åpning av nettside med ofte stilte spørsmål"
-
-#: ../shell/e-shell-window-commands.c:1174
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:1200
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -20327,28 +20548,28 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Ukjent systemfeil."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
@@ -20410,7 +20631,7 @@ msgstr ""
 "eksterne filer til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20445,7 +20666,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20453,43 +20674,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:490
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:492
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:607
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22593,42 +22814,42 @@ msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
 #. 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 "Egendefinert visning"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: ../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 "Definer visninger..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Velg visning: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
@@ -22652,7 +22873,7 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
@@ -22752,16 +22973,16 @@ msgstr "Minste bredde"
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Nå"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %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 "Prosentverdien må være mellom 0 og 100, inklusive"
 
@@ -23750,3 +23971,22 @@ msgstr "IM-kontekst"
 #: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Håndter sprettopp"
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Test av redigering av utskriftsstil for kontakter"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Opphavsrett © 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr ""
+#~ "Testprogram for komponent for redigering av stil ved utskrift av kontakt"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Test på utskrift av kontakt"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Testfunksjon for utskrift av kontakter"
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Feil under åpning av nettside med ofte stilte spørsmål"
diff --git a/po/pa.po b/po/pa.po
index 76f2162921..8b61eaec7a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,6 +2,7 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
+#: ../shell/main.c:603
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # Amanpreet Singh Alam <aalam@redhat.com>, 2004.
 # Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005, 2006.
@@ -12,42 +13,44 @@
 # A S Alam <aalam@users.sf.net>, 2007.
 # ASB <aalam@users.sf.net>, 2007.
 # Amanpreet Singh Alam <apreet.alam@gmail.com>, 2008.
+# Amanpreet Singh Alam <aalam@users.sf.net>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-22 14:14+0000\n"
-"PO-Revision-Date: 2008-08-26 07:49+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
+"POT-Creation-Date: 2009-01-29 11:16+0000\n"
+"PO-Revision-Date: 2009-01-31 07:52+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@list.sf.net>\n"
+"Language-Team: Punjabi <punjabi-l10n@users.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LoKalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
+#: ../a11y/addressbook/ea-minicard-view.c:179
+#| msgid "evolution addressbook"
+msgid "evolution address book"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
-msgstr[1] "ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
+msgstr[0] "ਮੌਜੂਦਾ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
+msgstr[1] "ਮੌਜੂਦਾ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -65,64 +68,63 @@ msgstr "ਸੰਪਰਕ:  "
 msgid "evolution minicard"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮਿੰਨੀ-ਕਾਰਡ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "ਇਸ ਲਈ ਅਲਾਰਮ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "ਅੱਜ ਮੀਟਿੰਗ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: %s ਸੰਖੇਪ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਣ ਘਟਨਾ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "ਫੋਕਸ ਲਵੋ"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "ਨਵੀਆਂ ਸਾਰਾ ਦਿਨ ਘਟਨਾਵਾਂ"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "ਅੱਜ 'ਤੇ ਜਾਓ"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "ਤਾਰੀਖ 'ਤੇ ਜਾਓ"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਸੀਮਾ ਵੇਖਣ ਅਤੇ ਚੁਣਨ ਲਈ ਇੱਕ ਟੇਬਲ"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151
-#: ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -131,15 +133,14 @@ msgstr[1] "ਇਸ ਵਿੱਚ %d ਘਟਨਾਵਾਂ ਹਨ।"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155
-#: ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "ਇਸ ਵਿੱਚ ਕੋਈ ਘਟਨਾ ਨਹੀਂ ਹੈ।"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ: %s. %s"
@@ -147,21 +148,21 @@ msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ਦਿਨ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "ਕੰਮ ਹਫਤੇ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:757
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -171,31 +172,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../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:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -204,160 +204,167 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "ਖੋਜ ਪੱਟੀ"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਖੋਜ ਪੱਟੀ"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "ਜੰਪ ਬਟਨ"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ਮਹੀਨਾ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "ਹਫਤਾ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "ਮਹੀਨੇ ਦੀ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਹਫਤਿਆਂ ਲਈ ਕੈਲੰਡਰ ਝਲਕ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "ਪੋਪਅੱਪ"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "ਪੋਪਅੱਪ ਇੱਕ ਚਾਈਲਡ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "ਸੋਧ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "ਇਸ ਸੈੱਲ਼ ਸੋਧਣਾ ਸ਼ੁਰੂ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "ਤਬਦੀਲ"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "ਸੈੱਲ ਤਬਦੀਲ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "ਫੈਲਾਓ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "ਇਸ ਸੈੱਲ ਵਿੱਚ ETree ਰੱਖਣ ਵਾਲੀ ਕਤਾਰ ਫੈਲਾਓ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "ਸਮੇਟੋ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ਇਸ ਸੈੱਲ ਵਿੱਚ ETree ਰੱਖਣ ਵਾਲੀ ਕਤਾਰ ਸਮੇਟੋ"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "ਟੇਬਲ ਸੈੱਲ"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "ਦਬਾਓ"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "ਲੜੀਬੱਧ"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "ਕੈਲੰਡਰ: %s ਤੋਂ %s ਤੱਕ"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਇਕਾਈ"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "ਕੰਬੋ ਬਟਨ"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "ਡਿਫਾਲਟ ਐਕਟੀਵੇਟ"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "ਪੋਪਅੱਪ ਮੇਨੂ"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "ਅਟੈਚਮਿੰਟ ਬਾਰ ਬਦਲੋ"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "ਐਕਟੀਵੇਟ"
 
 #. 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}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਐਡਰੈੱਸ ਬੁੱਕ ਸਰੋਤ ਹੈ ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਸੰਪਰਕ ਝਲਕ ਵਿੱਚ ਬਾਹੀ ਰਾਹੀਂ ਹੋਰ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ ਜੀ।"
+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}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਸਿਰਨਾਵਾਂ ਬੁੱਕ ਸਰੋਤ ਹੈ ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਸੰਪਰਕ ਝਲਕ ਵਿੱਚ ਬਾਹੀ ਰਾਹੀਂ "
+"ਹੋਰ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਚੁਣੋ ਜੀ।"
 
 #: ../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 "ਇਸ ਐਡਰੈੱਸ ਨਾਲ ਇੱਕ ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸੇ ਐਡਰੈੱਸ ਨਾਲ ਨਵਾਂ ਕਾਰਡ ਕਿਸੇ ਤਰਾਂ ਵੀ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"ਇਸ ਸਿਰਨਾਵਾਂ ਨਾਲ ਇੱਕ ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸੇ ਸਿਰਨਾਵਾਂ ਨਾਲ ਨਵਾਂ ਕਾਰਡ ਕਿਸੇ ਤਰਾਂ ਵੀ "
+"ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "ਐਡਰੈੱਸ '{0}' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+msgstr "ਸਿਰਨਾਵਾਂ '{0}' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
@@ -372,29 +379,41 @@ msgid "Category editor not available."
 msgstr "ਕੈਟਾਗਰੀ ਐਡੀਟਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #: ../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 "ਜਾਂਚ ਕਰੋ ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਰਾਂ ਲਿਖਿਆ ਗਿਆ ਹੈ ਅਤੇ ਤੁਸੀਂ ਲਾਗਆਨ ਲਈ ਸਹਾਇਕ ਢੰਗ ਚੁਣਿਆ ਹੈ, ਯਾਦ ਰੱਖੋ ਕਿ ਅਕਸਰ ਪਾਸਵਰਡ ਅੱਖਰ ਆਕਾਰ ਤੇ ਅਧਾਰਿਤ ਹੁੰਦੇ ਹਨ;ਤੁਹਾਡਾ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ।"
+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 ""
+"ਜਾਂਚ ਕਰੋ ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਰਾਂ ਲਿਖਿਆ ਗਿਆ ਹੈ ਅਤੇ ਤੁਸੀਂ ਲਾਗਆਨ ਲਈ ਸਹਾਇਕ ਢੰਗ ਚੁਣਿਆ ਹੈ, ਯਾਦ "
+"ਰੱਖੋ ਕਿ ਅਕਸਰ ਪਾਸਵਰਡ ਅੱਖਰ ਆਕਾਰ ਤੇ ਅਧਾਰਿਤ ਹੁੰਦੇ ਹਨ;ਤੁਹਾਡਾ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP ਸਰਵਰ ਤੋਂ ਸਕੀਮਾ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਹਟਾਉਣ ਵਿੱਚ ਅਸਫਲ।"
+#| msgid "Could not remove addressbook."
+msgid "Could not remove address book."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਹਟਾਉਣ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
-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 "ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰੁੱਪਵਾਇਜ਼ ਸਿਸਟਮ ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਹੋਰ ਗਰੁੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਗਰੁੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ ਗਰੁੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋ।"
+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 ""
+"ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰੁੱਪਵਾਇਜ਼ ਸਿਸਟਮ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ "
+"ਕੋਈ ਹੋਰ ਗਰੁੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਗਰੁੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ "
+"ਗਰੁੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋ।"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "ਕੀ ਐਡਰੈੱਸ-ਬੁੱਕ '{0}' ਹਟਾਉਣੀ ਹੈ?"
+msgstr "ਕੀ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
+#| msgid "Error loading addressbook."
+msgid "Error loading address book."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ।"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
@@ -406,19 +425,20 @@ msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਐਡਰੈੱਸ-ਬੁੱਕ ਨਿਰਮਾਣ:"
+msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨਿਰਮਾਣ:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ਸਰਵਰ ਤੋਂ ਸਕੀਮਾ ਜਾਣਾਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "ਸਰਵਰ ਵਰਜਨ"
 
@@ -427,32 +447,45 @@ msgid "Some features may not work properly with your current server"
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਗਲਤ ਢੰਗ ਨਾਲ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
+#| msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਗਲਤ ਢੰਗ ਨਾਲ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ਚਿੱਤਰ, ਜੋ ਤੁਸੀਂ ਚੁਣਿਆ ਹੈ, ਵੱਡਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦਾ ਅਕਾਰ ਤਬਦਲ ਕਰਕੇ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../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 "ਇਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪੁਰਾਣਾ ਵਰਜਨ ਵਰਤ ਰਿਹਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਕਾਰਵਾਈ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
+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 ""
+"ਇਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪੁਰਾਣਾ ਵਰਜਨ ਵਰਤ ਰਿਹਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਕਾਰਵਾਈ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ "
+"ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
+#| msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+#| msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book server does not have any suggested search bases."
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਰਵਰ ਲਈ ਕੋਈ ਖੋਜ ਅਧਾਰ ਨਹੀਂ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਸਰਵਰ ਲਈ ਕੋਈ ਖੋਜ ਅਧਾਰ ਨਹੀਂ ਹੈ।"
+#| msgid ""
+#| "This addressbook server might be unreachable or the server name may be "
+#| "misspelled or your network connection could be down."
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਜਾਂ ਸਰਵਰ ਨਾਂ ਗਲਤ ਹੈ ਜਾਂ ਤੁਹਾਡਾ ਨੈੱਟਵਰਕ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਜਾਂ ਸਰਵਰ ਨਾਂ ਗਲਤ ਹੈ ਜਾਂ ਤੁਹਾਡਾ ਨੈੱਟਵਰਕ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
+msgid "This address book will be removed permanently."
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
@@ -460,8 +493,9 @@ msgstr "ਇਹ ਸਰਵਰ LDAPv3 ਸਕੀਮਾ ਜਾਣਕਾਰੀ ਲਈ
 
 #  addressbook:load-error title
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
+#| msgid "Unable to open addressbook"
+msgid "Unable to open address book"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
@@ -476,28 +510,40 @@ msgid "Would you like to save your changes?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "ਤੁਸੀਂ ਆਪਣੇ ਇੱਕ ਸੰਪਰਕ ਨੂੰ ਇੱਕ ਕਿਤਾਬ ਤੋਂ ਦੂਜੀ ਵਿੱਚ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਰ ਇਹ ਸੰਭਵ ਨਹੀਂ ਹੈ, ਕੀ ਤੁਸੀਂ ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਦੀ ਨਕਲ ਭੇਜਣਾ ਚਾਹੋਗੇ?"
+#| msgid ""
+#| "You are attempting to move a contact from one addressbook to another but "
+#| "it cannot be removed from the source. Do you want to save a copy instead?"
+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 ""
+"ਤੁਸੀਂ ਆਪਣੇ ਇੱਕ ਸੰਪਰਕ ਨੂੰ ਇੱਕ ਕਿਤਾਬ ਤੋਂ ਦੂਜੀ ਵਿੱਚ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਰ ਇਹ ਸਰੋਤ ਉੱਤੇ ਸੰਭਵ ਨਹੀਂ ਹੈ, "
+"ਕੀ ਤੁਸੀਂ ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਦੀ ਨਕਲ ਭੇਜਣਾ ਚਾਹੋਗੇ?"
 
 #: ../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 "ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+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 ""
+"ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ "
+"ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
+msgstr "ਤੁਹਾਨੂੰ ਇਸ ਸਿਰਨਾਵਾਂ-ਬੁੱਕ ਵਿੱਚ ਸੰਪਰਕ ਹਟਾਉਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
 #: ../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 "ਤੁਸੀਂ ਆਪਣੇ ਸੰਪਰਕ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ, ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੋਗੇ?"
 
 #: ../addressbook/addressbook.error.xml.h:37
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡੇ ਸੰਪਰਕ {0} ਲਈ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਮੁੜ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -532,10 +578,9 @@ msgstr "ਇਹ ਇੰਝ ਹੀ ਵਰਤੋਂ(_U)"
 #  mail:session-message-error-cancel secondary
 #  mail:ask-session-password secondary
 #  mail:filter-load-error secondary
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook 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
+#. 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:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -544,21 +589,23 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
-msgstr "ਡਿਫਾਲਟ ਸਮਕਾਲੀ ਐਡਰੈੱਸ:"
+msgstr "ਡਿਫਾਲਟ ਸਮਕਾਲੀ ਸਿਰਨਾਵਾਂ:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
+#| msgid "Could not load addressbook"
+msgid "Could not load address book"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
-msgstr "ਪਾਇਲਟ ਦਾ ਐਡਰੈੱਸ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
+msgstr "ਪਾਇਲਟ ਦਾ ਸਿਰਨਾਵਾਂ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "ਸਵੈ-ਪੂਰਤੀ"
 
@@ -574,39 +621,38 @@ msgstr "ਸਰਟੀਫਿਕੇਟ"
 msgid "Configure autocomplete here"
 msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299
-#: ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Address Book address popup"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਐਡਰੈੱਸ ਪੋਪਅੱਪ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਿਰਨਾਵਾਂ ਪੋਪਅੱਪ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਐਡਰੈੱਸ ਦਰਸ਼ਕ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਿਰਨਾਵਾਂ ਦਰਸ਼ਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book card viewer"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਕਾਰਡ ਦਰਸ਼ਕ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਕਾਰਡ ਦਰਸ਼ਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Address Book component"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਭਾਗ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਭਾਗ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ਈਵੇਲੂਸ਼ਨ S/Mime ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਬੰਧਕ ਕੰਟਰੋਲ"
 
@@ -618,176 +664,181 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸੈਟਿੰਗ ਸੰਰਚ
 msgid "Manage your S/MIME certificates here"
 msgstr "ਆਪਣੇ S/MIME ਸਰਟੀਫਿਕੇਟ ਇਥੇ ਰੱਖੋ"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199
-#: ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195
-#: ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202
-#: ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312
-#: ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208
-#: ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35
-#: ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰਕ(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
-msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ ਬਣਾਓ"
+msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:253
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
-msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
+msgstr "ਨਵੀਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ(_B)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "ਇੱਕ ਸੁਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "ਬੇਸ"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "ਕਿਸਮ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "ਆਫਲਾਈਨ ਓਪਰੇਸ਼ਨ ਲਈ ਬੁੱਕ ਸਮੱਗਰੀ ਕਾਪੀ ਕਰੋ(_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:280
-#: ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
-msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
+msgstr "ਸਿਰਨਾਵਾਂ ਬੁੱਕ"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ਵੇਰਵਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1207
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "ਤਬਦੀਲ ਹੋ ਰਿਹਾ ਹੈ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1247
-#, fuzzy, c-format
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, c-format
 msgid "Migrating '%s':"
-msgstr "`%s' ਨੂੰ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
+msgstr "'%s' ਨੂੰ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP ਸਰਵਰ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "ਆਟੋ-ਪੂਰਤੀ ਸੈਟਿੰਗ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"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 ""
@@ -795,17 +846,17 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ਮੇਲਿੰਗ ਲਿਸਟ ਸੰਪਰਕ ਦਾ ਫਾਰਮੈਟ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।\n"
+"ਮੇਲਿੰਗ ਸੂਚੀ ਸੰਪਰਕ ਦਾ ਫਾਰਮੈਟ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।\n"
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -815,7 +866,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -825,61 +876,60 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:502
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "ਫੋਲਡਰ \"%s\" ਦਾ ਨਾਂ ਬਦਲੋ:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਬਦਲੋ"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:510
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
-msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ(_N)"
+msgstr "ਨਵੀਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693
-#: ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468
-#: ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../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 "ਹਟਾਓ(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046
-#: ../mail/em-folder-tree.c:2120
-#: ../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:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "ਵਿਸ਼ੇਸਤਾ(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 
@@ -888,21 +938,21 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯੂਜ਼ਰ %s) ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
 
@@ -912,41 +962,65 @@ msgstr "ਸਵੈ-ਪੂਰਤੀ ਲੰਬਾਈ"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "ਮੁਕੰਮਲ URI ਲਿਸਟ ਲਈ EFolderList XML"
+msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "ਮੁਕੰਮਲ URI ਲਿਸਟ ਲਈ EFolderList XML ਹੈ।"
+msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML ਹੈ।"
 
 #: ../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 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕਾਰਡ ਅਤੇ ਲਿਸਟ ਝਲਕ ਅਤੇ ਦਿੱਖ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ, (ਪਿਕਸਲ ਵਿੱਚ)।"
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕਾਰਡ ਅਤੇ ਸੂਚੀ ਝਲਕ ਅਤੇ ਦਿੱਖ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ, (ਪਿਕਸਲ "
+"ਵਿੱਚ)।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "ਝਲਕ ਪੈਨ ਵੇਖਾਓ"
 
-#: ../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."
+#: ../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 "ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸਵੈ ਪੂਰਨ ਕਾਰਵਾਈ ਨੂੰ ਸ਼ੁਰੂ ਕਰੇ, ਅੱਖਰਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ਨਾਂ ਡਾਈਲਾਗ ਵਿੱਚ ਚੁਣੇ ਅਖੀਰੀ ਫੋਲਡਰ ਦਾ URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ਚੁਣੇ ਨਾਂ ਡਾਈਲਾਗ ਵਿੱਚ ਚੁਣੇ ਅਖੀਰੀ ਫੋਲਡਰ ਦਾ URI ਹੈ।"
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
-#: ../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 "ਕੀ ਝਲਕ ਪੈਨ ਵੇਖਾਉਣੀ ਹੈ"
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "ਸਿਰਨਾਵਾਂ ਬੁੱਕ ਵਿੱਚ ਖੋਜ"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -985,10 +1059,10 @@ msgstr "<b>ਕਿਸਮ</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਿਲ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "ਹਮੇਸ਼ਾ"
 
@@ -1011,11 +1085,11 @@ msgstr "ਵੱਖਰਾ ਨਾਂ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਸਰਵਰ ਤੇ ਤੁਹਾਡੀ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਵਰਤੇਗਾ।"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਸਰਵਰ ਤੇ ਤੁਹਾਡੀ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਵਰਤੇਗਾ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1026,14 +1100,14 @@ msgid "Lo_gin:"
 msgstr "ਲਾਗਇਨ(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
 
@@ -1045,7 +1119,7 @@ msgstr "ਇੱਕ"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL ਇੰਕ੍ਰਿਪਸ਼ਨ"
 
@@ -1066,20 +1140,38 @@ msgid "Search filter"
 msgstr "ਖੋਜ ਫਿਲਟਰ"
 
 #: ../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 "ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
+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 ""
+"ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ "
+"ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
 #: ../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 "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"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 "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"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 "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
+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 ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ "
+"ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1093,37 +1185,76 @@ msgstr "ਸਹਾਇਕ ਖੋਜ ਆਧਾਰ"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS ਇੰਕ੍ਰਿਪਸ਼ਨ"
 
 #: ../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 "ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹੁੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤੁਸੀਂ ਖੋਜ ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼ੁਰੂ ਹੋ ਜਾਵੇਗੀ।"
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹੁੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤੁਸੀਂ ਖੋਜ ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ "
+"ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼ੁਰੂ ਹੋ ਜਾਵੇਗੀ।"
 
 #: ../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 "ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। \"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
+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 ""
+"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। "
+"\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ "
+"ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
-msgstr "ਇਹ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਦਾ ਪੂਰਾ ਨਾਂ ਹੈ। ਉਦਾਹਰਨ ਲਈ \"ldap.mycompany.com\"."
+#| 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 "ਇਹ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਦਾ ਪੂਰਾ ਨਾਂ ਹੈ। ਉਦਾਹਰਨ ਲਈ \"ldap.mycompany.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 "ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ "
+"ਤੁਹਾਡੀ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-msgstr "ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"Email Address\" ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ 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."
+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 ""
+"ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"ਈਮੇਲ ਸਿਰਨਾਵਾਂ\" "
+"ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ 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 "ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਲਿਸਟ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ ਵੇਖਣ ਲਈ ਹੈ।"
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸੂਚੀ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ "
+"ਵੇਖਣ ਲਈ ਹੈ।"
 
 #: ../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 "ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ ਦੀ ਲਿਸਟ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
+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 ""
+"ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ "
+"ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1131,7 +1262,7 @@ msgstr "ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਰਤੋਂ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
@@ -1139,7 +1270,7 @@ msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਲ(_A)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸ਼ਾਮਲ(_A)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
@@ -1154,8 +1285,8 @@ msgid "_Login method:"
 msgstr "ਲਾਗਇਨ ਢੰਗ(_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1170,7 +1301,7 @@ msgid "_Search scope:"
 msgstr "ਖੋਜ ਸੀਮਾ(_S):"
 
 #: ../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 "ਸਰਵਰ(_S):"
@@ -1188,14 +1319,14 @@ msgid "cards"
 msgstr "ਕਾਰਡ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../filter/filter.glade.h:17
+#: ../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:652
+#: ../plugins/google-account-setup/google-contacts-source.c:366
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
@@ -1229,15 +1360,15 @@ msgstr "<b>ਟੈਲੀਫੂਨ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
-msgstr "<b>ਵੈੱਬ ਐਡਰੈੱਸ</b>"
+msgstr "<b>ਵੈੱਬ ਸਿਰਨਾਵਾਂ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>ਕੰਮ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1248,16 +1379,16 @@ msgid "Ca_tegories..."
 msgstr "ਕੈਟਾਗਰੀ(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
 
@@ -1266,6 +1397,7 @@ msgid "Full _Name..."
 msgstr "ਪੂਰਾ ਨਾਂ(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "ਚਿੱਤਰ"
 
@@ -1276,7 +1408,7 @@ msgstr "MSN ਮੈਸਜ਼ਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
-msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
+msgstr "ਪੱਤਰ ਸਿਰਨਾਵਾਂ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Nic_kname:"
@@ -1284,156 +1416,160 @@ msgstr "ਆਮ ਨਾਂ(_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#| msgid "Novell Groupwise"
+msgid "Novell GroupWise"
+msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਇਜ਼"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਇਜ਼"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "ਟੈਲੀਫੋਨ"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "ਕੰਮ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
-msgstr "ਐਡਰੈੱਸ(_A):"
+msgstr "ਸਿਰਨਾਵਾਂ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "ਸਹਾਇਕ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "ਜਨਮ-ਦਿਨ(_B):"
 
-#: ../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:1893
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "ਸ਼ਹਿਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "ਕੰਪਨੀ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "ਦੇਸ਼(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "ਵਿਭਾਗ(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "ਫਾਇਲ ਹੇਠਾਂ(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "ਮੁੱਖ ਸਫਾ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "ਪ੍ਰਬੰਧਕ(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "ਸੂਚਨਾ(_N):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "ਦਫ਼ਤਰ(_O):"
 
-#: ../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 "_PO ਬਾਕਸ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "ਕਿੱਤਾ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "ਪਤੀ/ਪਤਨੀ(_S):"
 
-#: ../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 "ਸੂਬਾ/ਖੇਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "ਟਾਇਟਲ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ(_V):"
 
-#: ../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 "HTML ਪੱਤਰ ਮਨਜ਼ੂਰ ਹਨ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "ਵੈਬ ਲਾਗ(_W):"
 
-#: ../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 "ਕਿੱਥੇ(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "ਜਿਪ/ਡਾਕ ਕੋਡ(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
-msgstr "ਐਡਰੈੱਸ"
+msgstr "ਸਿਰਨਾਵਾਂ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1836
-#: ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "ਸੋਧਯੋਗ"
 
@@ -1802,7 +1938,6 @@ msgid "Guinea"
 msgstr "ਗੂਈਨੀਆ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#, fuzzy
 msgid "Guinea-Bissau"
 msgstr "ਗੂਈਨੀਆ-ਬੀਸਓ"
 
@@ -2407,13 +2542,13 @@ msgid "Zimbabwe"
 msgstr "ਜਿੰਬਾਬਾਵੇ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "ਨਾਂ"
@@ -2423,8 +2558,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
 
@@ -2437,100 +2572,107 @@ msgid "Gadu-Gadu Messenger"
 msgstr "ਗਡੂ-ਗਡੂ ਸੁਨੇਹੇਦਾਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#| msgid "Type"
+msgid "Skype"
+msgstr "ਸਕਾਈਪੀ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "ਸੇਵਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
-#: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ਘਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
-#: ../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 "ਗਡੂ-ਗਡੂ"
 
-#: ../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 "ਗਰੁੱਪਵਾਈਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "ਸਰੋਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "ਨਿਯਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "ਲਿਖਣਯੋਗ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "ਤਬਦੀਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../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"
@@ -2538,56 +2680,56 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ਇੱਕ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../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' ਖਾਲੀ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "ਪੂਰਾ ਸੋਧੋ(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "ਪੂਰਾ ਨਾਂ(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "ਈ-ਮੇਲ(_m)"
 
-#: ../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 "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ(_S)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਚੁਣੋ(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr ""
-"ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਲਿਸਟ (%s)\n"
+"ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਸੂਚੀ (%s)\n"
 "ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2595,7 +2737,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟਾਂ\n"
 "ਹਟਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2604,7 +2746,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ (%s) ਨੂੰ\n"
 "ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2626,7 +2768,7 @@ msgstr "ਦੇਸ਼(_y):"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
-msgstr "ਪੂਰਾ ਐਡਰੈੱਸ"
+msgstr "ਪੂਰਾ ਸਿਰਨਾਵਾਂ"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
@@ -2711,9 +2853,9 @@ msgstr "_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:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
@@ -2722,45 +2864,48 @@ msgid "<b>Members</b>"
 msgstr "<b>ਮੈਂਬਰ</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਸੰਪਾਦਕ"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਸੰਪਾਦਕ"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "ਚੁਣੋ..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
-msgstr "ਇਸ ਲਿਸਟ ਤੇ ਪੱਤਰ ਭੇਜਣ ਦੌਰਾਨ ਸਿਰਨਾਵੀਂ ਓਹਲੇ ਕਰੋ(_H)"
+msgstr "ਇਸ ਸੂਚੀ ਤੇ ਪੱਤਰ ਭੇਜਣ ਦੌਰਾਨ ਸਿਰਨਾਵੀਂ ਓਹਲੇ ਕਰੋ(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
-msgstr "ਲਿਸਟ ਨਾਂ(_L):"
+msgstr "ਸੂਚੀ ਨਾਂ(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "ਲਿਸਟ ਵਿੱਚ ਹੇਠਾਂ ਸੰਪਰਕ ਤੋਂ ਈ-ਮੇਲ ਲਿਖੋ ਜਾਂ ਸੁੱਟੋ।(_T)"
+msgstr "ਸੂਚੀ ਵਿੱਚ ਹੇਠਾਂ ਸੰਪਰਕ ਤੋਂ ਈ-ਮੇਲ ਲਿਖੋ ਜਾਂ ਸੁੱਟੋ।(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮੈਂਬਰ"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮੈਂਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "ਮੈਂਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "ਨਵੀਂ ਲਿਸਟ"
 
@@ -2778,8 +2923,12 @@ msgid "Duplicate Contact Detected"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੰਪਰਕ ਹਟਾਓ"
 
 #: ../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?"
-msgstr "ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ "
+"ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2798,107 +2947,101 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415
-#: ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "ਈ-ਮੇਲ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#, fuzzy
 msgid "Name contains"
-msgstr "ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਨਾਂ ਰੱਖਦਾ ਹੈ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰਕ"
 msgstr[1] "%d ਸੰਪਰਕ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "ਕਿਊਰੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "ਬੁੱਕ ਝਲਕ ਲੈਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "ਸੋਧਿਆ ਕਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ ਹੁੰਦੇ ਨਾਂ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "ਕਿਸਮ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "vCard ਇੰਝ ਸੰਭਾਲੋ..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671
-#: ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
@@ -2929,7 +3072,7 @@ msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
-msgstr "ਲਿਸਟ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
+msgstr "ਸੂਚੀ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
@@ -2941,29 +3084,24 @@ msgstr "ਪਰਿੰਟ ਕਰੋ(_P)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਭੇਜੋ(_v)..."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "ਕੱਟੋ(_t)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678
-#: ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39
-#: ../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:1595
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../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 "ਕਾਪੀ ਕਰੋ(_C)"
@@ -2973,21 +3111,20 @@ msgid "P_aste"
 msgstr "ਚੇਪੋ(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625
-#: ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "ਕੋਈ ਕੈਟਾਗਰੀ"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "ਹੋਰ ਗਲਤੀ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "ਨਾ-ਮਿਲਦਾ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "ਸਹਾਇਕ"
 
@@ -3017,7 +3154,7 @@ msgstr "ਕਾਰ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3025,7 +3162,7 @@ msgid "Categories"
 msgstr "ਕੈਟਾਗਰੀਆਂ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
@@ -3074,22 +3211,22 @@ msgid "Journal"
 msgstr "ਜਰਨਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "ਮੈਨੇਜਰ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "ਮੋਬਾਇਲ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "ਆਮ ਨਾਂ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "ਨੋਟ"
 
@@ -3118,14 +3255,14 @@ msgid "Radio"
 msgstr "ਰੇਡੀਓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "ਰੋਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "ਸਾਥੀ"
 
@@ -3155,72 +3292,63 @@ msgstr "ਯੂਨਿਟ"
 msgid "Web Site"
 msgstr "ਵੈਬ ਸਾਇਟ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-canvas-vbox.c:87
-#: ../widgets/misc/e-reflow.c:1433
-#: ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729
-#: ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "ਚੌੜਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-canvas-vbox.c:99
-#: ../widgets/misc/e-reflow.c:1441
-#: ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087
-#: ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "ਉਚਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "ਖੇਤਰ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "ਖੇਤਰ ਨਾਂ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "ਟੈਕਸਟ ਮਾਡਲ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "ਨਾਂ ਦੀ ਅਧਿਕਤਮ ਲੰਬਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3228,9 +3356,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"ਸੰਪਰਕ ਦੀ ਖੋਜ।"
+"ਸੰਪਰਕ ਦੀ ਖੋਜ ਜਾਰੀ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3244,7 +3372,7 @@ msgstr ""
 "\n"
 "ਜਾਂ ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3258,7 +3386,7 @@ msgstr ""
 "\n"
 "ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3268,7 +3396,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3276,346 +3404,380 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਲਿਸਟ ਨਹੀਂ ਹੈ।"
+"ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਸੂਚੀ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "ਐਡਪਟਰ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "ਕੰਮਕਾਜੀ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "ਘਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "ਹੋਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "ਚੁਣਿਆ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "ਕਰਸਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "ਹਮੇਸ਼ਾ ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../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 "ਲਿੰਕ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../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 "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
-#: ../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 "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_E)"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਨਕਲ(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(ਨਕਸ਼ਾ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "ਨਕਸ਼ਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
-msgstr "ਲਿਸਟ ਮੈਂਬਰ"
+msgstr "ਸੂਚੀ ਮੈਂਬਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "ਕਿੱਤਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "ਸਥਿਤੀ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:113
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "ਫੋਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "ਫੈਕਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "ਵੈਬ ਲਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "ਜਨਮ-ਦਿਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "ਸਫਲਤਾ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "ਪਿੱਛਾ ਰੁਝਿਆ"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "ਰਿਪੋਸਟਰੀ ਬੰਦ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
-msgstr "ਕੋਈ ਸਵੈ ਸੰਪਰਕ ਲਿਸਟ ਪ੍ਰਭਾਸ਼ਿਤ ਨਹੀਂ"
+msgstr "ਕੋਈ ਸਵੈ ਸੰਪਰਕ ਸੂਚੀ ਪ੍ਰਭਾਸ਼ਿਤ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "ਅਧਿਕਾਰ ਨਹੀ ਹੈ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "ਸਬੰਧ ਨਹੀ ਲੱਭਾ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰਕ ID ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲਾਜ਼ਮੀ ਹੈ"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS ਉਪਲੱਬਧ ਨਹੀ ਹੈ"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "ਇੰਝ ਦਾ ਕੋਈ ਸਰੋਤ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "ਹੋਰ ਗਲਤੀ"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "ਗਲਤ ਸਰਵਰ ਵਰਜਨ"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
-msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ"
+msgstr "ਨਾ-ਸਹਾਇਕ ਪਰਮਾਣਕਿਤਾ ਢੰਗ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
-msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
-msgstr "ਅਸੀਂ ਇਹ ਐਡਰੈੱਸ-ਬੁੱਕ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ ਰਹੇ ਹਾਂ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਕਿਤਾਬ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਤਿਆਰ ਨਾ ਕੀਤੀ ਗਈ ਹੋਵੇ ਜਾਂ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਾ ਹੋਈ ਹੋਵੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਨਲਾਇਨ ਢੰਗ ਨਾਲ ਚਾਲੂ ਹੋਣ ਉਪਰੰਤ ਐਡਰੈੱਸ-ਬੁੱਕ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#| msgid ""
+#| "We were unable to open this addressbook. This either means this book is "
+#| "not marked for offline usage or not yet downloaded for offline usage. "
+#| "Please load the addressbook once in online mode to download its contents"
+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 ""
+"ਇਹ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਕਿਤਾਬ ਆਫਲਾਇਨ ਵਰਤੋਂ "
+"ਲਈ ਤਿਆਰ ਨਾ ਕੀਤੀ ਗਈ ਹੋਵੇ ਜਾਂ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਾ ਹੋਈ ਹੋਵੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਨਲਾਇਨ ਢੰਗ ਨਾਲ ਚਾਲੂ ਹੋਣ "
+"ਉਪਰੰਤ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
-msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
-msgstr "ਅਸੀਂ ਇਹ ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮਾਰਗ %s ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੋਲ ਅਧਿਕਾਰ ਹਨ।"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "ਅਸੀਂ ਇਸ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਹੀਂ URI ਭਰਿਆ ਹੈ ਜਾਂ LDAP ਸਰਵਰ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ ।"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-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 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਵਿੱਚ LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ LDAP ਮੱਦਦ ਚਾਹੁੰਦੇ ਹੋ, ਤੁਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:132
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "ਅਸੀ ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ ਹਾਂ। ਇਸ ਦਾ ਅਰਥ ਇਹ ਹੈ ਕਿ ਜਾਂ ਤਾਂ ਤੁਸੀਂ ਗਲਤ URI ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ ਜਾਂ ਸਰਵਰ ਪਹੁੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:138
-#, fuzzy
-msgid "Detailed error:"
-msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
+#| msgid ""
+#| "We were unable to open this addressbook.  Please check that the path %s "
+#| "exists and that you have permission to access it."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"ਇਹ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮਾਰਗ %s ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੋਲ "
+"ਅਧਿਕਾਰ ਹਨ।"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#| msgid ""
+#| "This version of Evolution does not have LDAP support compiled in to it.  "
+#| "If you want to use LDAP in Evolution, you must install an LDAP-enabled "
+#| "Evolution package."
+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 ""
+"ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਵਿੱਚ LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ LDAP ਮੱਦਦ ਚਾਹੁੰਦੇ ਹੋ, "
+"ਤੁਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#| msgid ""
+#| "We were unable to open this addressbook.  This either means you have "
+#| "entered an incorrect URI, or the server is unreachable."
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ। ਇਸ ਦਾ ਅਰਥ ਇਹ ਹੈ ਕਿ ਜਾਂ ਤਾਂ ਤੁਸੀਂ ਗਲਤ URI ਸ਼ਾਮਿਲ "
+"ਕੀਤਾ ਹੈ ਜਾਂ ਸਰਵਰ ਪਹੁੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "ਵੇਰਵੇ ਸਮੇਤ ਗਲਤੀ ਸੁਨੇਹਾ:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#| msgid ""
+#| "More cards matched this query than either the server is \n"
+#| "configured to return or Evolution is configured to display.\n"
+#| "Please make your search more specific or raise the result limit in\n"
+#| "the directory server preferences for this addressbook."
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "ਸਰਵਰ ਦੀ ਸੀਮਾ ਤੋਂ ਜਿਆਦਾ ਜਾਂ ਈਵੇਲੂਸ਼ਨ ਦੀ ਝਲਕ ਸੰਰਚਨਾ ਤੋਂ ਵਧੇਰੇ\n"
-"ਕਾਰਡ ਇਸ ਸਵਾਲ ਲਈ ਉਪਲੱਬਧ ਹਨ, ਆਪਣੀ ਖੋਜ ਨੂੰ \n"
-"ਹੋਰ ਸੀਮਤ ਕਰੋ ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ \n"
-"ਪਸੰਦ ਨਤੀਜਾਂ ਸਮਾਂ ਵਧਾ\n"
+"ਕਾਰਡ ਇਸ ਸਵਾਲ ਲਈ ਉਪਲੱਬਧ ਹਨ, ਆਪਣੀ ਖੋਜ ਨੂੰ ਹੋਰ ਸੀਮਤ ਕਰੋ\n"
+"ਜਾਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ ਪਸੰਦ ਨਤੀਜਾਂ ਸਮਾਂ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#| msgid ""
+#| "The time to execute this query exceeded the server limit or the limit\n"
+#| "you have configured for this addressbook.  Please make your search\n"
+#| "more specific or raise the time limit in the directory server\n"
+#| "preferences for this addressbook."
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  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 addressbook."
+"preferences for this address book."
 msgstr ""
-"ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਕਰਨ ਦਾ ਸਮਾਂ ਸਰਵਰ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈਂ ਜਾਂ ਤੁਹਾਡੀ ਐਡਰੈੱਸ\n"
-"ਕਿਤਾਬ ਤੋਂ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਖੋਜ ਨੂੰ ਹੋਰ ਸੀਮਤ ਕਰੋ ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ\n"
+"ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਕਰਨ ਦਾ ਸਮਾਂ ਸਰਵਰ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈਂ ਜਾਂ ਤੁਹਾਡੀ ਸਿਰਨਾਵਾਂ\n"
+"ਕਿਤਾਬ ਤੋਂ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਖੋਜ ਨੂੰ ਹੋਰ ਸੀਮਤ ਕਰੋ ਜਾਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ\n"
 "ਵਿੱਚ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ ਪਸੰਦ ਦਾ ਸਮਾਂ ਹੋਰ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਬੈਕਗਰਾਊਂਡ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#| msgid "The backend for this addressbook was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query."
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਬੈਕਗਰਾਊਂਡ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਬੈਕਗਰਾਊਂਡ ਨੇ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਇਨਕਾਰੀ ਹੈ"
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#| msgid "The backend for this addressbook refused to perform this query."
+msgid "The backend for this address book refused to perform this query."
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਬੈਕਗਰਾਊਂਡ ਨੇ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਇਨਕਾਰੀ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "ਇਹ ਕਿਊਰੀ ਨੂੰ ਸਫਲਤਾਪੂਰਕ ਪੂਰਾ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
-msgstr "ਸ਼ਾਮਿਲ ਲਿਸਟ ਗਲਤੀ"
+msgstr "ਸ਼ਾਮਿਲ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
-#: ../addressbook/gui/widgets/eab-gui-util.c:677
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
-msgstr "ਸੋਧ ਲਿਸਟ ਗਲਤੀ"
+msgstr "ਸੋਧ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਗਲਤੀ"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
-msgstr "ਹਟਾਉਣ ਲਿਸਟ ਗਲਤੀ"
+msgstr "ਹਟਾਉਣ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#: ../addressbook/gui/widgets/eab-gui-util.c:627
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3630,16 +3792,16 @@ msgstr[1] ""
 "ਸੰਪਰਕ %d ਖੁਦ ਹੀ %d ਝਰੋਖੇ ਖੋਲ ਦੇਣਗੇ।\n"
 "ਕੀ ਤੁਸੀਂ ਇੰਨੇ ਸੰਪਰਕ ਵੇਖਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:314
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "ਨਾ ਵੇਖਾਓ(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਵੇਖਾਓ(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3648,143 +3810,143 @@ msgstr ""
 "%s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
 "ਕੀ ਇਸ ਉੱਪਰ ਹੀ ਲਿਖਿਆ ਜਾਵੇ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:345
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:386
-#: ../addressbook/gui/widgets/eab-gui-util.c:389
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ਸੰਪਰਕ"
 msgstr[1] "ਸੰਪਰਕ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:472
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਚੁਣੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "ਸੂਚੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:740
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "ਕਈ vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:897
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ਲਈ vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
-#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਜਾਂਚ..."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਦੀ ਜਾਂਚ..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
 msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "ਪੂਰਾ vCard ਵੇਖੋ"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "ਥੋੜਾ vCard ਵੇਖੋ"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
+#| msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "ਸੁਨੇਹਾ ਕਿਤਾਬ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "ਕਾਰਡ ਵੇਖਾਓ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671
-#: ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ਆਉਟਲੁੱਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "ਆਉਟਲੁੱਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮੌਜੀਲਾ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮੌਜੀਲਾ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
-#: ../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 "ਈਵੇਲੂਸ਼ਨ vCard ਇੰਪੋਰਟਰ"
 
@@ -3829,13 +3991,12 @@ msgid "Format"
 msgstr "ਫਾਰਮੈਟ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "ਹੈੱਡਰ"
 
@@ -3937,9 +4098,9 @@ msgstr "ਛਾਂ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "ਅਕਾਰ:"
 
@@ -3956,7 +4117,7 @@ msgid "Top:"
 msgstr "ਉਪਰ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "ਕਿਸਮ:"
 
@@ -3968,111 +4129,109 @@ msgstr "ਚੌੜਾਈ:"
 msgid "_Font..."
 msgstr "ਫੋਂਟ(_F)..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr "ਸੰਪਰਕ ਛਾਪ ਸਟਾਇਲ ਸੰਪਾਦਕ ਜਾਂਚ"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ (C) ੨੦੦੦, ਜ਼ੀਮੀਅਨ"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr "ਇਹ ਸੰਪਰਕ ਛਾਪ ਸ਼ੈਲੀ ਸੰਪਾਦਕ ਜਾਂਚ ਤਾਕੀ ਹੈ"
-
-#: ../addressbook/printing/test-print.c:43
-msgid "Contact Print Test"
-msgstr "ਸੰਪਰਕ ਪਰਿੰਟ ਟੈਸਟ"
-
-#: ../addressbook/printing/test-print.c:46
-msgid "This should test the contact print code"
-msgstr "ਸੰਪਰਕ ਪਰਿੰਟ ਕੋਡ ਦਾ ਟੈਸਟ ਲਾਜ਼ਮੀ ਹੈ"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਲਿਸਟ ਨੂੰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
+#| msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਦੀ ਸੂਚੀ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ ਫਾਇਲ ਦੀ ਬਜਾਏ ਆਉਟਪੁੱਟ ਫਾਇਲ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਫੋਲਡਰਾਂ ਦੀ ਲਿਸਟ"
+#: ../addressbook/tools/evolution-addressbook-export.c:52
+#| msgid "List local addressbook folders"
+msgid "List local address book folders"
+msgstr "ਸਥਾਨਕ ਸਿਰਨਾਵਾਂ ਫੋਲਡਰਾਂ ਦੀ ਸੂਚੀ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "ਕਾਰਡ vcard ਜਾਂ csv ਫਾਇਲ ਵਾਂਗ ਵੇਖਾਓ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard।csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਨਿਰਯਾਤ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:62
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "ਇੱਕ ਆਉਟਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਅਸਕਰੋਨਸ ਮੋਡ ਵਿੱਚ ਕਾਰਡਾਂ ਦੀ ਗਿਣਤੀ, ਡਿਫਾਲਟ ਆਕਾਰ 100 ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "ਕਮਾਂਡ ਲਾਇਨ ਆਰਗੂਮਿੰਟ ਗਲਤੀ, ਕਿਰਪਾ ਕਰਕੇ ਵੇਖਣ ਲਈ--help ਵਰਤੋਂ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv ਜਾਂ vcard ਫਾਰਮੈਟ ਵਰਤੋਂ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮੋਡ ਵਿੱਚ, ਆਕਾਰ ਚੋਣ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
 
 #. 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}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਕੈਲੰਡਰ ਹੈ, ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚੋਂਵੱਖਰਾ ਕੈਲੰਡਰ ਚੁਣੋ ਜੀ।"
+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}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਕੈਲੰਡਰ ਹੈ, ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚੋਂਵੱਖਰਾ "
+"ਕੈਲੰਡਰ ਚੁਣੋ ਜੀ।"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-#, fuzzy
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
-msgstr "'{0}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ ਹਾਈਲਾਈਟ ਕਰੋ ਤਾਂ ਕਿ ਮੁਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ ਹਾਈਲਾਈਟ ਕਰੋ "
+"ਤਾਂ ਕਿ ਮੁਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
 
 #: ../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 "ਆਪਣੇ ਮੁਲਕਾਤ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੀ ਮੁਲਾਕਤਾ ਬਾਰੇ ਸੌਖੀ ਤਰ੍ਹਾਂ ਸਮਝ ਸਕਣਗੇ।"
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"ਆਪਣੇ ਮੁਲਕਾਤ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੀ "
+"ਮੁਲਾਕਤਾ ਬਾਰੇ ਸੌਖੀ ਤਰ੍ਹਾਂ ਸਮਝ ਸਕਣਗੇ।"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "ਆਪਣੇ ਕੰਮ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੇ ਕੰਮ ਬਾਰੇ ਆਸਾਨੀ ਨਾਲ ਸਮਝ ਸਕਣਗੇ।"
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+"ਆਪਣੇ ਕੰਮ ਦੇ ਸੰਖੇਪ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੇ ਕੰਮ ਬਾਰੇ "
+"ਆਸਾਨੀ ਨਾਲ ਸਮਝ ਸਕਣਗੇ।"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4083,7 +4242,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "ਇਹ ਮੀਮੋ ਵਿੱਚੋਂ ਸਭ ਜਾਣਕਾਰੀ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਇਸ ਨੂੰ ਮੁੜ ਸਟੋਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੇਗੀ।"
 
 #: ../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 "ਇਹਨਾਂ ਰੁਝੇਵਿਆਂ ਬਾਰੇ ਸਾਰੀ ਜਾਣਕਾਰੀ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਵਾਪਿਸ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੇਗੀ।"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4135,19 +4296,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੁਲਾਕਾਤ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੀਟਿੰਗ ਨੂੰ ਹਟਾਓ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੀਮੋ ਨੂੰ ਹਟਾਓ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਕੰਮ ਹਟਾਓ ਬਾਰੇ ਤਿਆਰ ਹੋ?"
@@ -4168,280 +4329,350 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੰਮ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Cannot create a new event"
-msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
+#| msgid "Repository offline"
+msgid "Calendar repository is offline."
+msgstr "ਕੈਲੰਡਰ ਰਿਪੋਜ਼ਟਰੀ ਆਫਲਾਈਨ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
-msgid "Cannot save event"
+msgid "Cannot create a new event"
 msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
 #: ../calendar/calendar.error.xml.h:30
+msgid "Cannot save event"
+msgstr "ਘਟਨਾ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "ਕੀ ਕੈਲੰਡਰ '{0}' ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
-msgstr "ਕੀ ਮੀਮੋ ਲਿਸਟ '{0}' ਹਟਾਉਣੀ ਹੈ?"
+msgstr "ਕੀ ਮੀਮੋ ਸੂਚੀ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "ਕੀ ਟਾਸਕ ਲਿਸਟ '{0}' ਹਟਾਉਣੀ ਹੈ?"
+msgstr "ਕੀ ਕੰਮ ਸੂਚੀ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "ਨਾ ਭੇਜੋ(_n)"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ਡਾਊਨਲੋਡ ਕਰਨਾ ਜਾਰੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਹ ਮੁਲਾਕਾਤ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ਡਾਊਨਲੋਡ ਜਾਰੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਕੰਮ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "ਐਡੀਟਰ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:37
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਇਸ ਕੰਮ ਬਾਰੇ ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ ਹੈ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਇਹ ਕੰਮ ਮਨਜ਼ੂਰ ਕਰਨ ਦਾ ਅਧਿਕਾਰ ਵੀ ਹੈ।"
-
 #: ../calendar/calendar.error.xml.h:38
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਇਸ ਕੰਮ ਬਾਰੇ ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ ਹੈ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਇਹ ਕੰਮ ਮਨਜ਼ੂਰ ਕਰਨ ਦਾ "
+"ਅਧਿਕਾਰ ਵੀ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:39
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "ਈ-ਮੇਲ ਸੱਦਾ ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜੀ ਜਾਵੇਗੀ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਜਵਾਬ ਦੇਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:40
-msgid "Error loading memo list"
-msgstr "ਮੀਮੋ ਲਿਸਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
-
 #: ../calendar/calendar.error.xml.h:41
-msgid "Error loading task list"
-msgstr "ਟਾਸਕ ਲਿਸਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+msgid "Error loading memo list"
+msgstr "ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
 #: ../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 "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਨਾ ਭੇਜੀ ਤਾਂ, ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲੇ ਮੀਟਿੰਗ ਦੇ ਰੱਦ ਹੋਣ ਬਾਰੇ ਜਾਣ ਨਹੀਂ ਸਕਣਗੇ।"
-
-#: ../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 "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਮੀਮੋ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+msgid "Error loading task list"
+msgstr "ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
+#. 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 "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+#| msgid "Error while {0}."
+msgid "Error on '{0}'"
+msgstr "{0} ਵਿੱਚ ਗਲਤੀ"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਨਾ ਭੇਜੀ ਤਾਂ, ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲੇ ਮੀਟਿੰਗ ਦੇ ਰੱਦ ਹੋਣ ਬਾਰੇ ਜਾਣ ਨਹੀਂ "
+"ਸਕਣਗੇ।"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਮੀਮੋ ਨੂੰ ਹਟਾ "
+"ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਮੁਲਾਕਾਤ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ।"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ ਹਟਾ "
+"ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ।"
+msgid "No response from the server."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:49
+#| msgid "New Appointment"
+msgid "Save Appointment"
+msgstr "ਮੁਲਾਕਾਤ ਸੰਭਾਲੋ"
+
+#: ../calendar/calendar.error.xml.h:50
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgid "Save Memo"
+msgstr "ਮੀਮੋ ਸੰਭਾਲੋ"
+
+#: ../calendar/calendar.error.xml.h:51
+#| msgid "Save As"
+msgid "Save Task"
+msgstr "ਕੰਮ ਸੰਭਾਲੋ"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਮੁਲਾਕਾਤ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ "
+"ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:56
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ "
+"ਸਕਦਾ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਕੈਲੰਡਰ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਕੈਲੰਡਰ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਮੀਮੋ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੰਮ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "ਕੈਲੰਡਰ ਨੂੰ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:54
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
-msgstr "ਮੀਮੋ ਲਿਸਟ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
+msgstr "ਮੀਮੋ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
-msgstr "ਟਾਸਕ ਲਿਸਟ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
+msgstr "ਕੰਮ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "ਇਹ ਕੈਲੰਡਰ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
-msgstr "ਇਹ ਮੀਮੋ ਲਿਸਟ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+msgstr "ਇਹ ਮੀਮੋ ਸੂਚੀ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
-msgstr "ਇਹ ਟਾਸਕ ਲਿਸਟ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+msgstr "ਇਹ ਕੰਮ ਸੂਚੀ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#| msgid "Failed to load the calendar '%s'"
+msgid "Unable to load the calendar"
+msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੁਲਾਕਾਤ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਮੀਮੋ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../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 "ਕੀ ਤੁਸੀਂ ਇਹ ਮੀਮੋ ਲਈ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੋਗੇ?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਲਈ ਸੱਦਾ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੂਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:68
-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 "ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+#: ../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 ""
+"ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ "
+"ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ।"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
 
-#: ../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 "ਇਸ ਕੰਮ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡਾ ਕੈਲੰਡਰ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕੇਗਾ, ਜਦ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡੇ ਮੀਮੋ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮੁੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡੇ ਕੰਮ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮੁੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:76
-#: ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
-#: ../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 "ਭੇਜੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "ਸੂਚਨਾ ਭੇਜੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "ਬਹੁ-ਦਿਨ ਕਾਰਵਾਈਆਂ ਨੂੰ ਵੱਖ ਕਰੋ:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server ਨੂੰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "ਪਾਇਲਟ ਕੈਲੰਡਰ ਕਾਰਜ ਭਾਗ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "ਮੂਲ ਪਹਿਲ:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕੰਮ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "ਕੈਲੰਡਰ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "ਆਪਣਾ ਸਮਾਂ-ਖੇਤਰ, ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਦੀ ਸੰਰਚਨਾ ਲਈ ਇਥੇ ਜਾਓ"
+msgstr "ਆਪਣਾ ਸਮਾਂ-ਖੇਤਰ, ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਦੀ ਸੰਰਚਨਾ ਲਈ ਇਥੇ ਜਾਓ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
@@ -4476,31 +4707,24 @@ msgid "Memo_s"
 msgstr "ਮੀਮੋ(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280
-#: ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774
-#: ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101
-#: ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642
-#: ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ਕੰਮ"
@@ -4509,8 +4733,9 @@ msgstr "ਕੰਮ"
 msgid "_Calendars"
 msgstr "ਕੈਲੰਡਰ(_C)"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ਕੰਮ(_T)"
 
@@ -4518,27 +4743,27 @@ msgstr "ਕੰਮ(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../filter/filter.glade.h:15
+#: ../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:653
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ਘੰਟੇ"
 msgstr[1] "ਘੰਟੇ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
@@ -4549,10 +4774,10 @@ msgstr "ਮੁਲਾਕਾਤ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "ਟਿਕਾਣਾ:"
 
@@ -4561,56 +4786,56 @@ msgid "Snooze _time:"
 msgstr "ਅੰਤਰਾਲ ਸਮਾਂ(_t):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h: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 "ਸੋਧ(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "ਬੇਕਾਰ(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "ਮੁਲਾਕਾਤ ਦਾ ਟਿਕਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "ਕੋਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤੁਹਾਡੇ ਲਈ %d ਅਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4622,10 +4847,11 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪੁੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is 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"
@@ -4637,26 +4863,27 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "ਬੋਨਬੋ ਨੂੰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "ਚੇਤਾਵਨੀ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸਰਵਿਸ ਫੈਕਟਰੀ ਬਣਾਈ ਜਾ ਸਕੀ ਹੈ, ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਚੱਲਦੀ ਹੈ..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66
-#: ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4664,9 +4891,8 @@ msgstr[0] "%d ਘੰਟਾ"
 msgstr[1] "%d ਘੰਟੇ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72
-#: ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4676,9 +4902,8 @@ msgstr[1] "%d ਮਿੰਟ"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76
-#: ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4690,877 +4915,805 @@ msgid "Alarm programs"
 msgstr "ਅਲਾਰਮ ਕਾਰਜ"
 
 #: ../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 "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀ ਨੂੰ ਵੇਖਾਏ ਜਾਣ ਦਾ ਸਮਾਂ ਸਕਿੰਟਾਂ ਵਿੱਚ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "ਆਈਟਮਾਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ"
 
-#: ../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 "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ, \"#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 "ਕੰਮ ਦਾ ਰੰਗ, ਜਿਨਾਂ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀ ਹੈ, \"#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 "ਅਲਾਰਮ ਚਲਾਉਣ ਲਈ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ਸਮਾਂ ਰੇਖਾ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਖਿੱਚਣ ਲਈ ਰੰਗ (ਮੂਲ ਖਾਲੀ ਹੈ)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ।"
 
-#: ../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 "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤੇ ਸਮੇਟੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ"
 
-#: ../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 "ਦਿਨ, ਜਿੰਨਾ ਤੋਂ ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਸ਼ੁਰੂ ਅਤੇ ਅੰਤ ਹੁੰਦੇ ਹਨ, ਵੇਖਾਉਣ ਲ਼ਈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਆਈਟਮਾਂ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "ਮੂਲ ਯਾਦਪੱਤਰ ਮੁੱਲ"
 
-#: ../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 "ਅਲਾਰਮ ਆਡੀਓ ਫਾਇਲਾਂ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "ਘਟਨਾ ਰੂਪ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "ਘਟਨਾ ਪਾਰਦਰਸ਼ਤਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਟੈਪਲੇਟ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "ਕੈਲੰਡਰ ਝਲਕ ਵਿੱਚ ਘਟਨਾਵਾਂ ਵਿੱਚ ਢਾਂਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "ਕੰਮ ਆਈਟਮਾਂ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "ਕੰਮ ਮੁੱਲ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "ਖਿਤਿਜੀ ਪੱਟੀ ਸਥਿਤੀ"
 
-#: ../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 "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ 0 ਤੋਂ 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 "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ 0 ਤੋਂ 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 "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "ਆਖਰੀ ਅਲਾਰਮ ਸਮਾਂ"
 
-#: ../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 "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
-msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਬਲੀਕੇਸ਼ਨ ਲਈ ਸਰਵਰ URL ਦੀ ਲਿਸਟ ਹੈ।"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਬਲੀਕੇਸ਼ਨ ਲਈ ਸਰਵਰ URL ਦੀ ਸੂਚੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ"
 
-#: ../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 "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਦਿਨ ਝਲਕ"
 
-#: ../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 "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਸਮਾਂ ਰੇਖਾ"
 
-#: ../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 "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਖਤਮ ਹੋਣ, 0 ਤੋਂ 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 "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਸ਼ੁਰੂ ਹੋਣ, 0 ਤੋਂ 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 "ਖਿਤਿਜੀ ਪਾਸੇ ਦੀ ਸਥਿਤੀ"
 
-#: ../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 "ਮਹੀਨਾ ਦਿੱਖ ਲੰਬਕਾਰੀ ਪੱਟੀ ਸਥਿਤੀ"
 
-#: ../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 "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
-#: ../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 "ਕੰਮ ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../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 "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
+#: ../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 ""
+"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+"ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../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 "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+#: ../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 ""
+"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+"ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਲਿਸਟ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ।"
+#: ../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 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਸੂਚੀ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ।"
 
-#: ../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 "ਟਾਸਕ ਲਿਸਟ ਅਤੇ ਕੰਮ ਝਾਤੀ ਵਿੱਚ, ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
+#: ../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 "ਕੰਮ ਸੂਚੀ ਅਤੇ ਕੰਮ ਝਾਤੀ ਵਿੱਚ, ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../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 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+#: ../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 ""
+"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+"ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../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 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
+#: ../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 ""
+"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+"ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
 
-#: ../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 "ਅਲਾਰਮ ਵਲੋਂ ਚੱਲਣ ਵਾਲੇ ਕਾਰਜ"
 
-#: ../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 "ਅਲਾਰਮ ਆਡੀਓ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../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 "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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 "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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 "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖਾਓ"
 
-#: ../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 "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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 "ਲਿਸਟ ਟਰੇ ਵਿੱਚ ਅਲਾਰਮ ਵੇਖਾਓ"
+msgstr "ਸੂਚੀ ਟਰੇ ਵਿੱਚ ਅਲਾਰਮ ਵੇਖਾਓ"
 
-#: ../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 "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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 "\"ਝਲਕ\" ਪੈਨ ਵੇਖਾਓ"
 
-#: ../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 "\"ਝਲਕ\" ਪੱਟੀ ਵੇਖਾਓ।"
+msgstr "\"Preview (ਝਲਕ)\" ਪੱਟੀ ਵੇਖਾਓ।"
 
-#: ../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 "ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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 "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖਣ ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../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"
+msgid "Show week number in Day and Work Week View"
+msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤੇ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖੋ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤਾ ਅੰਕ ਵੇਖਾਓ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "ਕੰਮ ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+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 ""
+"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ "
+"ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../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\"."
-msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
+"ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ 0। ਚੇਤਾਵਨੀ ਲਈ 1। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ 2।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "ਸਮਾਂ ਵੰਡ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "ਸਮਾਂ ਜਦੋਂ ਅਲਾਰਮ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
-#: ../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)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
 msgstr "ਕੈਲੰਡਰ ਝਲਕ ਵਿੱਚ ਘਟਨਾਵਾਂ ਵਿੱਚ ਪਾਰਦਰਸ਼ਤਾ, ਮੁੱਲ 0 (ਪਾਰਦਰਸ਼ੀ) ਅਤੇ 1 (ਧੁੰਧਲਾ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ਮੂਲ ਯਾਦਪੱਤਰਾਂ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" or \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ਕੰਮ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ ਹੋਣ ਦਾ ਦਿਨ, ਐਤਵਾਰ (0) ਤੋਂ ਸਨਿਚੱਰਵਾਰ (6)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ਅਲਾਰਮ ਵੇਖਾਉਣ ਲਈ ਸੂਚਨਾ ਪੱਟੀ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ਕੀ ਮੁਲਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../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 "ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ ਐਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ ਵੇਖਾਇਆ ਜਾਵੇ।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ ਐਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ "
+"ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ਕੀ ਕੈਲੰਡਰ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ (ਮੌਜੂਦਾ ਸਮੇਂ ਦੀ ਰੇਖਾ) ਖਿੱਚਣੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਯਾਦਪੱਤਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ਕੀ ਸਮਾਂ ਸਵੇਰੇ/ਸ਼ਾਮ ਦੀ ਬਜਾਏ 4 ਘੰਟਿਆਂ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "ਕੀ ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਇਆ ਜਾਵੇ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ਕੀ ਮਿਤੀ ਝਲਕ ਦੌਰਾਨ ਹਫਤੇ ਦਾ ਅੰਕ ਵੇਖਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "ਕੀ ਘਟਨਾ ਵੇਖਾਉਣ ਦੌਰਾਨ ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "ਕਾਰਜੀ ਦਿਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਮਿੰਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਮਿੰਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "ਕੈਟਾਗਰੀ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "ਟਿੱਪਣੀ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "ਟਿਕਾਣਾ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:629
-#: ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "ਨਾ-ਮਿਲਦਾ"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "ਅੱਗੇ 7 ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "ਐਕਟਿਵ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਨਾਲ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "ਐਕਟਿਵ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "ਅਗਲੇ 7 ਦਿਨ ਦੀਆਂ ਮੁਲਾਕਾਤਾਂ"
 
-#: ../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 "ਪਰਿੰਟ ਕਰੋ"
 
-#: ../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 "ਇਹ ਚੁਣੇ ਸਮੇਂ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦੇਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ, ਇਹ ਘਟਨਾਵਾਂ ਮੁੜ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕਣਗੀਆਂ।"
+#: ../calendar/gui/calendar-commands.c:315
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"ਇਹ ਚੁਣੇ ਸਮੇਂ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦੇਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ, ਇਹ ਘਟਨਾਵਾਂ "
+"ਮੁੜ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕਣਗੀਆਂ।"
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
-#: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/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:654
+#: ../plugins/google-account-setup/google-contacts-source.c:368
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ਦਿਨ"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the 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/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "ਵੈੱਬ ਤੇ"
 
-#: ../calendar/gui/calendar-component.c:310
-#: ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "ਮੌਸਮ"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../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:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "ਨਕਲ(_C)..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਕਰਵਾਓ(_M)"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਨਾ ਕਰਵਾਓ(_D)"
+
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "ਕੈਲੰਡਰ ਦਾ ਅੱਪਗਰੇਡ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ '%s' ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "ਕੈਲੰਡਰ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1597
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮੁਲਾਕਾਤ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../calendar/gui/calendar-component.c:1605
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1613
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_A)"
+msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_p)"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੀਂ ਸਾਰਾ-ਦਿਨ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/calendar-component.c:1621
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "ਦਿਨ ਝਲਕ"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "ਹਫਤਾ ਝਲਕ"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "ਮਹੀਨਾ ਝਲਕ"
 
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#, fuzzy
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
-msgstr "ਖੇਤਰ"
+msgstr "ਕੋਈ ਖੇਤਰ"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "ਦਰਸ਼ਕ"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-#, fuzzy
-msgid "Business"
-msgstr "ਵਪਾਰਿਕ ਫੈਕਸ"
-
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
-#, fuzzy
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
-msgstr "ਕੈਟਾਗਰੀ ਹੈ"
+msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "ਵਰਗੀਕਰਨ"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
-msgid "Competition"
-msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
-
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "ਬਾਹਰ ਨਾ ਜਾਓ"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "ਬਾਹਰ"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-#, fuzzy
-msgid "Favourites"
-msgstr "ਮਾਓਟੀਸ"
-
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "ਤੋਹਫੇ"
-
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "ਨਿਸ਼ਾਨੇ/ਮਕਸਦ"
-
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-#, fuzzy
-msgid "Holiday"
-msgstr "ਅੱਜ"
-
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "ਛੁੱਟੀਆਂ ਕਾਰਡ"
-
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-#, fuzzy
-msgid "Hot Contacts"
-msgstr "ਸੰਪਰਕ"
-
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-#, fuzzy
-msgid "Ideas"
-msgstr "ਦਿਨ"
-
-#: ../calendar/gui/caltypes.xml.h:23
-#: ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-#, fuzzy
-msgid "International"
-msgstr "ਮੂਲ"
-
-#: ../calendar/gui/caltypes.xml.h:24
-#: ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-#, fuzzy
-msgid "Key Customer"
-msgstr "ਪਸੰਦ"
-
-#: ../calendar/gui/caltypes.xml.h:26
-#: ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-#, fuzzy
-msgid "Miscellaneous"
-msgstr "ਫੁਟਕਲ"
-
-#: ../calendar/gui/caltypes.xml.h:27
-#: ../calendar/gui/tasktypes.xml.h:31
-#, fuzzy
-msgid "Next 7 days"
-msgstr "ਅੱਗੇ 7 ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26
-#: ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
-#: ../calendar/gui/caltypes.xml.h:30
-#: ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-#, fuzzy
-msgid "Phone Calls"
-msgstr "ਫੋਨ ਲਿਸਟ(_P)"
-
-#: ../calendar/gui/caltypes.xml.h:31
-#: ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:331
-#: ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
-#: ../calendar/gui/caltypes.xml.h:32
-#: ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:322
-#: ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:545
-#: ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ਸਰਵਜਨਕ"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31
-#: ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ਸਥਿਤੀ"
-
-#: ../calendar/gui/caltypes.xml.h:35
-#: ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-#, fuzzy
-msgid "Strategies"
-msgstr "ਕੈਟਾਗਰੀਆਂ"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
-#: ../calendar/gui/caltypes.xml.h:37
-#: ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../calendar/gui/caltypes.xml.h:38
-#: ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-#, fuzzy
-msgid "Suppliers"
-msgstr "ਜਵਾਬ"
-
-#: ../calendar/gui/caltypes.xml.h:39
-#: ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "ਸਮਾਂ &amp; ਖਰਚੇ"
-
-#: ../calendar/gui/caltypes.xml.h:40
-#: ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "ਵੀ.ਆਈ.ਪੀ"
-
-#: ../calendar/gui/caltypes.xml.h:41
-#: ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-#, fuzzy
-msgid "Waiting"
-msgstr "ਉਡੀਕ ਜਾਰੀ..."
-
-#: ../calendar/gui/caltypes.xml.h:42
-#: ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../calendar/gui/caltypes.xml.h:43
-#: ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ਸ਼ਾਮਿਲ ਨਹੀ ਹੈ"
 
-#: ../calendar/gui/caltypes.xml.h:44
-#: ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49
-#: ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "ਹੈ"
 
-#: ../calendar/gui/caltypes.xml.h:45
-#: ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "ਇਹ ਨਹੀਂ"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਤਰੀਕਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ"
 
-#: ../calendar/gui/comp-editor-factory.c:429
-#: ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -5597,17 +5750,17 @@ msgid "Mes_sage:"
 msgstr "ਸੁਨੇਹਾ(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ਧੁਨੀ ਚਲਾਉ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
@@ -5620,7 +5773,7 @@ msgid "Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
 
@@ -5675,7 +5828,7 @@ msgstr "ਮਿੰਟ"
 msgid "start of appointment"
 msgstr "ਮੁਲਾਕਾਤ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -5684,25 +5837,53 @@ msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "ਅਲਾਰਮ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਝਲਕ ਲਈ ਸੁਝਾਅ(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "ਫਾਇਲ ਜੋੜੋ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "ਅਲਾਰਮ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#| msgid "Show _field in View"
+msgid "(Shown in a Day View)"
+msgstr "(ਦਿਨ ਝਲਕ ਵਿੱਚ ਵੇਖੋ)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5716,57 +5897,57 @@ msgstr ""
 "10 ਮਿੰਟ\n"
 "05 ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u ਅਤੇ %d ਨੂੰ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚੋਂ ਯੂਜ਼ਰ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।<i>"
+msgstr "<i>%u ਅਤੇ %d ਨੂੰ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਿੱਚੋਂ ਯੂਜ਼ਰ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।<i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">ਚੇਤਾਵਨੀ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">ਮੂਲ ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ਸਧਾਰਨ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">ਟਾਸਕ ਲਿਸਟ</span>"
+msgstr "<span weight=\"bold\">ਕੰਮ ਲਿਸਟ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">ਸਮਾਂ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">ਕੰਮ ਹਫ਼ਤਾ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "ਦਿਨ-ਰਾਤ ਰੌਸ਼ਨੀ ਸਮਾਂ ਲਈ ਅਨੁਕੂਲ(_v)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5776,13 +5957,13 @@ msgstr ""
 "ਘੰਟੇ\n"
 "ਦਿਨ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5800,628 +5981,625 @@ msgstr ""
 "ਸਨਿੱਚਰਵਾਰ\n"
 "ਐਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "ਐਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#| msgid "Send To:"
+msgid "Se_cond zone:"
+msgstr "ਦੂਜਾ ਖੇਤਰ(_c):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "ਅਲਾਰਮ ਸੂਚਨਾ ਲਈ ਕਲੰਡਰ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#| msgid "Sh_ow a reminder"
+msgid "Show a _reminder"
+msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_r)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤੇ ਦੇ ਦਿਨ ਵੇਖਾਓ(_n)"
 
-#: ../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:43
+#| msgid "Show week numbers in date navigator"
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖਾਓ(_u)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ(_a):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "ਵੀਰ(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "ਟੈਪਲੇਟ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "ਸਮਾਂ-ਖੇਤਰ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "ਸਮਾਂ-ਫਾਰਮੈਟ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "ਕਾਰਜੀ ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ਘੰਟੇ (ਸਵੇਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "ਆਈਟਮਾਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਾ-ਅੰਤ ਸਮੇਟੋ(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼ੁਰੂ(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "ਸ਼ੁੱਕਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪੂਰਨ ਕੰਮ ਇਸ ਬਾਅਦ ਓਹਲੇ ਕਰੋ(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "ਸੋਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "ਸ਼ਨਿੱ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤੇ ਅਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਕਾਤ ਵੇਖਾਓ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "ਸਮਾਂ ਵੰਡ(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "ਮੰਗਲ(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "ਬੁੱਧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "ਹਰ ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
-msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਲਿਸਟ ਭਾਗਾਂ ਨੂੰ ਲੋਕਲ ਨਕਲ ਕਰੋ(_y)"
+msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਲਿਸਟ ਭਾਗਾਂ ਨੂੰ ਲੋਕਲ ਨਕਲ ਕਰੋ(_y)"
+msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਨਕਲ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
-msgstr "ਰੰਗ(_o):"
+msgstr "ਰੰਗ(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
-msgstr "ਟਾਸਕ ਲਿਸਟ"
+msgstr "ਕੰਮ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
-msgstr "ਟਾਸਕ ਲਿਸਟ ਗੁਣ"
+msgstr "ਕੰਮ ਸੂਚੀ ਗੁਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
+msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
-msgstr "ਟਾਸਕ ਲਿਸਟ ਗੁਣ"
+msgstr "ਮੀਮੋ ਸੂਚੀ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "ਇਹ ਘਟਨਾ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "ਇਹ ਕੰਮ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "ਇਹ ਮੀਮੋ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ। ਇਹਨਾਂ ਤਬਦੀਲੀਂ ਨੂੰ ਭੁੱਲਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  ਤੁਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "ਇਹ ਘਟਨਾ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "ਇਹ ਕੰਮ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "ਇਹ ਮੀਮੋ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ। ਇਹਨਾਂ ਤਬਦੀਲੀਂ ਨੂੰ ਭੁੱਲਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ਤੁਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "ਜਾਂਚ ਗਲਤੀ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182
-#: ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "ਨੱਥੀ ਸੁਨੇਹਾ - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410
-#: ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਨੱਥੀ ਸੁਨੇਹੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481
-#: ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483
-#: ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249
-#: ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮੁਲਾਕਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮੀਮੋ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "ਚੁਣਿਆ ਟੈਕਸਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "ਉਪਲੱਬਧ ਮੱਦਦ ਵੇਖਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਨਕਲ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਸੰਭਾਲਣ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "ਵਰਗੀਕਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "ਚੋਣ(_O)"
 
-#: ../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:1417 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "ਨੱਥੀ(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਨੱਥੀ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "ਕੈਟਾਗਰੀ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਝਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "ਪਬਲਿਕ(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "ਨਿੱਜੀ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "ਗੁਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "ਗੁਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "ਰੋਲ ਖੇਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਖ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਕ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+msgid "Recent _Documents"
+msgstr "ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> ਨੱਥੀ"
 msgstr[1] "<b>%d</b> ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193
-#: ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "ਹਟਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "ਨੱਥੀ ਵੇਖਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "ਸਰੋਤ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "ਨਿਯਤ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "ਨਿਯਤ ਸਿਰਫ ਪੜਨ ਲਈ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹੋਰ ਸਭ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਦੇ ਪੱਤਰ-ਬਕਸੇ ਵਿੱਚ ਇਹ ਇਕਾਈ ਹਟਾਉਣੀ ਹੈ?(_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "ਇਹ ਘਟਨਾ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "ਇਹ ਕੰਮ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "ਇਹ ਮੀਮੋ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "ਇਹ ਇਕਾਈ ਕੋਰਬਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "ਇਹ ਘਟਨਾ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਈ ਨਹੀ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "ਇਹ ਕੰਮ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "ਇਹ ਮੀਮੋ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "ਇਹ ਇਕਾਈ ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੋਣ ਕਰਕੇ ਹਟਾਈ ਨਹੀ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "ਇਹ ਘਟਨਾ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "ਇਹ ਕੰਮ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "ਇਹ ਮੀਮੋ ਗਲਤੀ ਕਰਕੇ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "ਇਹ ਇਕਾਈ ਗਲਤੀ ਕਰਕੇ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
 
@@ -6430,7 +6608,7 @@ msgid "Contacts..."
 msgstr "ਸੰਪਰਕ..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ:"
 
@@ -6438,188 +6616,167 @@ msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ:"
 msgid "Enter Delegate"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਦਿਓ"
 
-#: ../calendar/gui/dialogs/event-editor.c:194
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "ਅਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਨੂੰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "ਦੁਹਰਾ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "ਸਮਾਂ ਰੁਝੇ ਵਾਂਗ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "ਮੁਲਾਕਾਤ(_m)"
 
-#: ../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:2725
 msgid "This event has alarms"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "ਚੁਣੇ ਪ੍ਰਬੰਧਕ ਦਾ ਅਕਾਊਂਟ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "ਸ਼ਾਮਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤੁਸੀਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਕੰਮ ਕਰ ਰਹੇ ਹੋ"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟਾ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158
-#: ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685
-#: ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:307
-#: ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:69
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀ"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "ਮੁਲਾਕਾਤ ਤੋਂ 1 ਦਿਨ ਪਹਿਲਾਂ"
@@ -6695,24 +6852,19 @@ msgstr "ਸੰਪਰਕ(_N)..."
 msgid "Organizer:"
 msgstr "ਪ੍ਰਬੰਧਕ:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002
-#: ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620
-#: ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209
-#: ../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 "ਵੱਲ"
 
@@ -6726,58 +6878,62 @@ msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
 #: ../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 "ਗਰੁੱਪ(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਲਈ ਪ੍ਰਤੀਨਿਧ ਕਰ ਰਹੇ ਹੋ, ਤੁਸੀਂ ਕੀ ਪ੍ਰਤੀਨਿਧ ਬਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਕੰਮ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਮੀਮੋ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "ਇਸ ਮੌਕੇ ਤੇ ਹੀ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "ਇਹ ਅਤੇ ਪਹਿਲ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "ਆਵਰਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ਚਾਲੂ"
 
@@ -6785,7 +6941,7 @@ msgstr "ਚਾਲੂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
@@ -6794,7 +6950,7 @@ msgstr "ਪਹਿਲਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "ਦੂਜਾ"
 
@@ -6802,7 +6958,7 @@ msgstr "ਦੂਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "ਤੀਜਾ"
 
@@ -6810,7 +6966,7 @@ msgstr "ਤੀਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "ਚੌਥਾ"
 
@@ -6818,13 +6974,13 @@ msgstr "ਚੌਥਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "ਆਖਰੀ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
 
@@ -6832,7 +6988,7 @@ msgstr "ਹੋਰ ਮਿਤੀ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1ਲੇ ਤੋਂ 10ਵਾਂ"
 
@@ -6840,7 +6996,7 @@ msgstr "1ਲੇ ਤੋਂ 10ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11ਵੇਂ ਤੋਂ 20ਵਾਂ"
 
@@ -6848,45 +7004,45 @@ msgstr "11ਵੇਂ ਤੋਂ 20ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21ਵੇਂ ਤੋਂ 31ਵਾਂ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "ਦਿਨ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "ਅਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "ਸੋਧ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "ਅਪਵਾਦ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "ਹਟਾਉਣ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
@@ -6937,12 +7093,16 @@ msgstr "ਹਫਤਾ"
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "ਵੈਬ ਸਫਾ"
 
@@ -6957,64 +7117,55 @@ msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642
-#: ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "ਉਚਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "ਨਿਊਨਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:970
-#: ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640
-#: ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
 
@@ -7027,8 +7178,7 @@ msgid "Stat_us:"
 msgstr "ਹਾਲਤ(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570
-#: ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
@@ -7045,38 +7195,37 @@ msgstr "ਪਹਿਲ(_P):"
 msgid "_Web Page:"
 msgstr "ਵੈਬ ਸਫ਼ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:111
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "ਹਾਲਤ ਵੇਰਵਾ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
-#, fuzzy
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
-msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ / ਵੇਖੋ ਨੂੰ ਦਬਾਓ"
+msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/task-editor.c:121
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:316
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧਕ(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
@@ -7098,7 +7247,7 @@ msgid "Time zone:"
 msgstr "ਸਮਾਂ-ਖੇਤਰ:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7106,126 +7255,123 @@ msgstr[0] "%d ਦਿਨ"
 msgstr[1] "%d ਦਿਨ"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਹੈ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "ਮੁਲਾਕਾਤ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ %s %s"
 
 #. 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 ਮੁਲਾਕਾਤ ਦੇ ਸ਼ੁਰੂ ਬਾਅਦ"
 
 #. 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 ਤੇ ਮੁਲਾਕਤ ਸ਼ੁਰੂ"
 
 #. 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 ਮੁਲਾਕਾਤ ਦੇ ਅੰਤ ਤੋਂ ਪਹਿਲਾਂ"
 
 #. 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 "
 
 #. 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"
 
 #. 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, %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"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73
-#: ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177
-#: ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
-#: ../calendar/gui/e-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 "ਵੇਰਵਾ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ਸੰਖੇਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "ਮਿਆਦ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
@@ -7238,18 +7384,18 @@ msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 msgid "Start Date"
 msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "ਵੇਹਲਾ"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7259,256 +7405,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ਨਹੀ"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:335
-#: ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203
-#: ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111
-#: ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002
-#: ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
+#: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ਅਣਪਛਾਤਾ"
 
-#: ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "ਆਵਿਰਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:974
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:183
-#: ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:199
-#: ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:231
-#: ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ਬਿਨ_ਨਾਂ_ਚਿੱਤਰ.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286
-#: ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਉ(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:428
-#: ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ਨਾਲ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* ਸੰਖੇਪ ਨਹੀਂ *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "ਸ਼ੁਰੂ:"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "ਬਾਕੀ:"
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665
-#: ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795
-#: ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221
-#: ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫਾ ਖੋਲੋ(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657
-#: ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677
-#: ../calendar/gui/e-memo-table.c:931
-#: ../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:1594
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../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 "ਕੱਟੋ(_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679
-#: ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../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 "ਚਿਪਕਾਓ(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਪੂਰੇ ਹੋਏ ਨਿਰਧਾਰਿਤ ਕਰੋ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪੂਰਾ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨਾ-ਪੂਰੇ ਹੋਇਆ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "ਚੁਣੇ ਕੰਮ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ਕੰਮ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -7531,8 +7646,8 @@ msgid "Due date"
 msgstr "ਮਿਆਦ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
@@ -7540,112 +7655,154 @@ msgstr "ਪਹਿਲ"
 msgid "Start date"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ਸਥਿਤੀ"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "ਆਈਟਮਾਂ ਭੇਜੋ"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "ਆਈਟਮਾਂ ਦੀ ਨਕਲ"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "ਅੱਜ ਚੁਣੋ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "ਮਿਤੀ ਚੁਣੋ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਨਕਲ(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "ਪ੍ਰਤੀਨਿਧ ਮੀਟਿੰਗ(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "ਜਵਾਬ(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1689
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566
-#: ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "ਮਨਜ਼ੂਰ"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "ਇਨਕਾਰ"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "ਆਰਜ਼ੀ"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "ਪ੍ਰਤੀਨਿਧੀ"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+#| msgid "Needs Action"
+msgid "Needs action"
+msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7659,57 +7816,65 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:589
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the second time zone"
+msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:331
-#: ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791
-#: ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794
-#: ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+#| msgid "Week"
+msgid "Week %d"
+msgstr "ਹਫ਼ਤਾ %d"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾਂ (ਗੁੰਝਲਦਾਰ ਆਵਰਤੀ)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7717,378 +7882,363 @@ msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " ਅਤੇ "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱਚੋਂ"
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹੀਨੇ"
 msgstr[1] "ਮਹੀਨੇ ਵਿੱਚ %d ਵਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
+#| msgid "a total of %d time"
+#| msgid_plural " a total of %d times"
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "ਕੁੱਲ %d ਵਾਰ"
 msgstr[1] "ਕੁੱਲ %d ਵਾਰ "
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", ਤੇ ਸਮਾਪਤੀ"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "ਸ਼ੁਰੂ"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../calendar/gui/e-itip-control.c:1003
-#: ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar ਗਲਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1092
-#: ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119
-#: ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
 
 #  Describe what the user can do
 #. 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."
+#: ../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> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਤੇ ਮੁੜ ਵਿਚਾਰ ਕਰੋ ਅਤੇ ਮੇਨੂ ਤੋਂ ਤੱਦ ਕੋਈ ਕਾਰਵਾਈ ਚੁਣੋ।"
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "ਮਨਜ਼ੂਰ"
-
-#: ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "ਇਨਕਾਰ"
-
-#: ../calendar/gui/e-itip-control.c:1283
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1278
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ ਤੁਹਾਡੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦਾ ਹੈ"
+msgstr "ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ ਤੁਹਾਡੀ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "ਮੀਟਿੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ %s ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "ਮੀਟਿੰਗ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ਇੱਕ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ਨਵੀਂ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ ਮੰਗ"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "ਮੀਟਿੰਗ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1411
-#: ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਨਾ ਬੇਸਮਝ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "ਗਲਤ ਮੀਟਿੰਗ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ਨੇ %s ਨੂੰ ਕਾਰਜ ਪੂਰਾ ਕਰਨ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ਤੁਹਾਨੂੰ ਇੱਕ ਕੰਮ ਲਈ ਕਹਿ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "ਕੰਮ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣ ਦੀ ਇੱਛਾ ਜਤਾਈ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ਤਾਜੀ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਲਈ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "ਕੰਮ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "ਕੰਮ ਰੱਦੀਕਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "ਗਲਤ ਕੰਮ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ਨੇ ਤੁਹਾਡੀ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "ਗਲਤ ਵੇਹਲਾ/ਰੁਝਿਆ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "ਸੁਨੇਹਾ ਆਪਣੇ ਸਹੀਂ ਸਰੂਪ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਨਾ-ਸਹਾਇਕ ਬੇਨਤੀਆਂ ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਇੱਕ ਜਾਇਜ ਕੈਲੰਡਰ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਕੋਈ ਵੀ ਵੇਖਣਯੋਗ ਕੈਲੰਡਰ ਇਕਾਈ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "ਨਵੀਨੀਕਰਮ ਪੂਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ਇਕਾਈ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਿਲ ਕਰਨਾ ਹੈ?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ਗਲਤ ਹਾਲਤ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:2111
-#: ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "ਇਕਾਈ ਭੇਜੀ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117
-#: ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr " ਇਕਾਈ ਨੂੰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "ਕਾਰਵਾਈ ਚੁਣੋ"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2350
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2352
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "ਜਵਾਬ ਦੇਣ ਵਾਲਿਆਂ ਦੀ ਹਾਲਤ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2470
-#: ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
@@ -8116,127 +8266,93 @@ msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 msgid "Server Message:"
 msgstr "ਸਰਵਰ ਸੁਨੇਹਾ:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "ਪ੍ਰਧਾਨ"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "ਲੋੜੀਦੀ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "ਦਰਸ਼ਕ"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740
-#: ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90
-#: ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "ਲੋੜੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "ਆਰਜ਼ੀ"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "ਪ੍ਰਤੀਨਿਧੀ"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "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 "ਕਾਰਵਾਈ ਅਧੀਨ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8244,78 +8360,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤੋਂ ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "ਦਰਸ਼ਕ(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "ਚੋਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ ਕੰਮ-ਘੰਟੇ ਹੀ ਵੇਖਾਉ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "ਆਕਾਰ ਵੱਡਾ ਵੇਖਾਓ(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਅੱਪਡੇਟ(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "ਸਵੈ-ਚੋਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਸਰੋਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਇੱਕ ਸਰੋਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "ਲੋੜੀਦੇ ਵਿਅਕਤੀ(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "ਲੋੜੀਦੇ ਲੋਕ ਤੇ ਇੱਕ ਸਰੋਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ(_E):"
 
@@ -8343,18 +8459,15 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮੈਂਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1093
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/e-memos.c:760
-#: ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8363,17 +8476,16 @@ msgstr ""
 "%s ਤੇ ਗਲਤੀ:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1062
-#: ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
@@ -8381,20 +8493,20 @@ msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹ�
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 
@@ -8404,44 +8516,43 @@ msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348
-#: ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "ਝਲਕ ਸੋਧ(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "ਸੋਧ ਝਲਕ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ਉੱਤੇ ਮੁਲਾਕਾਤ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਲੋਡ ਕਰੋ"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "%s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -8501,152 +8612,209 @@ msgstr "ਸਤੰਬਰ"
 msgid "_Select Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_S)"
 
-#: ../calendar/gui/itip-utils.c:404
-#: ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:626
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:628
-#: ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:630
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:632
-#: ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+#| msgid "Accepted"
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "ਮਨਜ਼ੂਰ"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+#| msgid "Tentatively Accepted"
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#| msgid "Declined"
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "ਇਨਕਾਰ"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+#| msgid "Delegated"
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "ਪ੍ਰਤੀਨਿਧੀ"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+#| msgid "Updated"
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵੀਨ"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+#| msgid "Cancel"
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+#| msgid "Refresh"
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+#| msgid "Counter-proposal"
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸੁਝਾਅ"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ(_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮੀਮੋ"
 msgstr[1] "%d ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:546
-#: ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d ਚੁਣਿਆ"
 msgstr[1] ", %d ਚੁਣੇ"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "ਮੀਮੋ ਅੱਪਗਰੇਡ ਅਸਫ਼ਲ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ਮੀਟਿੰਗ ਅਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਮੀਮੋ ਲਿਸਟ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
+msgstr "ਮੀਟਿੰਗ ਅਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਮੀਮੋ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "ਮੀਮੋ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "ਮੀਮੋ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮੀਮੋ(_o)"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਇਕਾਈ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "ਸਾਂਝਾ ਮੀਮੋ(_S)"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਸਾਂਝਾ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "ਨਵਾਂ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
-msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ ਬਣਾਓ"
+msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "ਅੱਗੇ 7 ਦਿਨ"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since 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 ""
@@ -8656,7 +8824,8 @@ msgstr ""
 
 #: ../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 ""
@@ -8666,8 +8835,7 @@ msgstr ""
 
 #  FIXME: set proper domain/code
 #. 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 "evolution/config.xmldb ਤੋਂ ਪੁਰਾਣੇ ਸੈਟਿੰਗ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
@@ -8687,356 +8855,354 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "ਨੋਟ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1ਲਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2ਜਾ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3ਜਾ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30ਵਾਂ"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31ਵਾਂ"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "ਐਤ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "ਸੋਮ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "ਮੰਗਲ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "ਬੁੱਧ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "ਵੀਰ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "ਸ਼ੁੱਕਰ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "ਸ਼ਨਿਚੱਰ"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "ਦਰਸ਼ਕ:"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "ਕੈਟਾਗਰੀ: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
+msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ(_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ਕੰਮ"
 msgstr[1] "%d ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "ਕੰਮ ਅੱਪਗਰੇਡ ਅਸਫਲ ਹੈ।"
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ਮੀਟਿੰਗ ਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਕਾਰਜ ਲਿਸਟ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
+msgstr "ਮੀਟਿੰਗ ਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਕਾਰਜ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "ਕੰਮ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "ਕੰਮ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "ਨਵਾਂ ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਦਿਓ"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ ਕੰਮ(_d)"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ "
+msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ "
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
-msgstr "ਟਾਸਕ ਲਿਸਟ(_k)"
+msgstr "ਕੰਮ ਲਿਸਟ(_k)"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ ਬਣਾਉ"
+msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ ਬਣਾਉ"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"ਇਸ ਕਾਰਵਾਈ ਨਾਲ ਸਾਰੇ ਚੁਣੀਆਂ ਕਾਰਵਾਈਆਂ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਇਹ ਕੰਮ ਮੁੜ ਮਿਲ ਨਾ ਸਕਣਗੇ।\n"
+"ਇਸ ਕਾਰਵਾਈ ਨਾਲ ਸਾਰੇ ਚੁਣੀਆਂ ਕਾਰਵਾਈਆਂ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਇਹ "
+"ਕੰਮ ਮੁੜ ਮਿਲ ਨਾ ਸਕਣਗੇ।\n"
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਕੰਮਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../calendar/gui/tasks-control.c:455
-#: ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
-msgstr "ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
+msgstr "ਕੰਮ ਪਰਿੰਟ ਕਰੋ"
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
 msgstr "% ਮੁਕੰਮਲ"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
-#: ../calendar/gui/tasktypes.xml.h:50
-#: ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "ਤੋ ਜਿਆਦਾ ਹੈ"
 
-#: ../calendar/gui/tasktypes.xml.h:51
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "ਤੋ ਘੱਟ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾਇਲਾਂ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ਫਾਇਲਾਂ (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੁਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
@@ -9044,1857 +9210,1876 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਕੁਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾ
 #  * We only place them here so gettext picks them up for translation.
 #  * Don't include in any C files.
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "ਅਫਰੀਕਾ/ਅਬੀਡਜਾਨ"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "ਅਫਰੀਕ/ਅਕਰਾ"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "ਅਫਰੀਕਾ/ਅਜੀਸ ਅਬਾਬਾ"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "ਅਫਰੀਕਾ/ਅਲਜੀਰਸ"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "ਅਫਰੀਕਾ/ਅਸਮੀਰਾ"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "ਅਫਰੀਕਾ/ਬਾਮਾਕੋ"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "ਅਫਰੀਕਾ/ਬਾਂਗੂਈ"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "ਅਫਰੀਕਾ/ਬਾਨਜੂਲ"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "ਅਫਰੀਕਾ/ਬਿੱਸਉ"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "ਅਫਰੀਕਾ/ਬਲਾਕਟਾਰੀ"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "ਅਫਰੀਕਾ/ਬਰਾਜਾਵਿਲੀ"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "ਅਫਰੀਕਾ/ਬੂਜੂਮਬੂਰਾ"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "ਅਫਰੀਕਾ/ਕਾਈਰੋ"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "ਅਫਰੀਕਾ/ਕਾਸਾਬਲਾਨਾਸ"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "ਅਫਰੀਕਾ/ਸੂਟਾ"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "ਅਫਰੀਕਾ/ਕੋਨਾਰੀ"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "ਅਫਰੀਕਾ/ਡਾਕਾਰ"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "ਅਫਰੀਕਾ/ਡਾਕਿਸ ਸਲਾਮ"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "ਅਫਰੀਕਾ/ਡਜੀਬੂਟੀ"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "ਅਫਰੀਕਾ/ਡੋਉਆਲਾ"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "ਅਫਰੀਕਾ/ਈਲ ਆਉਨ"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "ਅਫਰੀਕਾ/ਫਰੀਟਾਊਨ"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "ਅਫਰੀਕਾ/ਗਾਬੋਰੋਨੀ"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "ਅਫਰੀਕਾ/ਹਾਰਾਰੀ"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "ਅਫਰੀਕਾ/ਜਾਹਨਸਬਰਗ"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "ਅਫਰੀਕਾ/ਕੰਪਾਲਾ"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "ਅਫਰੀਕਾ/ਖਾਰਟੋਉਮ"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "ਅਫਰੀਕਾ/ਕਿਗਲੀ"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "ਅਫਰੀਕਾ/ਕਿਨਸ਼ਾਸਾ"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "ਅਫਰੀਕਾ/ਲਾਗੋਸ"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "ਅਫਰੀਕਾ/ਲੀਬਰੀਵਿਲੀ"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "ਅਫਰੀਕਾ/ਲੋਮੀ"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "ਅਫਰੀਕਾ/ਲੂਨਡਾ"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "ਅਫਰੀਕਾ/ਲੂਬੂਮਬਾਸ਼ੀ"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "ਅਫਰੀਕਾ/ਲੂਸਾਕਾ"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "ਅਫਰੀਕਾ/ਮਾਲਾਬੋ"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "ਅਫਰੀਕਾ/ਮਾਪੂਟੋ"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "ਅਫਰੀਕਾ/ਮਾਸੀਰੋ"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "ਅਫਰੀਕਾ/ਮਬਾਬਾਨੀ"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "ਅਫਰੀਕਾ/ਮੋਗਾਡੀਸ਼ੂ"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "ਅਫਰੀਕਾ/ਮੋਨਰੀਵੀਆ"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "ਅਫਰੀਕਾ/ਨੈਰੋਬੀ"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "ਅਫਰੀਕਾ/ਨਡਜੀਮੀਨਾ"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "ਅਫਰੀਕਾ/ਨੀਆਮੀਆ"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "ਅਫਰੀਕਾ/ਨੋਉਆਕਚੋਟ"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "ਅਫਰੀਕਾ/ਉਗਾਡੋਗੁਉ"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "ਅਫਰੀਕਾ/ਪੋਰਟੋ-ਨੋਵੋ"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "ਅਫਰੀਕਾ/ਸਾਉਟੋਮੀ"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "ਅਫਰੀਕਾ/ਤਿਮਬੂਕਟੂ"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "ਅਫਰੀਕਾ/ਤਰੀਪੋਲੀ"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "ਅਫਰੀਕਾ/ਟੂਨਿਸ"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "ਅਫਰੀਕਾ/ਵਿਡਹੋਇਕ"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "ਅਮਰੀਕਾ/ਅਡਾਕ"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "ਅਮਰੀਕਾ/ਅੰਖੋਰਾਜੀ"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "ਅਮਰੀਕਾ/ਐਨਗੁਇਲਾ"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "ਅਮਰੀਕਾ/ਐਂਟੀਗੁਆ"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "ਅਮਰੀਕਾ/ਅਰਾਗੂਈਨਾ"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "ਅਮਰੀਕਾ/ਅਰੂਬਾ"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "ਅਮਰੀਕਾ/ਅਸੂਕਾਨ"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "ਅਫਰੀਕਾ/ਬਾਰਬਾਡੋਸ"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "ਅਮਰੀਕਾ/ਬੀਲੀਮ"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "ਅਮਰੀਕਾ/ਬੀਲਿਜੀ"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "ਅਮਰੀਕਾ/ਬੋਆਵੀਸਟਾ"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "ਅਮਰੀਕਾ/ਬੋਗੋਟਾ"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "ਅਮਰੀਕਾ/ਬੋਈਸੀ"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "ਅਮਰੀਕਾ/ਬੂਈਨੋਸ ਈਰਿਸ"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "ਅਮਰੀਕਾ/ਕੈਂਬਰਿਜ਼ ਬੇ"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "ਅਮਰੀਕਾ/ਕੰਨਕੰਨ"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "ਅਮਰੀਕਾ/ਕਾਰਾਕਾਸ"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "ਅਮਰੀਕਾ/ਕਾਟਾਮਾਰਕਾ"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "ਅਮਰੀਕਾ/ਕਾਯੀਨਾ"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "ਅਮਰੀਕਾ/ਕਾਯਾਮਾਨ"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "ਅਮਰੀਕਾ/ਸ਼ਿਕਾਗੋ"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "ਅਮਰੀਕਾ/ਚੀਹੂਆਹੂਆ"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "ਅਮਰੀਕਾ/ਕੋਰਡੋਬਾ"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "ਅਮਰੀਕਾ/ਕੋਸਟਾ ਰਾਈਸ"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "ਅਮਰੀਕਾ/ਕੂਇਆਬਾ"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "ਅਮਰੀਕਾ/ਕੋਰਾਕਾਓ"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "ਅਮਰੀਕਾ/ਡਾਨਮਾਰਕਸ਼ਾਵਨ"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "ਅਮਰੀਕਾ/ਡਾਵਸੋਨ"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "ਅਮਰੀਕਾ/ਡਾਵਸੋਨ ਕਰੀਕ"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "ਅਮਰੀਕਾ/ਡੀਨਵੀਰ"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "ਅਮਰੀਕਾ/ਡੀਟਰੋਟ"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "ਅਮਰੀਕਾ/ਡੋਮੀਨੀਆ"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "ਅਮਰੀਕਾ/ਈਡਮੋਨਟੋਨ"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "ਅਮਰੀਕਾ/ਈਰੂਨੀਪੀ"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "ਅਮਰੀਕਾ/ਸਾਲਵਾਡੋਰ"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "ਅਮਰੀਕਾ/ਫਾਰਟਾਲੀਜਾ"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "ਅਮਰੀਕਾ/ਗਲਾਸੀ ਖਾੜੀ"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "ਅਮਰੀਕਾ/ਗੋਡਥਾਬ"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "ਅਮਰੀਕਾ/ਗੂਜ਼ ਬੇ"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "ਅਮਰੀਕਾ/ਗਰਾਂਡ ਟੂਰਕ"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "ਅਮਰੀਕਾ/ਗਰੀਨਾਡਾ"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "ਅਮਰੀਕਾ/ਗੂਆਡੀਲੋਉਪੀ"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "ਅਮਰੀਕਾ/ਗੁਆਟੀਮਾਲਾ"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "ਅਮਰੀਕਾ/ਗੂਆਯਾਕਿਈਲ"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "ਅਮਰੀਕਾ/ਗੁਆਨਾ"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "ਅਮਰੀਕਾ/ਹਾਲੀਫੈਕਸ"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "ਅਮਰੀਕਾ/ਹਵਾਨਾ"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "ਅਮਰੀਕਾ/ਹੀਮੋਸੀਲਓ"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "ਅਮਰੀਕਾ/ਇੰਡੀਆਨਾ/ਇੰਡੋਨੀਆਪਾਲੀਸ"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "ਅਮਰੀਕਾ/ਇੰਡੀਆਨ/ਨੋਸ"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "ਅਮਰੀਕਾ/ਇੰਡੀਆਨਾ/ਮਾਰੀਂਗੋ"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "ਅਮਰੀਕਾ/ਇੰਡੀਆਨ/ਵੀਵਾਏ"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "ਅਮਰੀਕਾ/ਇੰਡੋਪੋਲੀਸ"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "ਅਮਰੀਕਾ/ਇੰਉਵਿਕ"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "ਅਮਰੀਕਾ/ਇਕਿਊਆਲੂਇਟ"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "ਅਮਰੀਕਾ/ਜੈਮਿਕਾ"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "ਅਮਰੀਕਾ/ਜੂਜੂਆ"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "ਅਮਰੀਕਾ/ਜੂਨੀਆਉ"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "ਅਮਰੀਕਾ/ਕਾਂਟੂਕੀ/ਲੂਉਸਵਿਲੀ"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "ਅਮਰੀਕਾ/ਕਾਂਟੂਕੀ/ਮੋਟੀਸੈਲੋ"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "ਅਮਰੀਕਾ/ਲਾਪਾਜ਼"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "ਅਮਰੀਕਾ/ਲੀਮਾ"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "ਅਮਰੀਕਾ/ਲੋਸ ਐਜਲਸ"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "ਅਮਰੀਕਾ/ਲੂਉਇਸਵਿਲੀ"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "ਅਮਰੀਕਾ/ਮੇਕਈਓ"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "ਅਮਰੀਕਾ/ਮਗਾਗੁਆ"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "ਅਮਰੀਕਾ/ਮਾਨਾਉਸ"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "ਅਮਰੀਕਾ/ਮਾਰਟੀਨੀਕਿਉ"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "ਅਮਰੀਕੀ/ਮਾਜਾਟਲਾਨ"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "ਅਮਰੀਕਾ/ਮਿਨਡੋਜਾ"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "ਅਮਰੀਕਾ/ਮਿਨਾਮੀਨੀ"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "ਅਮਰੀਕਾ/ਮਿਰੀਡਾ"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "ਅਮਰੀਕਾ/ਮੀਕਸਕੋ ਸ਼ਹਿਰ"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "ਅਮਰੀਕਾ/ਮੀਕਿਉਲੋਨ"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "ਅਮਰੀਕਾ/ਮੋਟੀਰਓ"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "ਅਮਰੀਕਾ/ਮੋਟੀਵੀਡਿਓ"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "ਅਮਰੀਕਾ/ਮੋਨਟਰੀਲ"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "ਅਮਰੀਕਾ/ਮੋਨਟਸੀਰਾਟ"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "ਅਮਰੀਕਾ/ਨੱਸਾਊ"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "ਅਮਰੀਕਾ/ਨਿਊਯਾਰਕ"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "ਅਮਰੀਕਾ/ਨੀਪੀਗੋਨ"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "ਅਮਰੀਕਾ/ਨੋਮੀ"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "ਅਮਰੀਕਾ/ਨੋਰੋਮੀਹਾ"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "ਅਮਰੀਕਾ/ਉੱਤਰੀ ਡਾਕੋਟਾ/ਕੇਂਦਰੀ"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "ਅਮਰੀਕਾ/ਪੈਨਾਮਾ"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "ਅਮਰੀਕਾ/ਪੰਗਨੀਰਟੂੰਗ"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "ਅਮਰੀਕਾ/ਪਾਰਾਮਾਰੀਬੋ"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "ਅਮਰੀਕਾ/ਫੋਨੇਕਿਸ"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "ਅਮਰੀਕਾ/ਪੋਰਟਆਫ ਪ੍ਰਿੰਸ"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "ਅਮਰੀਕਾ/ਪੋਰਟ ਆਫ ਸਪੇਨ"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "ਅਮਰੀਕਾ/ਪੋਰਟੋ ਵੀਲਹੋ"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "ਅਮਰੀਕਾ/ਪੀਈਰਟੂ ਰੀਕੋ"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "ਅਮਰੀਕਾ/ਰੇਨੀ ਰੀਵਰ"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "ਅਮਰੀਕਾ/ਰੰਨਕਿਨ ਇਲਿਟ"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "ਅਮਰੀਕਾ/ਰੇਸੀਫੀ"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "ਅਮਰੀਕਾ/ਰੀਗਿਨਾ"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "ਅਮਰੀਕਾ/ਰੀਓਬਰਾਨਕੋ"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "ਅਮਰੀਕਾ/ਰੋਸਾਰਈਓ"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂਟੀਗੁਓ"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂਟ ਡੋਮੀਂਗੋ"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "ਅਮਰੀਕਾ/ਸਾਓ ਪਾਉਲੂ"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "ਅਮਰੀਕਾ/ਸਕੋਰਸਬਾਇਡ"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "ਅਮਰੀਕਾ/ਸ਼ੀਰੋਕ"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂ ਜੋਹਨਸ"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂ ਕਿੱਟ"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂਟ ਲੂਰਿਕ"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂਟ ਥੋਮਸ"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "ਅਮਰੀਕਾ/ਸੇਂਟ ਵੀਨਸੈਂਟ"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "ਅਮਰੀਕਾ/ਸਵਿਫਟ ਕਰੰਟ"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "ਅਮਰੀਕਾ/ਟੀਗੂਸੀਗਾਲੀਪਾ"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "ਅਮਰੀਕਾ/ਥੂਲੀ"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "ਅਮਰੀਕਾ/ਥੰਡਰ ਬੇ"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "ਅਮਰੀਕਾ/ਟਿਜੂਆਨਾ"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "ਅਮਰੀਕਾ/ਟੋਰਟੋਲਾ"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "ਅਮਰੀਕਾ/ਵਾਂਕੂਉਵੀਰ"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "ਅਮਰੀਕਾ/ਵਾਈਟਹਾਰਸ"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "ਅਮਰੀਕਾ/ਵਿਨਇਗ"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "ਅਮਰੀਕਾ/ਯਾਕੂਟਾਟ"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "ਅਮਰੀਕਾ/ਯੈਲੋਨਾਇਫ"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਕਾਸੀ"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਡੇਵਿਸ"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਡੁਮੋਟਡਉਰਵਿਲੀ"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਮਾਵਸੋਨ"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਮੇਕਮੂਰਡੋ"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਪਾਲਮੀਰ"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਦੱਖਣੀ ਧਰੁਵ"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "ਐਂਟਾਕਟਿਕ/ਸੇਉਵਾ"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "ਐਟਾਂਰਟਿਕਾ/ਵੋਸਟੋਕ"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "ਅਰਕਟਿਕ/ਲੋਗੇਅਰਬੇਨ"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "ਏਸ਼ੀਆ/ਅਡੀਨ"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "ਏਸ਼ੀਆ/ਅਲਮਾਟੀ"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "ਏਸ਼ੀਆ/ਅਮਾਨ"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "ਏਸ਼ੀਆ/ਅੰਡੇਰ"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "ਏਸ਼ੀਆ/ਅਕਿਉਟਾਉ"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "ਏਸ਼ੀਆ/ਅਕਿਟੋਬੀ"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "ਏਸ਼ੀਆ/ਅਸਹਗਬਾਚਟ"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "ਏਸ਼ੀਆ/ਬਗਦਾਦ"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "ਏਸ਼ੀਆ/ਬਹਿਰਾਨ"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "ਏਸ਼ੀਆ/ਬਾਕੂ"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "ਏਸ਼ੀਆ/ਬੈਂਕਾਕ"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "ਏਸ਼ੀਆ/ਬਿਈਰੂਟ"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "ਏਸ਼ੀਆ/ਬਿਸਹਕੀਕ"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "ਏਸ਼ੀਆ/ਬਰੂਨਈ"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "ਏਸ਼ੀਆ/ਕੱਲਕਤਾ"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "ਏਸ਼ੀਆ/ਚੋਈਬਾਲਸਾਨ"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "ਏਸ਼ੀਆ/ਚੋਗਕਿੰਗ"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "ਏਸ਼ੀਆ/ਕੋਲੰਬੋ"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "ਏਸ਼ੀਆ/ਡਮਾਸਕਕੋਸ"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "ਏਸ਼ੀਆ/ਢਾਕਾ"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "ਏਸ਼ੀਆ/ਦੀਲੀ"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "ਏਸ਼ੀਆ/ਡੁਬਈ"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "ਏਸ਼ੀਆ/ਡੂਸ਼ਾਨਬੀ"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "ਏਸ਼ੀਆ/ਗਾਜ਼ਾ"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "ਏਸ਼ੀਆ/ਹਾਰਬਿਨ"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "ਏਸ਼ੀਆ/ਹਾਂਗ ਕਾਂਗ"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "ਏਸ਼ੀਆ/ਹੋਵਡ"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "ਏਸ਼ੀਆ/ਈਰਕੂਟਸਕ"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "ਏਸ਼ੀਆ/ਇਸਤਾਲਬੁਲ"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "ਏਸ਼ੀਆ/ਜੈਕਾਰਤਾ"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "ਏਸ਼ੀਆ/ਜਾਯਾਪੁਰੀ"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "ਏਸ਼ੀਆ/ਜੇਰੂਸ਼ੇਲਮ"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "ਏਸ਼ੀਆ/ਕਾਬਲ"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "ਏਸ਼ੀਆ/ਕੰਮਚਾਟਕਾ"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "ਏਸ਼ੀਆ/ਕਰਾਚੀ"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "ਏਸ਼ੀਆ/ਕਾਸ਼ਗਾਰ"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "ਏਸ਼ੀਆ/ਕਾਠਮੰਡੂ"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "ਏਸ਼ੀਆ/ਕਰਾਸਨੋਯਾਰਸ਼ਕ"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "ਏਸ਼ੀਆ/ਕੁਆਲਾਮੰਪੁਰ"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "ਏਸ਼ੀਆ/ਕੋਚਿੰਗ"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "ਏਸ਼ੀਆ/ਕੁਵੈਤ"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "ਏਸ਼ੀਆ/ਮਾਕੋਓ"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "ਏਸ਼ੀਆ/ਮਾਕਿਓ"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "ਏਸ਼ੀਆ/ਮਾਗਾਡਾਨ"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "ਏਸ਼ੀਆ/ਮਕਾਸ਼ਾਰ"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "ਏਸ਼ੀਆ/ਮਾਨੀਂਆ"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "ਏਸ਼ੀਆ/ਮੋਸਕਾਟ"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "ਏਸ਼ੀਆ/ਨੀਕੋਸੀਆ"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "ਏਸ਼ੀਆ/ਨੋਵੋਸੀਬੀਰਸਕ"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "ਏਸ਼ੀਆ/ਓਮਸਕ"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "ਏਸ਼ੀਆ/ਓਰਲ"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "ਏਸ਼ੀਆ/ਫੋਮਫੀਂਹ"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "ਏਸ਼ੀਆ/ਫੋਂਟੀਨਾਕ"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "ਏਸ਼ੀਆ/ਪੇਓਨਗਯੰਗ"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "ਏਸ਼ੀਆ/ਕਤਰ"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "ਏਸ਼ੀਆ/ਕੇਜੇਲੋਰਡਾ"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "ਏਸ਼ੀਆ/ਰੰਗਾਨੂ"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "ਏਸ਼ੀਆ/ਰੀਯਾਡ"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "ਏਸ਼ੀਆ/ਸਾਈਗੋਨ"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "ਏਸ਼ੀਆ/ਸਾਖਾਲਿਨ"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "ਏਸ਼ੀਆ/ਸਮਰਕੰਦ"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "ਏਸ਼ੀਆ/ਸਿਓਲ"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "ਏਸ਼ੀਆ/ਸ਼ਿੰਘਾਈ"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "ਏਸ਼ੀਆ/ਸਿੰਘਾਂਪੁਰ"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "ਏਸ਼ੀਆ/ਤਈਪਈ"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "ਏਸ਼ੀਆ/ਤਾਸ਼ਕੰਦ"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "ਏਸ਼ੀਆ/ਤਬੀਲੀਸੀ"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "ਏਸ਼ੀਆ/ਤਹਿਰਾਨ"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "ਏਸ਼ੀਆ/ਥੀਮਫੂ"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "ਏਸ਼ੀਆ/ਟੋਕੀਓ"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "ਏਸ਼ੀਆ/ਉਜੈਨ ਪੰਗਡ"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "ਏਸ਼ੀਆ/ਉਲਾਂਬਾਤਾਰ"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "ਏਸ਼ੀਆ/ਉਰੂਮਕੀ"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "ਏਸ਼ੀਆ/ਵੀਆਟੀਅਨੀ"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "ਏਸ਼ੀਆ/ਵਲਾਡੀਵੋਸਟੋਕ"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "ਏਸ਼ੀਆ/ਯਾਤੂਸਟਕ"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "ਏਸ਼ੀਆ/ਯਾਕਾਟੀਰਿਨਬਰਗ"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "ਏਸ਼ੀਆ/ਯੀਰੀਵਾਨ"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "ਐਟਲਾਟਾ/ਅਜੋਰੀਸ"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "ਐਟਲਾਟਾ/ਬਾਰਮੂਦਾ"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "ਐਟਲਾਟਾ/ਕਾਨਾਰੇ"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "ਐਟਲਾਟਾ/ਕਾਪੀ ਵਾਰਡੀ"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "ਐਟਲਾਟਾ/ਫਾਇਰੋਈ"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "ਐਟਲਾਟਾ/ਜਾਨ ਮੇਯਾਨ"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "ਐਟਲਾਟਾ/ਮਾਡੀਈਰਾ"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "ਐਲਾਂਟਿਕ/ਰੀਏਕਜਾਵਿਕ"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "ਐਟਲਾਟਾ/ਦੱਖਣੀ ਜਾਰਜੀਆ"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "ਐਂਟਲਾਟਿਕਾ/ਸੇਂਟ ਹੀਲੀਨਾ"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "ਐਟਲਾਟਾ/ਸਟਾਲੀਨ"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "ਆਸਟਰੇਲੀਆ/ਐਡੀਲਾਡੀ"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "ਆਸਟਰੇਲੀਆ/ਬਰਿਸਬੇਨ"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "ਆਸਟਰੇਲੀਆ/ਬਰੋਕਿਨ ਹਿੱਲ"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "ਆਸਟਰੇਲੀਆ/ਡਾਰਵਿਨ"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "ਆਸਟਰੇਲੀਆ/ਹੋਬਾਰਟ"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "ਆਸਟਰੇਲੀਆ/ਲੀਂਡੀਮੇਨ"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "ਆਸਟਰੇਲੀਆ/ਲਾਰਡ ਹੋਵੀ"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "ਆਸਟਰੇਲੀਆ/ਮੈਲਬੋਰਨ"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "ਅਸਟਰੇਲੀਆ/ਪਰਥ"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "ਆਸਟਰੇਲੀਆ/ਸਿਡਨੀ"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "ਯੂਰਪ/ਅੰਸਟਰੀਡਮ"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "ਯੂਰਪ/ਅਂਡੋਰਾ"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "ਯੂਰਪ/ਏਥਨਜ਼"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "ਯੂਰਪ/ਬੀਲਫਾਸਟ"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "ਯੂਰਪ/ਬੀਲਗਰਾਡ"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "ਯੂਰਪ/ਬਰਲਿਨ"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "ਯੂਰਪ/ਬਰਾਟੀਸਲਾਵਾ"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "ਯੂਰਪ/ਬਰੂਸੀਲਸ"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "ਯੂਰਪ/ਬੂਚਰੈਸਟ"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "ਯੂਰਪ/ਬੁੱਡਾਪੈਸਟ"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "ਯੂਰਪ/ਚੀਸੀਂਕਉ"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "ਯੂਰਪ/ਕੋਪੀਨਹਾਜੀਨ"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "ਯੂਰਪ/ਡੂਬਲਿਨ"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "ਯੂਰਪ/ਗਾਬਰਾਲਟਾਰ"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "ਯੂਰਪ/ਹੀਲਸੀਂਕੀ"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "ਯੂਰਪ/ਇਸਤਾਲਬੁਲ"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "ਯੂਰਪ/ਕਾਲਿਨਿਗਰਾਡ"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "ਯੂਰਪ/ਕਿਨਵ"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "ਯੂਰਪ/ਲੀਸਬੋਨ"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "ਯੂਰਪ/ਲਜੂਬਲੀਜਾਨਾ"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "ਯੂਰਪ/ਲੰਡਨ"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "ਯੂਰਪ/ਲਕਸ਼ਮਬੋਰਗ"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "ਯੂਰਪ/ਮਾਡਰੀਡ"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "ਯੂਰਪ/ਮਾਲਟਾ"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "ਯੂਰਪ/ਮਿੰਨਕ"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "ਯੂਰਪ/ਮੋਨਕੋ"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "ਯੂਰਪ/ਮਾਸਕੋ"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "ਯੂਰਪ/ਨੀਕੋਸੀਆ"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "ਯੂਰਪ/ਓਸਲੋ"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "ਯੂਰਪ/ਪੈਰਿਸ"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "ਯੂਰਪ/ਪਰਾਗੁਆ"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "ਯੂਰਪ/ਰੀਗਾ"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "ਯੂਰਪ/ਰੋਮ"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "ਯੂਰਪ/ਸਾਮਾਰਾ"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "ਯੂਰਪ/ਸਾਂਨ ਮਾਰੀਨੋ"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "ਯੂਰਪ/ਸਾਰਾਜੀਵੂ"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "ਯੂਰਪ/ਸਿਪਫੀਰੋਪੋਲ"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "ਯੂਰਪ/ਸਕੋਪਜੀ"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "ਯੂਰਪ/ਸੋਫੀਆ"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "ਯੂਰਪ/ਸਟਾਕੋਹਮ"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "ਯੂਰਪ/ਟਾਲੀਨ"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "ਯੂਰਪ/ਟੀਰਾਨੀ"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "ਯੂਰਪ/ਉਜ਼ਗੋਰੋਡ"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "ਯੂਰਪ/ਵਾਡੂਜ"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "ਯੂਰਪ/ਵਾਟੀਕਾਨ"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "ਯੂਰਪ/ਵੀਆਨਾ"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "ਯੂਰਪ/ਵਿਲਨੀਅਸ"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "ਯੂਰਪ/ਵਾਰਸਾਅ"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "ਯੂਰਪ/ਜਾਗਰੀਬ"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "ਯੂਰਪ/ਜਾਪੋਰੋਜੀਆ"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "ਯੂਰਪ/ਜ਼ੁਰਿਚਕ"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "ਇੰਡੀਆ/ਅਟਾਨਾੱਰੀਵੋ"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "ਇੰਡੀਆ/ਸ਼ਾਕਗੋਸ"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "ਇੰਡੀਆ/ਕ੍ਰਿਸਮਸ"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "ਇੰਡੀਆ/ਕੋਕੋਸ"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "ਇੰਡੀਆ/ਕਾਮੋਰੋ"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "ਇੰਡੀਆ/ਕਿਰਗੂਈਲੀਨ"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "ਇੰਡੀਆ/ਮਾਹੀ"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "ਇੰਡੀਆ/ਮਾਲਦੀਵ"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "ਇੰਡੀਆ/ਮਾਊਰੀਟੀਉਸ"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "ਇੰਡੀਆ/ਮਾਏਉਟੀ"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "ਇੰਡੀਆ/ਰੀਯੂਨੀਅਨ"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਅਪੀਆ"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਆਂਕਲੈਂਡ"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਚਾਥਾਮ"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਈਸਟਰ"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਈਫਾਟੀ"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਈਨਡੀਰਬਰੀ"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਫਾਕਾਓਫੋ"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਫਿੱਜੀ"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਫੰਫੂਟੀ"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਗਾਲਾਪਾਗੋਸ"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਗਾਮਬੀਰ"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਗੁਆਡਾਲਕਾਂਨਲ"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਗੁਆਮ"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਹੋਨੋਲੂਲੂ"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਜਾਹਨਟੋਨ"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਕੀਰੀਟੀਮਾਟੀ"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਕੋਸਰਾਈ"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਕਵਾਜਾਲੀਇਨ"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਮਾਜੋਰੂ"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਮਾਰਕਿਉਸਸ"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਮਿੱਡਵੇ"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਨਾਉਰੂ"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਨੀਉਈ"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਨੋਰਫੋਲਕ"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਨੋਉਮੀਆ"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਪੇਗੂ ਪੇਗੂ"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਪਾਲਾਉ"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਪੀਟਕਾਈਰਨ"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਪੋਨਾਪੀ"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਪੋਰਟ ਮੋਰਸਬੇ"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਰਾਰੋਟੋਗਾ"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਸਾਈਪਾਨ"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਤਾਹੀਟੀ"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਤਾਰਾਵਾ"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਤੋਗਾਟਾਪੂ"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਤਰੂਕ"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਵੇਕੀ"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਯਾਪੀ"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "ਆਟੋ-ਸੰਭਾਲੀ ਫਾਈਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "ਸੰਪਾਦਕ ਤੋਂ ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "ਨੱਥੀ ਸ਼ਾਮਲ"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "ਨੱਥੀ(_t)"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "ਗ਼ੈਰ-ਟਾਇਟਲ ਸੁਨੇਹਾ"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:479
-#: ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਬੰਦ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:486
-#: ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:44
-#: ../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 "ਪਰਿੰਟ ਕਰੋ(_P)..."
 
-#: ../composer/e-composer-actions.c:493
-#: ../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 "ਛਪਾਈ ਝਲਕ(_v)"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨੂੰ ਵੱਖਰੇ ਨਾਂ ਨਾਲ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:514
-msgid "Save _Draft"
-msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_D)"
+#: ../composer/e-composer-actions.c:511
+#| msgid "Save as draft"
+msgid "Save as _Draft"
+msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ(_D)"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "ਭੇਜੋ(_e)"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "ਨਵੀਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_E)"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "ਸੁਰੱਖਿਆ(_S)"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP ਇੰਕ੍ਰਿਪਟ(_E)"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਨੂੰ PGP ਨਾਲ ਇੰਕ੍ਰਿਪਟ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤਖਤ(_S)"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "ਆਪਣੀ PGP ਕੀ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "ਦਰਜਾ ਸੁਨੇਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "ਸੁਨੇਹੇ ਦਾ ਦਰਜਾ ਵਧਾਓ"
 
-#: ../composer/e-composer-actions.c:585
-#, fuzzy
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
-msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਮੰਗ(_E)"
+msgstr "ਪੜ੍ਹਨ ਰਸੀਦ ਦੀ ਮੰਗ(_q)"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "ਜਦੋਂ ਤੁਹਾਡਾ ਸੁਨੇਹਾ ਪੜਿਆ ਜਾਵੇ ਤਾਂ ਪ੍ਰਾਪਤੀ ਸੂਚਨਾ ਲਵੋ"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ(_C)"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਆਪਣੇ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਕਰਿਪਟ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾਇਨ(_n)"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ਆਪਣੇ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "_Bcc ਖੇਤਰ"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ BCC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "_Cc ਖੇਤਰ"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "ਜਵਾਬ ਖੇਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:649
-#, fuzzy
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
-msgstr "_Cc ਖੇਤਰ"
+msgstr "ਵਿਸ਼ਾ ਖੇਤਰ(_S)"
 
-#: ../composer/e-composer-actions.c:651
-#, fuzzy
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+msgstr "ਬਦਲੋ ਕਿ ਕੀ ਵਿਸ਼ਾ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "ਵੱਲ ਖੇਤਰ(_T)"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#| msgid "Save _Draft"
+msgid "Save Draft"
+msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸੁਨੇਹੇ ਦੀ ਨਕਲ ਪ੍ਰਾਪਤ ਕਰੇ"
 
-#: ../composer/e-composer-header-table.c:71
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਲਗਣ ਤੋਂ ਬਗੈਰ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰਨ (ਕਾਰਬਨ ਕਾਪੀ) ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ।"
+#: ../composer/e-composer-header-table.c:69
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"ਇਸ ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਲਗਣ ਤੋਂ ਬਗੈਰ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰਨ (ਕਾਰਬਨ ਕਾਪੀ) ਵਾਲੇ ਦਾ "
+"ਸਿਰਨਾਵਾਂ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "ਵਲੋਂ(_o):"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "ਜਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../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:"
 
 #  * Post-To
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "ਭੇਜੋ(_P):"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "ਭੇਜਣ ਲਈ ਨਿਯਤ"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-composer-private.c:65
-#, fuzzy
-msgid "Recent _Documents"
-msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
-
-#: ../composer/e-composer-private.c:180
-#: ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰੀ ਸੁਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:879
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+#: ../composer/e-msg-composer.c:873
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1500
-#: ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405
-#: ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
-#, fuzzy
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "ਨੱਥੀ"
 msgstr[1] "ਨੱਥੀ"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
 
-#: ../composer/e-msg-composer.c:1573
-#: ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4055
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+#: ../composer/e-msg-composer.c:4093
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr "<b>(ਲੇਖਣ ਵਿੱਚ ਕੁਝ ਨਾ-ਟੈਕਸਟ ਭਾਗ ਹੈ, ਜਿਸ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।) <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 " ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਪੱਤਰ ਭੇਜਣ ਨਾਲ ਬਾਕੀ ਰਹਿੰਦੇ ਨੱਥੀਆਂ ਬਿਨਾਂ ਹੀ ਪੱਤਰ ਚਲਿਆ ਜਾਵੇਗਾ।"
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਪੱਤਰ ਭੇਜਣ ਨਾਲ ਬਾਕੀ ਰਹਿੰਦੇ ਨੱਥੀਆਂ ਬਿਨਾਂ ਹੀ ਪੱਤਰ "
+"ਚਲਿਆ ਜਾਵੇਗਾ।"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "ਸਭ ਅਕਾਊਂਟ ਹਟਾਏ ਜਾਣ।"
 
 #: ../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 "ਕੀ ਤੁਸੀਂ ਲਿਖੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਟਾਇਟਲ '{0}' ਨਾਲ, ਨੂੰ ਤੁਸੀਂ ਨਿਕਾਰ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ? "
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10912,8 +11097,14 @@ msgid "Because &quot;{1}&quot;."
 msgstr "ਕਿਉਕਿ &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 "ਇਸ ਲੇਖਕ ਝਰੋਖੇ ਨੂੰ ਬੰਦ ਕਰਨ ਨਾਲ ਬਣਈ ਜਾ ਰਹੀ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਤਬਦੀਲੀਆਂ ਹਮੇਸ਼ਾ ਲਈ ਰੱਦ ਹੋ ਜਾਣਗੀਆਂ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਦੇ ਨਹੀਂ। ਇਹ ਫਿਰ ਕਿਸੇ ਦਿਨ ਸੁਨੇਹੇ ਨੂੰ ਮੁੜ ਲਿਖਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ।"
+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 ""
+"ਇਸ ਲੇਖਕ ਝਰੋਖੇ ਨੂੰ ਬੰਦ ਕਰਨ ਨਾਲ ਬਣਈ ਜਾ ਰਹੀ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਤਬਦੀਲੀਆਂ ਹਮੇਸ਼ਾ ਲਈ ਰੱਦ ਹੋ "
+"ਜਾਣਗੀਆਂ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਦੇ ਨਹੀਂ। ਇਹ ਫਿਰ ਕਿਸੇ ਦਿਨ ਸੁਨੇਹੇ ਨੂੰ ਮੁੜ "
+"ਲਿਖਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10952,11 +11143,20 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ ਕਿਉਕਿ &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 "ਈਵੇਲੂਸ਼ਨ ਉਸ ਸਮੇਂ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਸੀ, ਜਦੋਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਲਿਖ ਰਹੇ ਸੀ।ਪੱਤਰ ਮੁੜ-ਪ੍ਰਾਪਤ ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ ਉਸ ਜਗਾਂ ਤੋਂ ਮੁੜ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ, ਜਿੱਥੋ ਛੱਡਿਆ ਸੀ।"
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"ਈਵੇਲੂਸ਼ਨ ਉਸ ਸਮੇਂ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਸੀ, ਜਦੋਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਲਿਖ ਰਹੇ ਸੀ।ਪੱਤਰ ਮੁੜ-ਪ੍ਰਾਪਤ "
+"ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ ਉਸ ਜਗਾਂ ਤੋਂ ਮੁੜ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ, ਜਿੱਥੋ ਛੱਡਿਆ ਸੀ।"
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
+#| msgid ""
+#| "Send options available only for Novell Groupwise and Microsoft Exchange "
+#| "accounts."
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
 msgstr "ਭੇਜਣ ਚੋਣ ਸਿਰਫ਼ ਨੋਵਲ ਗਰੁੱਪਵਾਈਜ਼ ਅਤੇ ਮਾਈਕਰੋਸਾਫ਼ਟ ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਹੀ ਉਪਲੱਬਧ ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -10968,22 +11168,28 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "ਫਾਇਲ `{0}' ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../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 "ਇਸ ਡਾਇਰੈਕਟਰੀ ਦੇ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਜਾਂ ਤਾਂ ਸਾਰੀਆਂ ਫਾਇਲਾਂ ਇੱਕ ਇੱਕ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰੋ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਦਾ ਇੱਕ ਆਕਾਇਵ ਬਣਾਉ ਤੇ ਇਹਨਾਂ ਨੂੰ ਨੱਥੀ ਕਰ ਦਿਓ।"
+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 ""
+"ਇਸ ਡਾਇਰੈਕਟਰੀ ਦੇ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਜਾਂ ਤਾਂ ਸਾਰੀਆਂ ਫਾਇਲਾਂ ਇੱਕ ਇੱਕ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰੋ ਜਾਂ "
+"ਡਾਇਰੈਕਟਰੀ ਦਾ ਇੱਕ ਆਕਾਇਵ ਬਣਾਉ ਤੇ ਇਹਨਾਂ ਨੂੰ ਨੱਥੀ ਕਰ ਦਿਓ।"
 
 #: ../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 ""
 "HTML ਸੰਪਾਦਕ ਕੰਟਰੋਲ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਤੋਂ ਅਸਫਲ\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨ ਬਣਾ ਲਵੋਂ ਕਿ ਤੁਹਾਡੇ ਕੋਲ gtkhtml ਅਤੇ libgtkhtml ਦਾ ਸਹੀਂ ਵਰਜਨ ਇੰਸਟਾਲ ਹੈ।"
+"ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨ ਬਣਾ ਲਵੋਂ ਕਿ ਤੁਹਾਡੇ ਕੋਲ gtkhtml ਅਤੇ libgtkhtml ਦਾ ਸਹੀਂ ਵਰਜਨ ਇੰਸਟਾਲ "
+"ਹੈ।"
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
-msgstr "ਐਡਰੈੱਸ ਚੋਣਕਾਰ ਕੰਟਰੋਲ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਤੋਂ ਅਸਫਲ।"
+msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣਕਾਰ ਕੰਟਰੋਲ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਤੋਂ ਅਸਫਲ।"
 
 #  mail-composer:recover-autosave title
 #: ../composer/mail-composer.error.xml.h:25
@@ -11016,16 +11222,14 @@ msgid "_Recover"
 msgstr "ਪ੍ਰਾਪਤ(_R)"
 
 #: ../composer/mail-composer.error.xml.h:33
-#, fuzzy
 msgid "_Save Draft"
-msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
+msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"
 
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
 
@@ -11041,65 +11245,114 @@ msgstr "ਐਡਰਸ ਕਾਰਡ"
 msgid "calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
-#: ../e-util/e-error.c:77
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਗਲਤੀ"
 
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਚੇਤਾਵਨੀ"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਜਾਣਕਾਰੀ"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸਵਾਲ"
 
 #  setup a dummy error
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ, ਅਣਜਾਣ ਗਲਤੀ '%s' ਬੇਨਤੀ"
 
-#: ../e-util/e-logger.c:154
-#, fuzzy
+#: ../e-util/e-logger.c:161
 msgid "Component"
-msgstr "ਮੁਕੰਮਲ"
+msgstr "ਭਾਗ"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "ਲਾਗ ਰੱਖਣ ਵਾਲੇ ਭਾਗ ਦਾ ਨਾਂ"
 
-#: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482
-#: ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:339
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "ਡੀਬੱਗ ਲਾਗ"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀਆਂ ਵੇਖੋ(_e)"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "ਸਕਿੰਟ।"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "ਲਾਗ ਸੁਨੇਹੇ:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "ਲਾਗ ਲੈਵਲ"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "ਸਮਾਂ"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "ਸੁਨੇਹੇ"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "ਗਲਤੀਆਂ"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਗਲਤੀਆਂ"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "ਡੀਬੱਗ"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "ਗਲਤੀਆਂ, ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਡੀਬੱਗ ਸੁਨੇਹੇ"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
 #: ../e-util/e-plugin.c:309
-#, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
+msgstr "ਜਦੋਂ ਪਲੱਗਇਨ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇ"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "ਪਰਿੰਟਿੰਗ ਦੇ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "ਪਰਿਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਭੇਜੀ ਹੈ:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਨਹੀਂ ਦਿੱਤੀ ਹੈ।"
 
@@ -11109,213 +11362,212 @@ msgstr "ਪਰਿੰਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰ�
 #  mail:no-delete-folder secondary
 #  system:no-save-file secondary
 #  system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
-#, fuzzy
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
-msgstr "ਕਿਉਕਿ &quot; {1}&quot;।"
+msgstr "ਕਿਉਂਕਿ \"{1}\""
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
+msgstr "ਫਾਇਲ \"{0}\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।"
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr "ਫਾਇਲ਼ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ।"
+msgstr "ਫਾਇਲ \"{0}\" ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।"
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists \"{0}\"."
-msgstr "ਫਾਇਲ ਬੰਦ &quot;{0}&quot;।"
+msgstr "ਫਾਇਲ ਮੌਜੂਦ \"{0}\" ਹੈ।"
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "ਉੱਪਰ ਲ਼ਿਖੋ?"
 
-#: ../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 "ਉੱਤੇ ਲਿਖੋ(_O)"
 
-#: ../e-util/e-util.c:97
-#, fuzzy
+#: ../e-util/e-util.c:127
+#| msgid "Could not open autosave file"
+msgid "Could not open the link."
+msgstr "ਸਬੰਧ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
-msgstr "ਫੋਲਡਰ ਅਧਿਕਾਰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਲਈ ਮੱਦਦ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "ਖਾਸ(_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "ਕੰਮ(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "ਨਿੱਜੀ(_P)"
 
 #  forest green
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "ਕਰਨ ਲਈ(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "ਬਾਅਦ 'ਚ(_L)"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "ਲੇਬਲ ਨਾਂ(_N):"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "ਲੇਬਲ ਸੋਧ"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "ਲੇਬਲ ਸ਼ਾਮਲ"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../e-util/e-util-labels.c:356
-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 "ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਲੇਬਲ ਇਸ ਟੈਗ ਨਾਲ ਮੌਜੂਦ ਹੈ। ਆਪਣਾ ਲੇਬਲ ਨਾਂ ਬਦਲੋ ਜੀ।"
 
-#: ../e-util/gconf-bridge.c:1218
-#, fuzzy, c-format
+#: ../e-util/gconf-bridge.c:1221
+#, c-format
 msgid "GConf error: %s"
-msgstr "ਨਾ-ਮੰਨਣਯੋਗ ਗਲਤੀ: %s"
+msgstr "GConf ਗਲਤੀ: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "ਹੋਰ ਬਾਕੀ ਸਭ ਗਲਤੀਆਂ ਕੇਵਲ ਟਰਮੀਨਲ ਉੱਤੇ ਹੀ ਵੇਖੋ।"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ਸਕਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ 1 ਸਕਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਕਿੰਟ"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ 1 ਮਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਿੰਟ"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ 1 ਘੰਟਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ %d ਘੰਟੇ"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ 1 ਦਿਨ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਦਿਨ"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 ਹਫਤਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ 1 ਹਫ਼ਤਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ %d ਹਫ਼ਤੇ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ 1 ਮਹੀਨਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਹੀਨੇ"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ਸਾਲ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ਸਾਲ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਾਲ"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤੀ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../filter/filter-datespec.c:290
-#: ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "ਹੁਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "ਮੇਲ ਕਰਨ ਲਈ ਸਮਾਂ ਚੁਣੋ"
 
@@ -11328,58 +11580,60 @@ msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 msgid "Test"
 msgstr "ਜਾਂਚ"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾਂ(_u):"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#| msgid "Find items that meet the following criteria"
+msgid "Find items that meet the following conditions"
 msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "ਫਿਲਟਰ ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
+#: ../filter/filter-rule.c:915
+#| msgid "Add Ac_tion"
+msgid "A_dd Condition"
+msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#| msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#| msgid "If any criteria are met"
+msgid "If any conditions are met"
 msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "ਇਕਾਈ ਖੋਜ(_F):"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "ਜਵਾਬ"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "ਜਵਾਬ ਤੇ ਮੁੱਢਲੇ"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "ਕੋਈ ਜਵਾਬ ਜਾਂ ਮੁੱਢਲਾ ਨਹੀਂ"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:1044
-#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../filter/filter-rule.c:1044
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
@@ -11406,8 +11660,7 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ ਗੁੰਮ ਹੈ।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../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 "ਨਾਂ ਗੁੰਮ ਹੈ।"
 
@@ -11484,8 +11737,7 @@ msgstr "ਭਵਿੱਚ ਵਿੱਚ"
 msgid "months"
 msgstr "ਮਹੀਨੇ"
 
-#: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "ਸਕਿੰਟ"
 
@@ -11497,11 +11749,11 @@ msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
 msgid "the time you specify"
 msgstr "ਸਮਾਂ ਜੋ ਤੁਸੀਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਹੈ"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-contacts-source.c:369
 msgid "weeks"
 msgstr "ਹਫਤੇ"
 
@@ -11509,15 +11761,15 @@ msgstr "ਹਫਤੇ"
 msgid "years"
 msgstr "ਸਾਲ"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸੋਧ"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "ਨਿਯਮ ਨਾਂ"
 
@@ -11538,9 +11790,8 @@ msgid "Configure your email accounts here"
 msgstr "ਆਪਣਾ ਈ-ਮੇਲ ਅਕਾਊਂਟ ਇੱਥੇ ਸੰਰਚਿਤ ਕਰੋ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Configure your network connection settings here"
-msgstr "ਆਪਣਾ ਈ-ਮੇਲ ਅਕਾਊਂਟ ਇੱਥੇ ਸੰਰਚਿਤ ਕਰੋ"
+msgstr "ਆਪਣੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸਥਾਪਨ ਇੱਥੇ ਸੰਰਚਿਤ ਕਰੋ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
@@ -11567,16 +11818,12 @@ msgid "Evolution Mail preferences control"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਪਸੰਦ ਕੰਟਰੋਲ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Network configuration control"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597
-#: ../mail/mail-component.c:598
+#: ../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"
@@ -11588,25 +11835,25 @@ msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "ਕੰਪੋਜ਼ਰ ਪਸੰਦ"
+msgstr "ਨੈੱਟਵਰਕ ਪਸੰਦ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11619,76 +11866,64 @@ msgstr ""
 "ਜੋ ਕਿ %s ਲਈ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ\n"
 "ਅਤੇ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਜਾਂਚ ਬਕਸੇ ਤੇ ਕਲਿੱਕ ਕਰੋ\n"
 
-#: ../mail/em-account-editor.c:466
-#: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-account-editor.c:590
-#: ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702
-#: ../widgets/misc/e-signature-combo-box.c:97
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "ਸਵੈ-ਨਿਰਮਤ"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../mail/em-account-editor.c:1810
-#: ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1859
-#: ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "ਈ-ਮੇਲ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "ਮਿੰਟ(_t)"
 
-#: ../mail/em-account-editor.c:2327
-#: ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "ਈ-ਮੇਲ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2386
-#: ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452
-#: ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "ਸੁਰੱਖਿਆ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489
-#: ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2490
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
 
@@ -11705,42 +11940,51 @@ msgstr "ਅਕਾਊਂਟ ਨਾਂ"
 msgid "Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../mail/em-composer-prefs.c:303
-#: ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158
-#: ../mail/mail-signature-editor.c:478
+#: ../mail/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 "ਬੇ-ਨਾਂ"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:1148
-#: ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1602
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "ਅਣਜਾਣਾ ਭੇਜਣ ਵਾਲਾ"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵਜੇ ${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
+#: ../mail/em-composer-utils.c:2105
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵਜੇ "
+"${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "--------ਅਸਲੀ ਸੁਨੇਹਾ--------"
 
@@ -11791,11 +12035,9 @@ msgid "Date sent"
 msgstr "ਭੇਜਣ ਮਿਤੀ"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
-#: ../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
+#: ../plugins/groupwise-features/share-folder.c:768
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "ਹਟਾਓ"
@@ -11844,8 +12086,7 @@ msgstr "ਸਮੀਕਰਨ"
 msgid "Follow Up"
 msgstr "ਪਿੱਛੇ ਜਾਓ"
 
-#: ../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 "ਲਾਜ਼ਮੀ"
 
@@ -11873,8 +12114,7 @@ msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
 msgid "is set"
 msgstr "ਸੈੱਟ ਹੈ"
 
-#: ../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 "ਫਜ਼ੂਲ"
@@ -11883,8 +12123,7 @@ msgstr "ਫਜ਼ੂਲ"
 msgid "Junk Test"
 msgstr "ਕੂੜ ਜਾਂਚ"
 
-#: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "ਲੇਬਲ"
 
@@ -11924,52 +12163,52 @@ msgstr "ਕਾਰਜ ਨਾਲ ਸ਼ਾਮਿਲ"
 msgid "Play Sound"
 msgstr "ਅਵਾਜ਼ ਚਲਾਓ"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53
-#: ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "ਪੜ੍ਹੋ"
 
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex ਮੇਲ"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "ਜਵਾਬ ਭੇਜਿਆ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "ਵਾਪਸ"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "ਜਿਆਦਾ ਵਾਪਿਸ ਕਰੇ"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "ਘੱਟ ਵਾਪਿਸ ਕਰੇ"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
-#: ../mail/em-filter-i18n.h:61
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ਸਕੋਰ"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
+#: ../mail/em-filter-i18n.h:62
+#| msgid "Send Receipt"
+msgid "Sender or Recipients"
+msgstr "ਭੇਜਣ ਵਾਲਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "ਲੇਬਲ ਸੈੱਟ"
@@ -12002,14 +12241,11 @@ msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ"
 msgid "Stop Processing"
 msgstr "ਕਾਰਵਾਈ ਰੋਕੋ"
 
-#: ../mail/em-filter-i18n.h:72
-#: ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889
-#: ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:311
+#: ../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 "ਵਿਸ਼ਾ"
 
@@ -12018,64 +12254,64 @@ msgid "Unset Status"
 msgstr "ਸਥਿਤੀ ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "ਐਕਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "ਬਿਨ-ਲੇਬਲ"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "ਤਾਜ਼ੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "ਆਖਰੀ 5 ਦਿਨਾਂ ਦੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "ਨੱਥੀ ਸਮੇਤ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "ਖਾਸ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "ਨਾ-ਕੂੜਾ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਖੋਜ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ਨਾ ਪੜੇ ਸੁਨੇਹੇ:"
@@ -12083,30 +12319,32 @@ msgstr[1] "ਨਾ ਪੜਿਆ ਸੁਨੇਹੇ:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ਕੁੱਲ ਸਨੇਹੇ:"
 msgstr[1] "ਕੁੱਲ ਸਨੇਹੇ:"
 
-#: ../mail/em-folder-properties.c:193
-#: ../mail/em-folder-properties.c:195
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "ਕੋਟਾ (%s) ਵਰਤੇ ਕੇ:"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "ਕੁੱਲ ਸਨੇਹੇ:"
+msgstr "ਕੋਟਾ ਵਰਤੋਂ"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355
-#: ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
@@ -12123,38 +12361,36 @@ msgstr "ਬਣਾਓ(_r)"
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
-#. load store to mail component at the end, when everything is loaded
-#: ../mail/em-folder-tree-model.c:204
-#: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970
-#: ../mail/mail-vfolder.c:1027
+#. load store to mail component
+#: ../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 "ਖੋਜ ਫੋਲਡਰ"
 
 #  UNMATCHED is always last
 #. 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 "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:504
-#: ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "ਟੈਪਲੇਟ"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: ../mail/em-folder-tree-model.c:512
-#: ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
-#: ../mail/em-folder-tree-model.c:534
-#: ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
@@ -12174,10 +12410,10 @@ msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 #. * from your translation.
 #.
 #: ../mail/em-folder-tree.c:380
-#, fuzzy, c-format
+#, c-format
 msgctxt "folder-display"
 msgid "%s (%u)"
-msgstr "%s (...)"
+msgstr "%s (%u)"
 
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
@@ -12193,14 +12429,12 @@ msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:909
-#: ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:911
-#: ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਨਕਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
@@ -12209,467 +12443,468 @@ msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਨਕਲ ਕੀਤ�
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸੁਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../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 "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 
-#: ../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 "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
 
-#: ../mail/em-folder-tree.c:1718
-#: ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱਚ ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "ਨਵੇਂ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-tree.c:2114
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "ਆਉਟਬਾਕਸ ਫਲੱਸ਼(_u)"
 
-#: ../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 "ਰੱਦੀ ਖਾਲੀ(_E)"
 
-#: ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2243
+#| msgid "Create _Search Folder"
+msgid "_Unread Search Folder"
+msgstr "ਖੋਜ ਫੋਲਡਰ ਅਣ-ਪੜ੍ਹਿਆ(_U)"
+
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ਨੂੰ `%s' ਵਿੱਚ ਨਕਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "ਨਕਲ(_o)"
 
-#: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:532
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "ਫੋਲਡਰ `%s' ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਫੋਲਡਰ ਕਿੱਥੇ ਬਣਾਇਆ ਜਾਵੇ:"
 
-#: ../mail/em-folder-view.c:1090
-#: ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ਮੇਲ ਹਟਾਉਣਾ ਫੇਲ੍ਹ"
 
-#: ../mail/em-folder-view.c:1091
-#: ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../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 "ਅੱਗੇ ਭੇਜੋ(_F)"
 
 #. 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 "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "ਨਾ-ਹਟਾਏ(_n)"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "ਪੜ੍ਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_k)"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "ਖਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_I)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "ਨਾ-ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾਓ(_i)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "ਰੱਦੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_J)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "ਲੇਬਲ(_L)"
 
 #. 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 "ਕੋਈ ਨਹੀਂ(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "ਨਵਾਂ ਲੇਬਲ(_N)"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "ਸੁਨੇਹੇ ਤੋਂ ਨਿਯਮ ਬਣਾਓ"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "ਵਿਸ਼ੇ ਤੋਂ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_S)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_n)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "ਸਿਰਨਾਵੀਂ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_R)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_L)"
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_L)"
 
 #. 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 "ਵਿਸ਼ੇ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_j)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_d)"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "ਸੁਨੇਹੀਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_c)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_M)"
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_M)"
 
 #  default charset used in mail view
 #. 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
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:510
+#: ../plugins/google-account-setup/google-source.c:708
 msgid "Default"
 msgstr "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "ਕਾਲ ਕਰੋ(_a)..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
-msgstr "ਇਸ ਐਡਰੈੱਸ ਤੋਂ(_F)"
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
-msgstr "ਇਸ ਐਡਰੈੱਸ ਲਈ(_T)"
+msgstr "ਇਸ ਸਿਰਨਾਵਾਂ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
-msgstr "ਐਡਰੈੱਸ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
+msgstr "ਸਿਰਨਾਵਾਂ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
 
 #  message-search popup match count string
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "ਖੋਜ(_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "ਪਿੱਛੇ(_P)"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "ਮਿਲਦੇ ਸਭ(_a)"
 
-#: ../mail/em-format-html-display.c:947
-#: ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:947
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:948
-#: ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:948
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+#: ../mail/em-format-html-display.c:952
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਹੈ ਅਤੇ ਜਾਇਜ ਮਤਲਬ ਵੀ ਹੈ, ਪਰ ਇਹ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਲੱਗਦਾ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:949
-#: ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:949
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: ../mail/em-format-html-display.c:953
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:950
-#: ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
 
-#: ../mail/em-format-html-display.c:950
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:954
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਜਾਇਜ ਹਨ, ਪਰ ਇਸ ਦੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਾਂਚਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:951
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤਖਤ ਮੌਜੂਦ ਹਨ, ਪਰ ਪਬਲਿਕ ਕੁੰਜੀ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/em-format-html-display.c:951
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:955
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
 
-#: ../mail/em-format-html-display.c:958
-#: ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:958
-msgid "This message is not encrypted. Its content may be viewed in transit across the 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 "ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ ਸਕਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:959
-#: ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
 
-#: ../mail/em-format-html-display.c:959
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
+#: ../mail/em-format-html-display.c:963
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
+"ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:960
-#: ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:960
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: ../mail/em-format-html-display.c:964
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਹੈ, ਇਸ ਸੁਨੇਹੇ ਦੇ ਕਿਸੇ ਭਾਗ ਨੂੰ ਬਾਹਰੋਂ ਵੇਖਣਾ ਸੰਭਵ ਨਹੀਂ ਹੋਵੇਗਾ।"
 
-#: ../mail/em-format-html-display.c:961
-#: ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "ਇੰਕ੍ਰਿਪਟ, ਸਖਤ"
 
-#: ../mail/em-format-html-display.c:961
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
+#: ../mail/em-format-html-display.c:965
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
+"ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:1062
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ਵਜੇ ਸਮਾਪਤ"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "ਲਾਇਨ 'ਚ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲੋ"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "ਸਭ ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ਨੱਥੀ(_t)"
 msgstr[1] "%d ਨੱਥੀ(_t)"
 
-#: ../mail/em-format-html-display.c:2112
-#: ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
 
-#: ../mail/em-format-html-display.c:2338
-#: ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਓਹਲੇ(_U)"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(_p)"
 
-#: ../mail/em-format-html-display.c:2468
-#, fuzzy
-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 "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਸੰਪਾਦਕ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
+#: ../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 ""
+"ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ "
+"ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਪਾਠ ਸੰਪਾਦਕ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2d ਦਾ %1d ਸਫਾ"
 
-#: ../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 "%s ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
@@ -12690,12 +12925,12 @@ msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਸੰਕੇਤਕ"
 #: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
+msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
 
 #: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
+msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
 
 #: ../mail/em-format-html.c:997
 #, c-format
@@ -12715,29 +12950,22 @@ msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰ�
 msgid "Formatting Message..."
 msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/em-format-html.c:1563
-#: ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209
-#: ../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:209
-#: ../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
 #. pseudo-header
-#: ../mail/em-format-html.c:1744
-#: ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
@@ -12755,142 +12983,135 @@ 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 "ਇਹ ਸੁਨੇਹਾ <b>%s</b> ਵਲੋਂ <b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
 
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75
-#: ../mail/message-list.etspec.h:7
+#: ../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 "ਵਲੋਂ"
 
-#: ../mail/em-format-quote.c:209
-#: ../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 "ਇਸ ਨੂੰ ਜਵਾਬ"
 
-#: ../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 "ਮਿਤੀ"
 
-#: ../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 "ਖਬਰਸਾਰ ਸਮੂਹ"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "ਫੇਸ"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1336
-#: ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1581
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "PGP ਸੁਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ਸੁਨੇਹੇ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "ਹਰ ਸਮੇਂ"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "ਹੈੱਡਰ ਨਾਂ:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "ਹੈੱਡਰ ਮੁੱਲ ਰੱਖਦਾ ਹੈ:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "ਮੁੱਲ ਰੱਖਦਾ ਹੈ"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "ਰੰਗ"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "ਟੈਗ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078
-#: ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਹੈ ਅਤੇ ਬਾਈਨਰੀ ਇੰਸਟਾਲ ਹੈ।"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086
-#: ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਚੈੱਕ ਕਰੋ ਕੀ ਕਿ ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "ਕੋਈ ਜੰਕ ਪਲੱਗਇਨ ਨਹੀਂ ਹੈ"
 
@@ -12922,7 +13143,8 @@ msgstr "`%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 ""
@@ -12945,16 +13167,16 @@ msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖੀ ਡਾਟਾ ਡਾਇਰੈਕਟ
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਡਾਟਾ `%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 "ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "ਸਥਾਨਕ ਪੱਤਰ ਸੰਭਾਲ`%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 ""
@@ -12962,116 +13184,113 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s' ਤੇ ਲੋਕਲ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "`%s' ਤੇ ਸਥਾਨਕ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2982
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸੈਟਿੰਗ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
+#: ../mail/em-migrate.c:3053
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸੈਟਿੰਗ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ "
+"ਹੋ ਗਈ ਹੈ।"
 
-#: ../mail/em-popup.c:564
-#: ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../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 "ਲਿਸਟ ਨੂੰ ਜਵਾਬ(_L)"
+msgstr "ਸੂਚੀ ਨੂੰ ਜਵਾਬ(_L)"
 
 #. 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 "ਐਡਰੈੱਸ-ਬੁੱਕ 'ਚ ਜੋੜੋ(_A)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ 'ਚ ਜੋੜੋ(_A)"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ਇਹ ਭੰਡਾਰ ਮੈਂਬਰ ਲਈ ਸਹਾਈ ਨਹੀਂ ਜਾਂ ਇਹ ਯੋਗ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਸਰਵਰ ਚੁਣੋ।"
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "ਕੋਈ ਸਰਵਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)।"
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
-msgstr "ਐਡਰੈੱਸ ਜੋੜ੍ਹੋ"
+msgstr "ਸਿਰਨਾਵਾਂ ਜੋੜ੍ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹਾ"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸਰੋਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
+msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਝਰੋਖਾ ਉਚਾਈ"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋਜ਼ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+msgstr "\"ਡਾਕ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਝਰੋਖਾ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Send and Receive Mail\" window width"
-msgstr "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
+msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਝਰੋਖਾ ਚੌੜਾਈ"
 
 #: ../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"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸੀਮਿਤ ਆਕਾਰ ਦਾ ਟੈਕਸਟ ਵੇਖਾਉਣ ਦਿਓ"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਹਮੇਸ਼ਾ ਮੰਗ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀ ਨੂੰ ਵੇਖਾਏ ਜਾਣ ਦਾ ਸਮਾਂ ਸਕਿੰਟਾਂ ਵਿੱਚ।"
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਈਮੋਸ਼ਨ ਪਛਾਣ"
@@ -13106,15 +13325,21 @@ msgstr "ਕੰਪੋਜ਼ਰ ਲੋਡ/ਅਟੈਂਚ ਡਾਇਰੈਕਟਰ
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "TO/CC/BCC ਵਿੱਚ ਛੋਟਾ ਐਡਰੈੱਸ ਵੇਖਾਓ"
+msgstr "TO/CC/BCC ਵਿੱਚ ਛੋਟਾ ਸਿਰਨਾਵਾਂ ਵੇਖਾਓ"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-msgstr "TO/CC/B_CC ਵਿੱਚ ਐਡਰੈੱਸ ਗਿਣਤੀ ਵਿੱਚ ਦਿੱਤੇ ਨੰਬਰਾਂ ਮੁਤਾਬਕ ਛੋਟਾ ਐਡਰੈੱਸ ਵੇਖਾਓ।"
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr "TO/CC/B_CC ਵਿੱਚ ਸਿਰਨਾਵਾਂ ਗਿਣਤੀ ਵਿੱਚ ਦਿੱਤੇ ਨੰਬਰਾਂ ਮੁਤਾਬਕ ਛੋਟਾ ਸਿਰਨਾਵਾਂ ਵੇਖਾਓ।"
 
 #: ../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 "ਕੰਟਰੋਲ, ਕਿਸ ਤੇਜ਼ੀ ਨਾਲ ਲੋਕਲ ਬਦਲਾਅ ਰਿਮੋਟ ਮੇਲ ਸਰਵਰ ਨਾਲ ਸਮਕਾਲੀ ਕੀਤੇ ਜਾਣ। ਅੰਤਰਾਲਘੱਟੋ-ਘੱਟ 30 ਸਕਿੰਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"ਕੰਟਰੋਲ, ਕਿਸ ਤੇਜ਼ੀ ਨਾਲ ਸਥਾਨਕ ਬਦਲਾਅ ਰਿਮੋਟ ਮੇਲ ਸਰਵਰ ਨਾਲ ਸਮਕਾਲੀ ਕੀਤੇ ਜਾਣ। ਅੰਤਰਾਲਘੱਟੋ-ਘੱਟ 30 "
+"ਸਕਿੰਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 #, fuzzy
@@ -13122,8 +13347,12 @@ msgid "Custom headers to use while checking for junk."
 msgstr "ਜੰਕ ਵਾਸਤੇ ਚੈੱਕ ਕਰਨ ਲਈ ਹੈੱਡਰ ਦਿਓ।"
 
 #: ../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 "ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਦੇ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਪਸੰਦੀਦਾ ਹੈੱਡਰ। ਲਿਸਟ ਇਕਾਈਆਂ \"headername=value\" ਫਾਰਮੈਟ ਦੀ ਲਾਈਨ ਦੇ ਰੂਪ 'ਚ ਹਨ।"
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਦੇ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਪਸੰਦੀਦਾ ਹੈੱਡਰ। ਸੂਚੀ ਇਕਾਈਆਂ \"headername=value\" "
+"ਫਾਰਮੈਟ ਦੀ ਲਾਈਨ ਦੇ ਰੂਪ 'ਚ ਹਨ।"
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13178,15 +13407,27 @@ msgid "Default width of the subscribe dialog."
 msgstr "ਮੈਂਬਰੀ ਡਾਈਲਾਗ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local addressbook only"
-msgstr "ਦੱਸੋ ਕਿ ਕੀ ਜੰਕ ਫਿਲਟਰਿੰਗ ਲਈ ਐਡਰੈੱਸ ਕੇਵਲ ਲੋਕਲ ਐਡਰੈੱਸਬੁੱਕ 'ਚ ਹੀ ਖੋਜੇ ਜਾਣ।"
+#, fuzzy
+#| msgid ""
+#| "Determines whether to look up addresses for junk filtering in local "
+#| "addressbook only"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr "ਦੱਸੋ ਕਿ ਕੀ ਜੰਕ ਫਿਲਟਰਿੰਗ ਲਈ ਸਿਰਨਾਵਾਂ ਕੇਵਲ ਸਥਾਨਕ ਸਿਰਨਾਵਾਂਬੁੱਕ 'ਚ ਹੀ ਖੋਜੇ ਜਾਣ।"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "ਦੱਸੋ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲਾ ਈਮੇਲ ਐਡਰੈੱਸਬੁੱਕ 'ਚ ਖੋਜਿਆ ਜਾਵੇ"
+#, fuzzy
+#| msgid "Determines whether to lookup in addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "ਦੱਸੋ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲਾ ਈਮੇਲ ਸਿਰਨਾਵਾਂਬੁੱਕ 'ਚ ਖੋਜਿਆ ਜਾਵੇ"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid "Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion."
+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 ""
 
 #: ../mail/evolution-mail.schemas.in.h:36
@@ -13194,11 +13435,16 @@ msgid "Determines whether to use custom headers to check for junk"
 msgstr "ਦੱਸੋ ਕਿ ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਸਮੇਂ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਵਰਤੇ ਜਾਣ"
 
 #: ../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."
+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 ""
 
 #: ../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."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:39
@@ -13210,7 +13456,7 @@ msgid "Directory for saving mail component files."
 msgstr "ਮੇਲ ਭਾਗ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਵਾਸਤੇ ਡਾਇਰੈਟਰੀ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:42
@@ -13254,12 +13500,20 @@ msgid "Enable search folders on startup."
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ।"
 
 #: ../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 "ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼ੁਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ ਹੈ ਕਿ ਤੁਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ ਚਲੀ ਜਾਵੇ।"
+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 ""
+"ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼ੁਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ ਹੈ "
+"ਕਿ ਤੁਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ ਚਲੀ ਜਾਵੇ।"
 
 #: ../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 "ਇਸ ਨੂੰ ਯੋਗ ਕਰਨ ਨਾਲ ਸਪੇਸ ਬਾਰ ਸਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ, ਸੁਨੇਹਾ ਲਿਸਟ ਅਤੇ ਫੋਲਡਰ ਵਿੱਚ ਸਕਰੋਲ ਕਰੇਗੀ। "
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr "ਇਸ ਨੂੰ ਯੋਗ ਕਰਨ ਨਾਲ ਸਪੇਸ ਬਾਰ ਸਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ, ਸੁਨੇਹਾ ਸੂਚੀ ਅਤੇ ਫੋਲਡਰ ਵਿੱਚ ਸਕਰੋਲ ਕਰੇਗੀ। "
 
 #: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
@@ -13269,501 +13523,617 @@ msgstr "ਰੈਡਰ ਸੁਨੇਹਾ ਟੈਕਸਟ ਭਾਗ ਨੂੰ ਸ�
 msgid "Enable/disable caret mode"
 msgstr "ਕਾਰਟੀ ਮੋਡ ਯੋਗ/ਅਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Height of the message-list pane"
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ"
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Height of the message-list pane."
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
+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 "ਪਰ-ਫੋਲਡਰ ਝਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
+msgid "Height of the message-list pane"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਪੱਟੀ ਦੀ ਉਚਾਈ"
 
 #: ../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 "ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ 10 ਜਾਂ ਵਧੇਰੇ ਸੁਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ।"
+msgid "Height of the message-list pane."
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "ਜੇਕਰ \"ਝਲਕ\" ਬਾਹੀ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਇਹ ਨਾਲ-ਨਾਲ ਹੀ ਵੇਖਾਏਗਾ, ਨਾ ਕਿ ਲੰਬਕਾਰੀ ਰੂਪ ਵਿੱਚ।"
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "ਪਰ-ਫੋਲਡਰ ਝਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
 
 #: ../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 "ਇੱਕ ਖਾਸ mime ਕਿਸਮ ਲਈ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ, ਕਿਸੇ mime ਕਿਸਮ ਨੂੰ ਇਸ ਲਿਸਟ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ mime ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
+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 ""
+"ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ 10 ਜਾਂ ਵਧੇਰੇ ਸੁਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ "
+"ਚਾਹੁੰਦਾ ਹੈ।"
 
 #: ../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 "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋਜ਼ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr "ਜੇਕਰ \"ਝਲਕ\" ਬਾਹੀ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਇਹ ਨਾਲ-ਨਾਲ ਹੀ ਵੇਖਾਏਗਾ, ਨਾ ਕਿ ਲੰਬਕਾਰੀ ਰੂਪ ਵਿੱਚ।"
 
 #: ../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."
+#, 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."
+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 ""
+"ਇੱਕ ਖਾਸ mime ਕਿਸਮ ਲਈ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ, ਕਿਸੇ mime ਕਿਸਮ ਨੂੰ ਇਸ ਸੂਚੀ ਵਿੱਚ "
+"ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ mime ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
 
 #: ../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 "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋਜ਼ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਝਰੋਖੇ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ "
+"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪੁੱਛਣ ਨੂੰ ਯੋਗ/ਆਯੋਗ ਕਰਦਾ ਹੈ।"
+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 ""
 
 #: ../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 "ਲਗਾਤਾਰ ਪਰੌਉਟ ਆਯੋਗ/ਯੋਗ ਕਰਦਾ ਹੈ, ਜੇ ਆਫਲਾਈਨ ਸਿਕਰੋ (sync) ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਜਾਣ ਲਈ ਲਾਜ਼ਮੀ ਹੋਵੇ।"
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਝਰੋਖੇ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ "
+"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
 
 #: ../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 ""
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪੁੱਛਣ ਨੂੰ ਯੋਗ/ਆਯੋਗ ਕਰਦਾ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Last time empty junk was run"
-msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਸੀ"
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+"ਲਗਾਤਾਰ ਪਰੌਉਟ ਆਯੋਗ/ਯੋਗ ਕਰਦਾ ਹੈ, ਜੇ ਆਫਲਾਈਨ ਸਿਕਰੋ (sync) ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਜਾਣ ਲਈ ਲਾਜ਼ਮੀ "
+"ਹੋਵੇ।"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Last time empty trash was run"
-msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦ ਖਾਲੀ ਕਰਨ ਦਾ ਸਮਾਂ"
+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 ""
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
+msgid "Last time empty junk was run"
+msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਸੀ"
 
 #: ../mail/evolution-mail.schemas.in.h:71
+msgid "Last time empty trash was run"
+msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦ ਖਾਲੀ ਕਰਨ ਦਾ ਸਮਾਂ"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
-msgstr "ਲੇਬਲ ਲਿਸਟ ਅਤੇ ਸੰਬੰਧਿਤ ਰੰਗ"
+msgstr "ਲੇਬਲ ਸੂਚੀ ਅਤੇ ਸੰਬੰਧਿਤ ਰੰਗ"
 
-#: ../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"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "ਬੋਨਬੋ ਭਾਗ ਦਰਸ਼ਕ ਦੀ ਜਾਂਚ ਲਈ mime ਕਿਸਮ ਲਿਸਟ"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "ਮਨਜ਼ੂਰ ਲਾਈਸੈਂਸਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
 
-#: ../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 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਲਿਸਟ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /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 ""
+"ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਸੂਚੀ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /"
+"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 "ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਸੂਚੀ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
 
-#: ../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 "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
 
-#: ../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 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਲਈ ਪਛਾਣ ਦੀ ਲੇਬਲ ਲਿਸਟ ਹੈ। ਇਹ ਲਿਸਟ ਉਹ ਸਾਰੇ ਰੰਗ ਰੱਖਦੀ ਹੈ, ਜੋ ਕਿ HTML ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "ਬੋਨਬੋ ਭਾਗ ਦਰਸ਼ਕ ਦੀ ਜਾਂਚ ਲਈ mime ਕਿਸਮ ਲਿਸਟ"
+#: ../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 ""
+"ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਲਈ ਪਛਾਣ ਦੀ ਲੇਬਲ ਸੂਚੀ ਹੈ। ਇਹ ਸੂਚੀ ਉਹ ਸਾਰੇ ਰੰਗ ਰੱਖਦੀ ਹੈ, ਜੋ ਕਿ HTML "
+"ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
 
-#: ../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 "ਪਰੋਟੋਕੋਲਾਂ ਨਾਂ ਦੀ ਲਿਸਟ, ਜਿਹਨਾਂ ਦਾ ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../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"
+msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸੁਨੇਹੇ ਲਈ http ਤੋਂ ਚਿੱਤਰ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../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 "http(s) ਉੱਤੇ HTML ਸੁਨੇਹਿਆਂ ਲਈ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ। ਸੰਭਵ ਮੁੱਲ ਹਨ 0- ਕਦੇ ਨਹੀਂ 1- ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਤਾਂ ਹੀ ਕਰੋ, ਜੇਕਰ ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਵੇ 2 ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰੋ।"
+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 ""
+"http(s) ਉੱਤੇ HTML ਸੁਨੇਹਿਆਂ ਲਈ ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ। ਸੰਭਵ ਮੁੱਲ ਹਨ 0- ਕਦੇ ਨਹੀਂ 1- ਚਿੱਤਰ "
+"ਡਾਊਨਲੋਡ ਤਾਂ ਹੀ ਕਰੋ, ਜੇਕਰ ਭੇਜਣ ਵਾਲਾ ਸਿਰਨਾਵਾਂ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਵੇ 2 ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ ਚਿੱਤਰ ਡਾਊਨਲੋਡ "
+"ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱਗ ਫਾਇਲ ਲਈ ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "ਸੁਨੇਹਾ-ਝਲਕ ਸਟਾਇਲ (\"ਸਧਾਰਨ\", \"ਪੂਰਾ ਹੈੱਡਰ\", \"ਸਰੋਤ\")"
+msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਸ਼ੈਲੀ (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../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 "ਬੰਦ ਕਰਨ ਉੱਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਸਮਾਂ ਦਿਨਾਂ ਵਿੱਚ।"
 
-#: ../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 "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਅੰਤਰਾਲ ਦਿਨਾਂ ਵਿੱਚ ਹੈ।"
 
-#: ../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 "ਵੱਲ/CC/BCC ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਸਿਰਨਾਵੀਆਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "ਖਾਲੀ ਵਿਸ਼ੇ ਤੇ ਪੁੱਛੋ"
 
-#: ../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 "ਜਦੋਂ ਯੂਜ਼ਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../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 "ਚੈੱਕ ਕਰਨ ਲਈ ਪੁੱਛੋ, ਜੇ ਯੂਜ਼ਰ ਤੁਰੰਤ ਹੀ ਆਫਲਾਇਨ ਜਾਣਾ ਚਾਹੁੰਦਾ ਹੋਵੇ"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਹੋਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "ਜੇਕਰ ਸਿਰਫ 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 "ਜਦੋਂ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ 10 ਸੁਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../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 "ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸੁਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹਨ, ਤਾਂ ਪੁੱਛੋ।"
+#: ../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 ""
+"ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸੁਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਹਨ, ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ 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 "ਜਦੋਂ ਯੂਜ਼ਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰਨੇ ਹੋਣ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../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 "ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "ਟੈਕਸਟ ਵਿੱਚ ਲਿੰਕਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਤਬਦੀਲ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "ਆ ਰਹੀਆਂ ਮੇਲਾਂ ਲਈ ਜੰਕ ਟੈਸਟ ਚਲਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸਬੁੱਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਫੋਟੋ ਦੀ ਖੋਜ"
+#: ../mail/evolution-mail.schemas.in.h:116
+#, fuzzy
+#| msgid "Search for the sender photo in local addressbooks"
+msgid "Search for the sender photo in local address books"
+msgstr "ਸਥਾਨਕ ਸਿਰਨਾਵਾਂਬੁੱਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਫੋਟੋ ਦੀ ਖੋਜ"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "ਮੂਲ HTML ਪੱਤਰ ਭੇਜੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "ਮੂਲ 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 "ਸੁਨੇਹਾ ਲਿਸਟ ਵਿੱਚ ਸੁਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਸੁਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 #, fuzzy
 msgid "Server synchronization interval"
 msgstr "ਸਿਕਰੋਨਾਈਜ਼ ਚੋਣ(_S)..."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "ਸਜੀਵਤਾ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "ਸਜੀਵ ਸੁਨੇਹੇ ਸਜੀਵ ਹੀ ਵੇਖਾਓ।"
 
-#: ../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 "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ (ਵਿੰਨੇ ਹੋਏ)।"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ (ਵਿੰਨੇ ਹੋਏ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Show the email-address of the sender in a separate column in the message list."
-msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਵਿੱਚ ਵੱਖਰੇ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਵੱਖਰੇ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../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 "ਸੁਨੇਹਾ ਪੜ੍ਹਨ ਪੈਂਨ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 #, fuzzy
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 #, fuzzy
 msgid "Spell checking languages"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "ਮੂਲ ਉਚਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "ਮੂਲ ਚੌੜਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "ਟਰਮੀਨਲ ਫੋਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "ਟੈਕਸਟ ਸੁਨੇਹਾ ਭਾਗ ਸੀਮਾ"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "ਜੰਕ ਹੁੱਕ ਲਈ ਡਿਫਾਲਟ ਪਲੱਗਇਨ"
 
-#: ../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 "ਆਖਰੀ ਵਾਰ ਜੰਕ ਖਾਲ ਕੀਤਾ ਗਿਆ ਸੀ, ਇੰਨ੍ਹੇ ਦਿਨ ਪਹਿਲਾਂ।"
 
-#: ../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 "ਕਾਫੀ ਦਿਨ ਪਹਿਲਾਂ ਰੱਦੀ ਖਾਲੀ ਕੀਤੀ ਸੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਟਰਮੀਨਲ ਫੋਂਟ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵੇਰੀਬਲ ਚੌੜੇ ਫੋਂਟ ਹਨ।"
 
-#: ../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 "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ \"0\"। ਚੇਤਾਵਨੀ ਲਈ \"1\"। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ \"2\"।"
-
-#: ../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 "ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਮੂਲ 4MB / 4097 KB ਹੈ ਅਤੇ 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 "ਇਹ ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ ਹੈ, ਭਾਵੇਂ ਕਿ ਕਈ ਪਲੱਗਇਨ ਯੋਗ ਹਨ। ਜੇ ਡਿਫਾਲਟ ਦਿੱਤੀ ਪਲੱਗਇਨ ਆਯੋਗ ਹੈ ਤਾਂ ਇਹ ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ \"0\"। ਚੇਤਾਵਨੀ ਲਈ \"1\"। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ \"2\"।"
 
 #: ../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 "ਇਹ ਕੀ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੈ ਅਤੇ ਪੜ੍ਹਨ ਬਾਅਦ \"ਗਲਤ\" ਲਈ ਰੀ-ਸੈੱਟ ਕੀਤਾ ਹੈ। ਲਿਸਟ ਵਿੱਚਇਹ ਮੇਲ ਅਣ-ਚੁਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
+#, 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 interms of KB."
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr ""
+"ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਸਕਦਾ "
+"ਹੈ। ਮੂਲ 4MB / 4097 KB ਹੈ ਅਤੇ 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 "ਇਸ ਕੀ ਵਿੱਚ XML ਢਾਂਚਾ ਦਿੱਤਾ ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਸ਼ਾਮਿਲ ਹੈ ਅਤੇ ਕੀ ਇਹ ਵੇਖਾਏ ਜਾਣ ਜਾਂ ਨਾ। XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਟਾਇਟਲ ਯੋਗ&gt; - ਸੈੱਟ ਕਰੋ, ਜੇਕਰ ਮੇਲ ਝਲਕ ਵਿੱਚ ਤੁਸੀਂ ਹੈੱਡਰ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
+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 ""
+"ਇਹ ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ ਹੈ, ਭਾਵੇਂ ਕਿ ਕਈ ਪਲੱਗਇਨ ਯੋਗ ਹਨ। ਜੇ ਡਿਫਾਲਟ ਦਿੱਤੀ ਪਲੱਗਇਨ ਆਯੋਗ ਹੈ ਤਾਂ ਇਹ "
+"ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
 
 #: ../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 addressbook only to exclude mail sent by known contacts from junk filtering."
+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 ""
+"ਇਹ ਕੀ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੈ ਅਤੇ ਪੜ੍ਹਨ ਬਾਅਦ \"ਗਲਤ\" ਲਈ ਰੀ-ਸੈੱਟ ਕੀਤਾ ਹੈ। ਸੂਚੀ ਵਿੱਚਇਹ ਮੇਲ ਅਣ-"
+"ਚੁਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:146
-msgid "This option would help in improving the speed of fetching."
-msgstr "ਇਹ ਚੋਣ ਲੈਣ ਦੀ ਸਪੀਡ ਸੁਧਾਰਨ ਲਈ ਮੱਦਦ ਕਰੇਗੀ।"
+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 ""
+"ਇਸ ਕੀ ਵਿੱਚ XML ਢਾਂਚਾ ਦਿੱਤਾ ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਸੂਚੀ ਸ਼ਾਮਿਲ ਹੈ ਅਤੇ ਕੀ ਇਹ ਵੇਖਾਏ ਜਾਣ ਜਾਂ ਨਾ। "
+"XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਟਾਇਟਲ ਯੋਗ&gt; - ਸੈੱਟ ਕਰੋ, ਜੇਕਰ ਮੇਲ ਝਲਕ ਵਿੱਚ ਤੁਸੀਂ ਹੈੱਡਰ ਵੇਖਣਾ "
+"ਚਾਹੁੰਦੇ ਹੋ।"
 
 #: ../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 "ਇਹ ਡਿਫਾਲਟ ਸੁਨੇਹਾ ਲਿਸਟ ਝਲਕ ਵਿੱਚ ਐਡਰੈੱਸਾਂ ਦੀ ਗਿਣਤੀ ਸੈੱਟ ਕਰਦੀ ਹੈ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਇੱਕ '...' ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+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 ""
 
 #: ../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 "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
+msgid "This option would help in improving the speed of fetching."
+msgstr "ਇਹ ਚੋਣ ਲੈਣ ਦੀ ਸਪੀਡ ਸੁਧਾਰਨ ਲਈ ਮੱਦਦ ਕਰੇਗੀ।"
 
 #: ../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 "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਥਰਿੱਡਾਂ ਨੂੰ ਹਰੇਕ ਥਰਿੱਡ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਿਆਂ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"ਇਹ ਡਿਫਾਲਟ ਸੁਨੇਹਾ ਸੂਚੀ ਝਲਕ ਵਿੱਚ ਸਿਰਨਾਵਾਂਾਂ ਦੀ ਗਿਣਤੀ ਸੈੱਟ ਕਰਦੀ ਹੈ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਇੱਕ '...' "
+"ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
 
 #: ../mail/evolution-mail.schemas.in.h:150
-msgid "Thread the message list."
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਥਰਿੱਡ।"
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-"
+"ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
 #: ../mail/evolution-mail.schemas.in.h:151
-msgid "Thread the message-list"
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਥਰਿੱਡ"
+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 ""
+"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਥਰਿੱਡਾਂ ਨੂੰ ਹਰੇਕ ਥਰਿੱਡ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਿਆਂ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, "
+"ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
 
 #: ../mail/evolution-mail.schemas.in.h:152
-msgid "Thread the message-list based on Subject"
-msgstr "ਵਿਸ਼ੇ ਤੇ ਅਧਾਰਿਤ ਸੁਨੇਹਾ-ਲਿਸਟ ਦਾ ਥਰਿੱਡ ਬਣਾਓ"
+msgid "Thread the message list."
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਥਰਿੱਡ।"
 
 #: ../mail/evolution-mail.schemas.in.h:153
+msgid "Thread the message-list"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਥਰਿੱਡ"
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Thread the message-list based on Subject"
+msgstr "ਵਿਸ਼ੇ ਤੇ ਅਧਾਰਿਤ ਸੁਨੇਹਾ-ਸੂਚੀ ਦਾ ਥਰਿੱਡ ਬਣਾਓ"
+
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "ਮੂਲ ਅਕਾਊਂਟ ਲ਼ਈ UID ਲਾਈਨ।"
 
-#: ../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 "ਜਦੋਂ ਇਨ-ਲਾਈਨ ਸਪੈਲਿੰਗ ਦੀ ਵਰਤੋਂ ਹੋਵੇ ਤਾਂ ਗਲਤ ਸ਼ਬਦ ਲਈ ਹੇਠਾਂ ਲਾਈਨ ਲਈ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਕਸਟਮ ਫੋਂਟ ਵਰਤੋਂ ਜੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
-msgstr "ਸਿਰਫ ਲੋਕਲ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
+msgstr "ਸਿਰਫ ਸਥਾਨਕ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
-msgstr "ਸਿਰਫ ਲੋਕਲ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
+msgstr "ਸਿਰਫ ਸਥਾਨਕ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "ਨਾਲ-ਨਾਲ ਜਾਂ ਫੈਲਿਆ ਖਾਕਾ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
 
-#: ../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 "ਕੀ ਮੂਲ ਰੂਪ ਵਿੱਚ ਹਰੇਕ ਸੁਨੇਹੇ ਨਾਲ ਜਵਾਬੀ ਰਸੀਦ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
-#: ../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 "ਕੀ ਮਾਮਲਿਆਂ ਨੂੰ ਵਿਸ਼ੇ ਮੁਤਾਬਕ ਕੀਤਾ ਜਾਵੇ ਜਾਂ ਨਾ, ਜਦੋਂ ਕਿ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਜਵਾਬ ਜਾਂ ਹਵਾਲਾ ਖੇਤਰ ਸ਼ਾਮਿਲ ਨਾ ਹੋਵੇ।"
+#: ../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 ""
+"ਕੀ ਮਾਮਲਿਆਂ ਨੂੰ ਵਿਸ਼ੇ ਮੁਤਾਬਕ ਕੀਤਾ ਜਾਵੇ ਜਾਂ ਨਾ, ਜਦੋਂ ਕਿ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਜਵਾਬ ਜਾਂ ਹਵਾਲਾ ਖੇਤਰ "
+"ਸ਼ਾਮਿਲ ਨਾ ਹੋਵੇ।"
 
-#: ../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 "ਕੀ ਮਾਮਲੇ ਨੂੰ ਉਸ ਮਾਮਲੇ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਾ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਬਾਹੀ ਦੀ ਚੌੜਾਈ"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਬਾਹੀ ਦੀ ਚੌੜਾਈ ਹੈ।"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ ਹੈ।"
 
 #: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
@@ -13777,83 +14147,77 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਈਲਮ ਆਯਾਤਕਾਰ"
 msgid "Import mail from Elm."
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫੋਲਡਰ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ ਫਾਰਮੈਟ ਫੋਲਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬਕਸਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/mail-importer.c:232
-#: ../shell/e-shell-importer.c:514
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "ਪਾਈਨ ਡਾਟਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਾਈਨ ਆਯਾਤਕਾਰ"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Pine ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ਨੂੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:243
-#: ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤੋਂ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "ਵਿਸ਼ਾ ਹੈ %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ਪੱਤਰ ਲਿਸਟ"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-component.c:164
-#: ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691
-#: ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#, fuzzy
-msgid "Templates"
-msgstr "ਟੈਪਲੇਟ:"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13910,98 +14274,38 @@ msgid_plural "%d total"
 msgstr[0] "%d ਕੁੱਲ"
 msgstr[1] "%d ਕੁੱਲ"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 #, fuzzy
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ(_M)"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 #, fuzzy
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ(_F)"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ਪੱਤਰ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../mail/mail-component.c:1593
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: ../mail/mail-component.c:1593
-msgid "Errors"
-msgstr "ਗਲਤੀਆਂ"
-
-#: ../mail/mail-component.c:1594
-msgid "Warnings and Errors"
-msgstr "ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਗਲਤੀਆਂ"
-
-#: ../mail/mail-component.c:1595
-msgid "Debug"
-msgstr "ਡੀਬੱਗ"
-
-#: ../mail/mail-component.c:1595
-msgid "Error, Warnings and Debug messages"
-msgstr "ਗਲਤੀਆਂ, ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਡੀਬੱਗ ਸੁਨੇਹੇ"
-
-#: ../mail/mail-component.c:1722
-msgid "Debug Logs"
-msgstr "ਡੀਬੱਗ ਲਾਗ"
-
-#: ../mail/mail-component.c:1736
-msgid "Show _errors in the status bar for"
-msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀਆਂ ਵੇਖੋ(_e)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1752
-#, fuzzy
-msgid "second(s)."
-msgstr "ਸਕਿੰਟ।"
-
-#: ../mail/mail-component.c:1758
-msgid "Log Messages:"
-msgstr "ਲਾਗ ਸੁਨੇਹੇ:"
-
-#: ../mail/mail-component.c:1799
-msgid "Log Level"
-msgstr "ਲਾਗ ਲੈਵਲ"
-
-#: ../mail/mail-component.c:1808
-#: ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "ਸਮਾਂ"
-
-#: ../mail/mail-component.c:1818
-#: ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "ਸੁਨੇਹੇ"
-
-#: ../mail/mail-component.c:1827
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
@@ -14256,8 +14560,10 @@ msgid "Do not format messages when text si_ze exceeds"
 msgstr "ਮੇਲ ਵਿੱਚ ਟੈਕਸਟ ਸਮੱਗਰੀ ਫਾਰਮੈਟ ਨਾ ਕਰੋ, ਜੇ ਟੈਕਸਟ ਸਾਈਜ਼ ਵੱਧ ਜਾਵੇ(_z)"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr "ਜੇ ਭੇਜਣ ਵਾਲਾ ਮੇਰੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ ਜੰਕ ਨਾ ਬਣਾਓ(_k)"
+#, fuzzy
+#| msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "ਜੇ ਭੇਜਣ ਵਾਲਾ ਮੇਰੀ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ ਜੰਕ ਨਾ ਬਣਾਓ(_k)"
 
 #: ../mail/mail-config.glade.h:73
 #, fuzzy
@@ -14278,134 +14584,137 @@ msgstr "ਈ-ਮੇਲ ਅਕਾਊਂਟ"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_A):"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ(_A):"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਫੋਲਡਰ ਬੰਦ ਕਰ ਦਿਓ(_x)"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+#| msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
 msgstr "ਮੈਜਿਕ ਸਪੇਸਬਾਰ ਯੋਗ(_p)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਯੋਗ(_r)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ(_p):"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰੀ ਜਾਣ ਵਾਲੇ ਪੱਤਰਾਂ ਨੂੰ ਇਕ੍ਰਿਪਸ਼ਨ(ਮੂਲ ਹੀ)(_g)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ(_x):"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ(_e):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "ਫੋਂਟ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "ਪੂਰਾ ਨਾਂ(_E):"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML ਸੁਨੇਹੇ"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 #, fuzzy
 msgid "H_TTP Proxy:"
 msgstr "_PO ਬਾਕਸ:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "ਹੈੱਡਰ"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ(_q)"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "ਲਾਇਨ 'ਚ"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Inline (Outlook style)"
 msgstr "ਇਨਲਾਇਨ ਅਸਲੀ ਸੁਨੇਹਾ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲੇਬਲ"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "ਮੇਲ ਸੰਰਚਨਾ"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "ਮੇਲ ਹੈੱਡਰ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "ਮੇਲ-ਬਾਕਸ ਟਿਕਾਣਾ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "ਸੁਨੇਹਾ ਲੇਖਕ"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "ਇਸ ਲਈ ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ(_P):"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "ਨੋਟ: ਲੇਬਲ ਨਾਂ ਵਿੱਚ ਹੇਠਾਂ ਲਾਈਨ ਨੂੰ ਮੇਨੂ ਵਿੱਚ "
 
-#: ../mail/mail-config.glade.h:108
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.glade.h:109
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "ਸੂਚਨਾ: ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਪਹਿਲੀਂ ਵਾਰ ਲਾਗਇਨ ਨਹੀਂ ਕਰਦੇ, ਤੁਹਾਡੇ ਕੋਲੋਂ ਪਾਸਵਰਡ ਪੁਛਿਆ ਨਹੀਂ ਜਾਵੇਗਾ"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ਚੋਣ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਜੇ ਰਲਦਾ ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਖੋਜਿਆ ਜਾਵੇ।"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "ਸੰਗਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../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."
@@ -14413,128 +14722,153 @@ msgstr ""
 "ਅੱਗੇ ਦਿੱਤੀ ਥਾਂ ਵਿੱਚ ਇਸ ਅਕਾਊਂਟ ਬਾਰੇ ਵਰਣਨ ਕਰਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ।\n"
 "ਇਹ ਨਾਂ ਸਿਰਫ਼ ਵੇਖਾਉਣ ਲਈ ਹੀ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../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 "ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਯਕੀਨੀ ਨਹੀਂ ਹੋ ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਸਰਵਿਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
-
 #: ../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 "ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
+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 ""
+"ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਯਕੀਨੀ ਨਹੀਂ ਹੋ "
+"ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਸਰਵਿਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../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 ""
+"ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਦਿਓ ਜੀ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ "
+"ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
+
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "ਹੇਠ ਲਿਖੀਆਂ ਚੋਣਾਂ ਵਿੱਚੋਂ ਚੁਣੋ ਜੀ"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Port:"
 msgstr "ਪੋਰਟ(_P):"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸੂਚਿਤ ਕਰੋ, ਜਦੋਂ ਵੀ ਸੁਨੇਹੇ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ, ਜੋ ਕਿ Bcc ਪ੍ਰਾਪਤਕਰਨ ਵਾਲਿਆਂ ਲਈ ਹੋਵੇ(_o)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_m)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_p)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "S_OCKS ਹੋਸਟ:"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਤਸਵੀਰ ਦੀ ਖੋਜ ਸਿਰਫ਼ ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੀ ਕਰੋ(_e)"
-
 #: ../mail/mail-config.glade.h:128
+#, fuzzy
+#| msgid "S_earch for sender photograph only in local addressbooks"
+msgid "S_earch for sender photograph only in local address books"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਤਸਵੀਰ ਦੀ ਖੋਜ ਸਿਰਫ਼ ਸਥਾਨਕ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਹੀ ਕਰੋ(_e)"
+
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "ਚੁਣੋ(_e)..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "ਸੁਨੇਹਾ ਰਸੀਦ ਭੇਜੋ(_e):"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "ਸਟੈਂਡਰਡ ਫੋਂਟ(_t):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Drafts Folder"
+msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Sent Folder"
+msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਫੋਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲਈ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "ਸਰਵਰ ਕਿਸਮ(_T): "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "ਦਸਤਖਤ(_u):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "ਦਸਤਖਤ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "ਜਦੋਂ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ ਤਾਂ ਹੇਠਾਂ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ(_t)"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "ਕਿਸਮ(_y): "
 
-#: ../mail/mail-config.glade.h:148
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ, ਸਿਰਫ ਉਹਨਾਂ ਨੂੰ ਵੇਖਾਉਦੀ ਹੈ, ਜਿਨਾਂ ਲਈ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14544,7 +14878,7 @@ msgstr ""
 "ਵਿੱਚ ਵਰਤੀ ਜਾਵੇਗੀ। ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ\n"
 "ਵੇਖਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗੀ।"
 
-#: ../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\""
@@ -14552,29 +14886,28 @@ msgstr ""
 "ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 #, fuzzy
 msgid "Us_ername:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 #, fuzzy
 msgid "Use Authe_ntication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
 
-#: ../mail/mail-config.glade.h:156
-#: ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:615
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
 msgid "User_name:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "ਅਸਥਿਰ-ਚੌੜਾਈ(_a):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14584,129 +14917,129 @@ msgstr ""
 "\n"
 "ਸ਼ੁਰੂ ਕਰਨ ਲਈ \"ਅੱਗੇ\" ਦਬਾਓ।"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "ਦਸਤਖਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਹਮੇਸ਼ਾ ਪ੍ਰਾਪਤ ਕਰੋ(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Automatic proxy configuration URL:"
 msgstr "ਆਟੋਮੈਟਿਕ ਖੁਸ਼ ਪਛਾਣ"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਲਈ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ) (_D)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਇਲ(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਦਸਤਖਤ ਅਸਲੀਂ ਸੁਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖੋ(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰਕਾਂ ਤੋਂ ਆਏ ਸੁਨੇਹਿਆਂ 'ਚ ਚਿੱਤਰ ਲੋਡ ਕਰੋ(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Lookup in local addressbook only"
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਫੋਲਡਰਾਂ ਦੀ ਲਿਸਟ"
+msgid "_Lookup in local address book only"
+msgstr "ਸਥਾਨਕ ਸਿਰਨਾਵਾਂ ਫੋਲਡਰਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "ਮੇਰੇ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਮੂਲ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "ਮੇਲ ਸੰਰਚਨਾ"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "ਬਾਅਦ ਵਿੱਚ ਸੁਨੇਹੇ ਨੂੰ ਪੜਿਆ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਕਦੇ ਵੀ ਲੋਡ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "ਮਾਰਗ(_P):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸੁਨੇਹਾ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ, ਜੋ ਕਿ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹਨ (_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸੁਨੇਹਾ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "ਜਵਾਬ ਸਟਾਇਲ(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "ਸਕ੍ਰਿਪਟ(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ(_S):"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "ਚੁਣੋ(_S)..."
 
 #. 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 "ਚਿੱਤਰ ਸਜੀਵਤਾ ਵੇਖਾਓ(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹੈੱਡਰ ਨੂੰ ਸੁੰਘੜੋ(_S) "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 #, fuzzy
 msgid "_Use system defaults"
 msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "ਹੋਰ ਕਾਰਜ ਵਾਂਗ ਉਹੀ ਫੋਂਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
-msgstr "ਐਡਰੈੱਸ"
+msgstr "ਸਿਰਨਾਵਾਂ"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "ਰੰਗ"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "ਵੇਰਵਾ"
 
@@ -14732,11 +15065,11 @@ msgstr "ਸਭ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:6
 msgid "All local and active remote folders"
-msgstr "ਸਭ ਲੋਕਲ ਅਤੇ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
+msgstr "ਸਭ ਸਥਾਨਕ ਅਤੇ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
-msgstr "ਸਭ ਲੋਕਲ ਫੋਲਡਰ"
+msgstr "ਸਭ ਸਥਾਨਕ ਫੋਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
@@ -14754,8 +15087,7 @@ msgstr "ਖੋਜ(_i):"
 msgid "Find in Message"
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
 
-#: ../mail/mail-dialogs.glade.h:12
-#: ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦੇ ਪਿੱਛੇ"
 
@@ -14807,27 +15139,26 @@ msgstr "ਨਿਸ਼ਾਨ(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਚੁਣੋ(_T)"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "ਪਿੰਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਫਿਲਟਰ"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:572
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14836,126 +15167,123 @@ msgstr ""
 "%s ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s\n"
 "ਲੋਕਲ`Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ਲੋਕਲ `Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "ਸਥਾਨਕ `Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸੁਨੇਹੇ %2$d ਵਿੱਚੋਂ %1$d ਭੇਜਣ ਵਿੱਚ ਅਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਨਕਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "ਫੋਲਡਰ %s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1273
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "ਸਟੋਰ %s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "ਫੋਲਡਰ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੁੰਘੜਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1657
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "ਨਿਕਾਲਾ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
-msgstr "ਲੋਕਲ ਫੋਲਡਰ"
+msgstr "ਸਥਾਨਕ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ਸੁਨੇਹਾ %s ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:2010
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14964,12 +15292,11 @@ msgstr ""
 "ਸੁਨੇਹਾ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
-#: ../mail/mail-ops.c:2146
-#: ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14978,27 +15305,27 @@ msgstr ""
 "ਆਉਟਪੁੱਟ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾਟਾ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ਨਾਲੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ਨਾਲ ਮੁੜ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ਆਫਲਾਇਨ ਲਈ ਅਕਾਊਂਟ '%s' ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "ਸੇਵਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
@@ -15014,40 +15341,39 @@ msgstr "ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "ਅੱਪਡੇਟ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:498
-#: ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "ਉਡੀਕ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:217
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "ਯੂਜ਼ਰ ਨੇ ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ।"
 
@@ -15095,21 +15421,21 @@ msgstr "ਗਲਤ ਫੋਲਡਰ: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸੋਧ"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "ਨਵਾਂ ਖੋਜ ਫੋਲਡਰ"
 
@@ -15133,27 +15459,37 @@ msgstr "ਫੋਲਡਰ ਨਾਂ &quot;{1}&quot; ਪਹਿਲਾਂ ਹੀ ਮ�
 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 ""
 "&quot;{1}&quot; 'ਤੇ ਇੱਕ ਨਾ-ਖਾਲੀ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n"
 "\n"
-"ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
+"ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ "
+"ਸਕਦੇ ਹੋ।"
 
 #: ../mail/mail.error.xml.h:6
 #, fuzzy
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ ਭੇਜਣੀ ਹੈ?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:7
 #, fuzzy
-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 "ਨਾਂ &quot;{1}&quot; ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
 
 #: ../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 "ਆਪਣੇ ਪੱਤਰ ਦੇ ਵਿਸ਼ੇ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੇ ਪੱਤਰ ਬਾਰੇ ਆਸਾਨੀ ਨਾਲ ਸਮਝ ਜਾਦੇ ਹਨ।"
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"ਆਪਣੇ ਪੱਤਰ ਦੇ ਵਿਸ਼ੇ ਵਿੱਚ ਕੁਝ ਅਰਥ ਪੂਰਨ ਜਾਣਕਾਰੀ ਲਿਖਣ ਨਾਲ ਪੱਤਰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲੇ ਤੁਹਾਡੇ ਪੱਤਰ ਬਾਰੇ "
+"ਆਸਾਨੀ ਨਾਲ ਸਮਝ ਜਾਦੇ ਹਨ।"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15172,12 +15508,16 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ਕੀ ਤੁਸੀਂ {0} ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:14
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:15
@@ -15268,8 +15608,12 @@ msgstr "ਨਿਯਤ &quot;{2}&quot; ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ �
 
 #: ../mail/mail.error.xml.h:34
 #, fuzzy
-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 "ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤੁਸੀਂ ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
+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 ""
+"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤੁਸੀਂ "
+"ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
@@ -15306,8 +15650,12 @@ msgid "Check Junk Failed"
 msgstr "ਕੂੜੇ ਲਈ ਜਾਂਚ(_J)"
 
 #: ../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 "ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਪਾਸਵਰਡ ਅੱਖਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹੈ, ਤੁਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਪਾਸਵਰਡ ਅੱਖਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ "
+"ਹੈ, ਤੁਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15348,8 +15696,10 @@ msgid "Do not disable"
 msgstr "ਅਯੋਗ ਨਾ ਕਰੋ"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਲੋਕਲ ਸਮਕਾਲੀ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਸਥਾਨਕ ਸਮਕਾਲੀ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15392,7 +15742,9 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਤੁਸੀਂ ਇਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮੁੜ-ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/mail.error.xml.h:62
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਫੋਲਡਰ ਹਟਾ ਦਿੱਤਾ ਤਾਂ, ਇਸ ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰਾਂ ਦੇ ਸਾਰੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
 #: ../mail/mail.error.xml.h:63
@@ -15412,8 +15764,12 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
 #: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾਦਾ ਹੈ।"
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ "
+"ਕੀਤਾ ਜਾਦਾ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15428,8 +15784,15 @@ msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲਟਰ ਆਟੋਮੈਟਿਕ ਹੀ ਅੱਪਡੇਟ ਕੀਤੇ ਗਏ ਹਨ।"
 
 #: ../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 "ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹੁੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
+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 ""
+"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹੁੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, "
+"ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ "
+"ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15456,15 +15819,19 @@ msgid "Please enable the account or send using another account."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
 #: ../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 "ਕਿਰਪਾ ਕਰਕੇ ਵੱਲ ਲਈ ਜਾਇਜ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ। ਤੁਸੀਂ ਵੱਲ ਤੇ ਕਲਿੱਕ ਕਰਕੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਖੋਜ ਸਕਦੇ ਹੋ।"
+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 "ਕਿਰਪਾ ਕਰਕੇ ਵੱਲ ਲਈ ਜਾਇਜ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਦਿਓ। ਤੁਸੀਂ ਵੱਲ ਤੇ ਕਲਿੱਕ ਕਰਕੇ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਖੋਜ ਸਕਦੇ ਹੋ।"
 
 #: ../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 ""
-"ਇਹ ਯਕੀਨੀ ਬਣਾ ਲਵੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਕਰਤਾ HTML ਈ-ਮੇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਨ ਅਤੇ ਇਹ ਉਹਨਾਂ ਲਈ ਸੰਭਵ ਵੀ ਹੈ:\n"
+"ਇਹ ਯਕੀਨੀ ਬਣਾ ਲਵੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਕਰਤਾ HTML ਈ-ਮੇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਨ ਅਤੇ ਇਹ ਉਹਨਾਂ "
+"ਲਈ ਸੰਭਵ ਵੀ ਹੈ:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:83
@@ -15486,7 +15853,7 @@ msgstr "ਕਿਊਰਿੰਗ ਸਰਵਰ"
 
 #: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਲਿਸਟ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
+msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
@@ -15528,18 +15895,27 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "ਕੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਫੋਲਡਰ ਲੋਕਲੀ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ?"
 
 #: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "ਸਿਸਟਮ ਫੋਲਡਰ ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ।"
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"ਸਿਸਟਮ ਫੋਲਡਰ ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ ਹਟਾਉਣਾ "
+"ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
 #: ../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 ""
 "ਸੰਪਰਕ ਲਿਸਟ, ਜੋ ਤੁਸੀਂ ਭੇਜ ਰਹੇ ਹੋ, ਲੁਕਵੇਂ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨਾਲ ਸੰਰਚਿਤ ਹੈ।\n"
 "\n"
-"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹੁੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
+"ਕਈ ਈ-ਮੇਲ ਸਿਸਟਮ ਤੇ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਓਹਲੇ ਕਰਨ ਲਈ ਹੀ ਮੱਦਦ ਸ਼ਾਮਿਲ ਹੁੰਦੀ ਹੈ। ਇਹ ਹੈੱਡਰ, "
+"ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ "
+"ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #  mail:vfolder-updated secondary
 #: ../mail/mail.error.xml.h:101
@@ -15586,15 +15962,21 @@ msgstr ""
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
 #: ../mail/mail.error.xml.h:114
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
-msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਅਕਾਊਂਟ ਨਾਲ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ ਆਯੋਗ ਹੈ।"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਅਕਾਊਂਟ ਨਾਲ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ "
+"ਆਯੋਗ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:115
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "ਸਰਵਰ ਇਸ ਤਰਾਂ ਦੀ ਪ੍ਰਮਾਣਿਤ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਅਤੇ ਸਭ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਈ ਵੀ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:117
@@ -15602,7 +15984,9 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
 #: ../mail/mail.error.xml.h:119
@@ -15610,8 +15994,12 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"ਇਸ ਅਕਾਊਂਟ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਡਰਾਫਟ ਫੋਲਡਰ "
+"ਵਰਤਿਆ ਜਾਵੇ?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15627,7 +16015,8 @@ msgstr "ਮੂਲ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
 #: ../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 ""
 
@@ -15655,7 +16044,8 @@ msgstr "ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਨਿਰਧਾਰਿਤ ਕਰਨ
 #: ../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 ""
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸਰੋਤ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।\n"
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚੁਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਲੋਕਲ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ ਚੁਣ ਕੇ।"
@@ -15685,97 +16075,92 @@ msgstr "ਸੁੰਘੜੋ(_E)"
 msgid "_Open Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 #, fuzzy
 msgid "Forwarded"
 msgstr "ਅੱਗੇ"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹੁ ਨਾ-ਵੇਖੇ ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ਬਹੁ-ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "ਨਿਊਨਤਮ"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "ਘੱਟ"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ"
 
-#: ../mail/message-list.c:1596
-#: ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "ਅੱਜ %l:%M %p"
 
-#: ../mail/message-list.c:1612
-#: ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1624
-#: ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632
-#: ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1634
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%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:4373
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
-msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/message-list.c:4223
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+#: ../mail/message-list.c:4288
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4225
+#: ../mail/message-list.c:4290
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr ""
 "\n"
 "\n"
-"ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਲਿਸਟ ਨਹੀਂ ਹੈ।"
+"ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਸੂਚੀ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15806,6 +16191,11 @@ msgstr "ਭੇਜੇ ਸੁਨੇਹੇ"
 msgid "Size"
 msgstr "ਅਕਾਰ"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "_Cc ਖੇਤਰ"
+
 #: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "ਕਾਲ"
@@ -15822,8 +16212,7 @@ msgstr "ਸਹਾਇਕ"
 msgid "For Your Information"
 msgstr "ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਲਈ"
 
-#: ../mail/message-tag-followup.c:59
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ਅੱਗੇ"
 
@@ -15831,13 +16220,11 @@ msgstr "ਅੱਗੇ"
 msgid "No Response Necessary"
 msgstr "ਕੋਈ ਜਵਾਬ ਲੋੜੀਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../mail/message-tag-followup.c:63
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:64
-#: ../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 "ਸਭ ਨੂੰ ਜਵਾਬ"
 
@@ -15876,22 +16263,26 @@ msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ"
+msgstr "ਸਥਾਨਕ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
+msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
 
 #: ../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"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 msgstr ""
 
 #: ../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."
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -15901,11 +16292,15 @@ msgid "Attachment Reminder"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਰੀਮਾਈਡਰ"
 
 #: ../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"
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
 msgstr ""
 
 #: ../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."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr ""
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
@@ -15918,151 +16313,160 @@ msgid "_Edit Message"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ(_E)"
 
 #: ../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 "ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+#, fuzzy
+#| msgid ""
+#| "A formatter plugin which displays audio attachments inline and allows you "
+#| "to play them directly from evolution."
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from Evolution."
+msgstr ""
+"ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ "
+"ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "ਆਡੀਓ ਇਨ-ਲਾਇਨ ਪਲੱਗ-ਇਨ"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "ਈਵੂਲੇਸਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "ਬੈਕਅੱਪ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ ਕਰਨ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ ਚਾਲੂ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:289
 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 ""
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "ਬੈਕਅੱਪ ਫਾਇਲ ਤੋ ਈਵੂਲੇਸ਼ਨ ਰੀਸਟੋਰ ਕਰੋ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੂਲੇਸ਼ਨ ਅਕਾਇਵ ਚੁਣੋ ਜੀ:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "ਬੈਕਅੱਪ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਚੈੱਕ ਕਰੋ"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਘ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "ਬੈਕਅੱਪ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈਟਿੰਗ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "ਆਰਜ਼ੀ ਬੈਕਅੱਪ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫੋਲਡਰ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ਫੋਲਡਰ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:513
 #, fuzzy
 msgid "Backing up Evolution Data"
 msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲੈ ਰਹੀ ਹੈ ਤਾਂ ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:516
 #, fuzzy
 msgid "Restoring Evolution Data"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ਈਵੈਲੂਸ਼ਨ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਡਾਟੇ ਨੂੰ ਰੀ-ਸਟੋਰ ਕਰਦੀ ਹੈ, ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ਇਹ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਡਾਟੇ ਦੀ ਮਾਤਰਾ ਮੁਤਾਬਕ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।"
 
@@ -16084,7 +16488,11 @@ msgid "Are you sure you want to restore Evolution from the selected backup file?
 msgstr "ਕੀ ਤੁਸੀਂ ਚੁਣੀ ਬੈਕਅੱਪ ਫਾਇਲ ਤੋਂ ਈਵੇਲੂਸ਼ਨ ਰੀ-ਸਟੋਰ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../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."
+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 ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16106,7 +16514,12 @@ msgid "The selected folder is not writable."
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
 
 #: ../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."
+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 ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
@@ -16121,71 +16534,81 @@ msgstr "ਸੈਟਿੰਗ ਰੀਸਟੋਰ(_e)..."
 msgid "_Backup Settings..."
 msgstr "ਬੈਕਅੱਪ ਸੈਟਿੰਗ(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:543
-#: ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 #, fuzzy
-msgid "_Auto-create addressbook entries when replying to messages"
-msgstr "ਸੁਨੇਹਿਆਂ ਦੇ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਖੁਦ ਹੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "ਸੁਨੇਹਿਆਂ ਦੇ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਖੁਦ ਹੀ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
-msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
+msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਚੁਣੋ"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 #, fuzzy
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "ਨਿਯਮਤ ਤੌਰ ਉੱਤੇ ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਦੇ ਰਹੋ"
+msgstr "ਨਿਯਮਤ ਤੌਰ ਉੱਤੇ ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਦੇ ਰਹੋ"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
-msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
+msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਲਈ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਚੁਣੋ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "ਭਾਈ ਸੂਚਨਾ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
-msgstr "ਜਿਵੇਂ ਹੀ ਤੁਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚ ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+#, fuzzy
+#| msgid ""
+#| "Automatically fills your addressbook with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
+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 ""
+"ਜਿਵੇਂ ਹੀ ਤੁਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਿੱਚ "
+"ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਹਾਡੀ ਬੱਡੀ ਸੂਚੀ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਭਰ ਦਿੱਤੀ "
+"ਜਾਵੇਗੀ।"
 
 #: ../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:161
 #, fuzzy, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "ਪਰਿੰਟਿੰਗ ਦੇ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "ਮੇਲ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ(_U)"
 
@@ -16194,7 +16617,9 @@ msgid "Convert mail messages to Unicode"
 msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ"
 
 #: ../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."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
 msgstr "ਸੁਨੇਹੇ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ UTF-8 ਤੋਂ ਯੂਨੀਫਾਈ ਸਪਮ/ਹਮ ਟੋਕਨ ਵਿੱਚ ਬਦਲੋ, ਜੋ ਕਿ ਵੱਖਰੇ ਅੱਖਰ ਸੈੱਟ ਤੋਂ ਆਉਦੇ ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16210,22 +16635,32 @@ msgstr "Bogofilter ਚੋਣਾਂ"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰੋ।"
 
-#: ../plugins/caldav/caldav-source.c:66
-#: ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:608
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤੋਂ"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:632
+#: ../plugins/google-account-setup/google-contacts-source.c:358
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV ਕੈਲੰਡਰ ਸਰੋਤ"
@@ -16236,19 +16671,11 @@ msgstr "CalDAV ਸਰੋਤ"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
+msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
-
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-#, fuzzy
-msgid "Re_fresh:"
-msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
+msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
 
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
@@ -16266,48 +16693,63 @@ msgstr "HTTP ਕੈਲੰਡਰ"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "ਵੈਬ-ਕੈਲ ਅਤੇ http ਕੈਲੰਡਰਾਂ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "ਮੌਸਮ: ਧੁੰਦ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "ਮੌਸਮ: ਹਲਕੀ ਬੱਦਲਵਾਈ"
+msgid "Weather: Cloudy"
+msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "ਮੌਸਮ: ਮੀਂਹ"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "ਮੌਸਮ: ਮੀਂਹ"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "ਮੌਸਮ: ਬਰਫ਼"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "ਮੌਸਮ: ਬਰਫ਼"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "ਮੌਸਮ: ਖੜਿਆ ਦਿਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Weather: Clear Night"
+msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "ਮੌਸਮ: ਬਫ਼ਰੀਲਾ ਤੂਫਾਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "ਇੱਕ ਟਿਕਾਣਾ ਚੁਣੋ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "ਇਕਾਈ(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮੀਟਰਿਕ (ਸੈਂਲਸੀਅਸ, ਸੈਂਮੀ, ਆਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ਇੰਪੀਰਿਲ (ਫਾਰਨਹੀਂਟ, ਇੰਚ ਆਦਿ)"
 
@@ -16320,8 +16762,12 @@ msgid "Weather Calendars"
 msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
 
 #: ../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 "ਇੱਕ ਟੈਕਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+"ਇੱਕ ਟੈਕਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ "
+"ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16348,26 +16794,26 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ਕੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣਾ ਮੂਲ ਈ-ਮੇਲ ਕਲਾਂਈਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 #, fuzzy
 msgid "Mark as _default address book"
 msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 #, fuzzy
 msgid "Mark as _default calendar"
 msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 #, fuzzy
 msgid "Mark as _default task list"
 msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 #, fuzzy
 msgid "Mark as _default memo list"
 msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
@@ -16377,21 +16823,25 @@ msgid "Default Sources"
 msgstr "ਮੂਲ ਸਰੋਤ"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Provides functionality for marking a calendar or an addressbook as the default one."
-msgstr "ਇੱਕ ਕੈਲੰਡਰ ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਮੂਲ ਰੂਪ ਵਿੱਚ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
-
-#: ../plugins/email-custom-header/email-custom-header.c:558
 #, fuzzy
+#| msgid ""
+#| "Provides functionality for marking a calendar or an addressbook as the "
+#| "default one."
+msgid ""
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr "ਇੱਕ ਕੈਲੰਡਰ ਜਾਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਮੂਲ ਰੂਪ ਵਿੱਚ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
-msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
-msgstr "ਕੀਨੀਆ"
+msgstr "ਕੀ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "ਮੁੱਲ"
 
@@ -16410,7 +16860,7 @@ msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Adds custom header to outgoing messages."
-msgstr ""
+msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਸ਼ਾਮਲ"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 #, fuzzy
@@ -16418,14 +16868,21 @@ msgid "Custom Header"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-#, fuzzy
 msgid "List of Custom Headers"
-msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਦੀ ਸੂਚੀ"
 
 #: ../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 ""
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰ ਖੋਲੋ"
@@ -16443,28 +16900,32 @@ msgid "_User:"
 msgstr "ਯੂਜ਼ਰ(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "ਸੁਰੱਖਿਅਤ ਪਾਸਵਰਡ"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
 msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸੁਰੱਖਿਅਤ ਪਾਸਵਰਡ (NTLM) ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "ਸਧਾਰਨ ਪਾਸਵਰਡ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
 msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "ਦਫਤਰੋਂ ਬਾਹਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16472,89 +16933,95 @@ msgstr ""
 "ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸੁਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ\n"
 "ਜਾਵੇਗਾ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਤੋਂ ਬਾਹਰ ਹਾਂ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਵਿੱਚ ਹਾਂ"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਡੈਲੀਗੇਟ ਸੈਟਿੰਗ ਪਰਬੰਧਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "ਡੈਲੀਗੇਸ਼ਨ ਸਹਾਇਕ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "ਫੁਟਕਲ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "ਸਭ ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰਾਂ ਦਾ ਅਕਾਰ ਵੇਖਾਓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਸੈਟਿੰਗ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+#| msgid "Specify _filename:"
+msgid "S_pecify the mailbox name"
+msgstr "ਖਾਸ ਫਾਇਲ ਨਾਂ(_f):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 #, fuzzy
 msgid "_Mailbox:"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16565,11 +17032,15 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
-msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਮੌਜੂਦ ਪੁਰਾਣੇ ਪਾਸਵਰਡ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਠੀਕ ਪਾਸਵਰਡ ਦਿਓ।"
+#: ../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"
+msgstr ""
+"ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਮੌਜੂਦ ਪੁਰਾਣੇ ਪਾਸਵਰਡ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਠੀਕ "
+"ਪਾਸਵਰਡ ਦਿਓ।"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "ਦੋ ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਪਾਸਵਰਡ ਮੁੜ ਦਿਓ।"
 
@@ -16589,38 +17060,38 @@ msgstr "ਨਵਾਂ ਪਾਸਵਰਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਪਾਸਵਰਡ ਹੁਣੇ ਬਦਲੋ।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "ਪਸੰਦੀਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "ਸੰਪਾਦਕ (ਪੜਨ, ਲਿਖਣ, ਸੋਧਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ਲੇਖਕ (ਪੜਨ, ਲਿਖਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "ਪੜਚੋਲਕਰਤਾ (ਪੜਨ ਲਈ ਹੀ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਅਧਿਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ਲਈ ਅਧਿਕਾਰ"
@@ -16628,74 +17099,78 @@ msgstr "%s ਲਈ ਅਧਿਕਾਰ"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
-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 "ਇਹ ਸੁਨੇਹਾ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਨੂੰ ਇਹ ਜਾਣਕਾਰੀ ਲਈ ਭੇਜਿਆ ਗਿਆ ਹੈ ਕਿ ਤੁਸੀਂ ਇੱਕ ਡੈਲੀਗੇਟ ਥਾਪੇ ਗਏ ਹੋ। ਤੁਸੀਂ ਹੁਣ ਮੇਰੇ ਤੌਰ ਉੱਤੇ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
+#: ../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 ""
+"ਇਹ ਸੁਨੇਹਾ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਨੂੰ ਇਹ ਜਾਣਕਾਰੀ ਲਈ ਭੇਜਿਆ ਗਿਆ ਹੈ ਕਿ ਤੁਸੀਂ ਇੱਕ ਡੈਲੀਗੇਟ ਥਾਪੇ "
+"ਗਏ ਹੋ। ਤੁਸੀਂ ਹੁਣ ਮੇਰੇ ਤੌਰ ਉੱਤੇ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "ਤੁਹਾਨੂੰ ਮੇਰੇ ਫੋਲਡਰ ਲਈ ਹੇਠ ਦਿੱਤੇ ਅਧਿਕਾਰ ਦਿੱਤੇ ਗਏ ਹਨ:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "ਤੁਹਾਨੂੰ ਮੇਰੀਆਂ ਪ੍ਰਾਈਵੇਟ ਆਈਟਮਾਂ ਵੇਖਣ ਦਾ ਵੀ ਅਧਿਕਾਰ ਹੈ।"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "ਪਰ ਤੁਹਾਨੂੰ ਮੇਰੀਆਂ ਪ੍ਰਾਈਵੇਟ ਆਈਟਮਾਂ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ਤੁਹਾਨੂੰ %s ਲਈ ਇੱਕ ਡੈਲੀਗੇਟ ਦਾ ਅਹੁਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ਕੀ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਦੀ ਲਈ ਪਹੁੰਚ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਖੁਦ ਨੂੰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ %s ਪ੍ਰਤੀਨਿਧ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
-msgstr "ਪ੍ਰਤੀਨਿਧਾਂ ਲਿਸਟ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
+msgstr "ਪ੍ਰਤੀਨਿਧਾਂ ਸੂਚੀ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
-msgstr "ਪ੍ਰਤੀਨਿਧ ਲਿਸਟ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਸੂਚੀ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
@@ -16741,26 +17216,26 @@ msgstr "ਸੰਖੇਪ ਅਧਿਕਾਰ(_S)"
 msgid "_Tasks:"
 msgstr "ਕੰਮ(_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "ਅਧਿਕਾਰ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "ਫੋਲਡਰ ਨਾਂ"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 #, fuzzy
 msgid "User"
 msgstr "ਯੂਜ਼ਰ(_U)"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣਾਓ"
@@ -16769,20 +17244,20 @@ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂ�
 msgid "Exchange Folder Tree"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
@@ -16807,10 +17282,12 @@ msgstr "<b>ਸਥਿਤੀ:</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> ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸੁਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ ਜਾਵੇਗਾ,\n"
+"<small> ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸੁਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ "
+"ਜਾਵੇਗਾ,\n"
 "ਜੋ ਕਿ ਤੁਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।</small> "
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -16845,18 +17322,18 @@ msgstr "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ 7 ਦਿਨਾ
 msgid "_Change Password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "ਯੂਜ਼ਰ ਜੋੜੋ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:408
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ"
 
@@ -16974,17 +17451,13 @@ msgstr "ਸੰਵੇਦਨਸ਼ੀਲਤਾ(_S): "
 msgid "_User"
 msgstr "ਯੂਜ਼ਰ(_U)"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "ਬਟਨ-ਯੂਜ਼ਰ"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "ਯੂਜ਼ਰ ਚੁਣੋ"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ..."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -16996,7 +17469,9 @@ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਕੈਲੰਡਰ ਦੇ ਮੈਂਬ�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 #, fuzzy
-msgid "A plugin that manages a collection of Exchange account specific operations and features."
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
 msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਨਾਲ ਸਬੰਧਤ ਖਾਸ ਕਾਰਵਾਈਆਂ ਅਤੇ ਫੀਚਰ ਦੇ ਸਮੂਹ ਨੂੰ ਹੈਂਡਲ ਕਰਦੀ ਹੈ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -17004,31 +17479,39 @@ msgid "Exchange Operations"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਕਾਰਵਾਈਆਂ"
 
 #: ../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 "ਸੰਰਚਨਾ ਸਮੱਸਿਆਵਾਂ ਕਰਕੇ ਪਾਸਵਰਡ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../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 "ਫੋਲਡਰ ਵੇਖਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ।"
 
 #  mail:async-error-nodescribe primary
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
-msgstr "ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ \"{0}\" ਲਈ ਚੋਣਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਤੁਹਾਡੇ ਵਲੋਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਮੁੜ ਚਾਲੂ ਕਰਨ ਉਪਰੰਤ ਹੀ ਪਰਭਾਵੀ ਹੋਣਗੀਆਂ।"
-
 #: ../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 ""
+"ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ \"{0}\" ਲਈ ਚੋਣਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਤੁਹਾਡੇ ਵਲੋਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਮੁੜ ਚਾਲੂ "
+"ਕਰਨ ਉਪਰੰਤ ਹੀ ਪਰਭਾਵੀ ਹੋਣਗੀਆਂ।"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "ਸਰਵਰ ਨਾਲ ਪਰਮਾਣਿਤ ਨਹੀਂ ਹੋ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "ਪਾਸਵਰਡ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17038,59 +17521,59 @@ msgstr ""
 "ਇੱਕ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ। URL, ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ \n"
 "ਪਾਸਵਰਡ ਦੀ ਜਾਂਚ ਕਰਕੇ ਮੁੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "ਸਰਵਰ {0} ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "ਪ੍ਰਤੀਨਿਧ ਲਈ ਫੋਲਡਰ ਅਧਿਕਾਰਾਂ ਨੂੰ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "ਐਕਸਚੇਜ਼ ਵੈਬ ਸਟੋਰੇਜ਼ ਸਿਸਟਮ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "ਸਰਵਰ {0} ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "{0} ਨੂੰ ਪ੍ਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "ਫੋਲਡਰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "ਫੋਲਡਰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "ਦਫ਼ਤਰੋਂ-ਬਾਹਰ ਹਾਲਤ ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "ਫੋਲਡਰ ਅਧਿਕਾਰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "ਦਫ਼ਤਰੋਂ-ਬਾਹਰ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
+msgstr "ਈਵੋਲੂਸ਼ਨ ਨੂੰ ਮੈਂਬਰੀ ਯੂਜ਼ਰ ਦੇ ਮੇਲ-ਬਾਕਸ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ਮੁੜ-ਚਾਲੂ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਆਫਲਾਇਨ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17119,102 +17602,104 @@ msgstr ""
 "  "
 
 #  FIXME: domain/code
-#: ../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 "ਪ੍ਰਤੀਨਿਧ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ ਹੋਇਆ ਹੈ।"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "ਫੋਲਡਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "ਫੋਲਡਰ ਆਫਲਾਇਨ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "ਸਧਾਰਨ ਗਲਤੀ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
-msgstr "ਗਲੋਬਲ ਲਿਸਟ ਸਰਵਰ ਪਹੁੰਚ ਵਿੱਚ ਨਹੀਂ ਹੈ"
+msgstr "ਗਲੋਬਲ ਸੂਚੀ ਸਰਵਰ ਪਹੁੰਚ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../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."
+#: ../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 "ਜੇਕਰ OWA ਵੱਖਰੇ ਮਾਰਗ ਉੱਤੇ ਚੱਲ ਰਿਹਾ ਹੈ ਤਾਂ ਤੁਹਾਨੂੰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਡਾਈਲਾਗ ਦੀ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "ਇਸ ਸਰਵਰ ਉੱਤੇ {0} ਲਈ ਕੋਈ ਪੱਤਰ-ਬਕਸਾ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਠੀਕ URL ਦਿੱਤਾ ਹੈ ਅਤੇ ਮੁੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਸਰਵਰ ਨਾਂ ਦੇ ਅੱਖਰ ਠੀਕ ਹਨ ਅਤੇ ਮੁੜ ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਠੀਕ ਹੈ ਅਤੇ ਮੁੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
-msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਗਲੋਬਲ ਲਿਸਟ ਸਰਵਰ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।"
+msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਗਲੋਬਲ ਸੂਚੀ ਸਰਵਰ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "{1} ਉੱਤੇ {0} ਯੂਜ਼ਰ ਲਈ ਕੋਈ ਪੱਤਰ-ਬਕਸਾ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "ਏਦਾਂ ਦਾ ਕੋਈ ਯੂਜ਼ਰ {0} ਨਹੀਂ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "ਪਾਸਵਰਡ ਸਫ਼ਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "ਇੱਕ ਡੈਲੀਗੇਟ ID ਦਿਓ ਜਾਂ ਇੱਕ ਡੈਲੀਗੇਟ ਵਾਂਗ ਭੇਜਣ ਚੋਣ ਹਟਾ ਦਿਓ।"
 
-#: ../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 "ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਗਲੋਬਲ ਲਿਸਟ ਸਰਵਰ ਨਾਂ ਠੀਕ ਹੈ"
+msgstr "ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਗਲੋਬਲ ਸੂਚੀ ਸਰਵਰ ਨਾਂ ਠੀਕ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਪਰਭਾਵੀ ਹੋਣ ਲਈ ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਲਾਓ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਯੂਜ਼ਰ ਚੁਣੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "ਸਰਵਰ ਨੇ ਪਾਸਵਰਡ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਬਹੁਤ ਕਮਜ਼ੋਰ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "ਜਦੋਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰੋਗੇ ਤਾਂ ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਆਯੋਗ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਨੂੰ ਤੁਹਾਡੇ ਵਲੋਂ ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰਨ ਤੋਂ ਬਾਅਦ ਹਟਾਇਆ ਜਾਵੇਗਾ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "ਐਕਸਚੇਜ਼ ਸਰਵਰ ਐਕਸਚੇਜ਼ ਕੁਨੈਕਟਰ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17222,7 +17707,7 @@ msgstr ""
 "ਸਰਵਰ ਐਕਸ਼ਚੇਜ਼ 5.5 ਨਾਲ ਚੱਲ ਰਿਹਾ ਹੈ। ਐਕਸ਼ਚੇਜ਼ ਕੁਨੈਕਟਰ ਮਾਈਕਰੋਸਾਫਟ\n"
 "ਐਕਸ਼ਚੇਜ਼ 2000 ਅਤੇ 2003 ਲਈ ਹੀ ਸਹਾਇਕ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17236,82 +17721,92 @@ msgstr ""
 "\n"
 "ਜਾਂ ਤੁਸੀਂ ਸਿਰਫ਼ ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "ਇੱਕ ਵੱਖਰੇ ਪਾਸਵਰਡ ਨਾਲ ਮੁੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
-msgstr "ਯੂਜ਼ਰ ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਲਿਸਟ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ:"
+msgstr "ਯੂਜ਼ਰ ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਸੋਧਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "ਖੋਜ {0} ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/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:521
 msgid "Unknown error."
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "ਅਣਜਾਣੀ ਕਿਸਮ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਰਵਰ ਉੱਤੇ ਆਪਣੇ ਪੱਤਰ ਸੰਭਾਲਣ ਲਈ ਕੋਟਾ ਭਰਨ ਦੇ ਨੇੜੇ ਹੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are permitted to send a message on behalf of only one delegator at a time."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਸਮੇਂ ਕੇਵਲ ਇੱਕ ਹੀ ਡੈਲੀਗੇਟਰ ਦੇ ਤੌਰ ਉੱਤੇ ਸੁਨੇਹਾ ਭੇਜਣ ਦੀ ਇਜ਼ਾਜ਼ਤ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "ਤੁਸੀਂ ਆਪਣੇ ਆਪ ਨੂੰ ਪ੍ਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾ ਸਕਦੇ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਰਵਰ ਉੱਤੇ ਪੱਤਰ ਸੰਭਾਲਣ ਲਈ ਆਪਣੇ ਕੋਟੇ ਤੋਂ ਵੱਧ ਗਏ ਹੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "ਤੁਸੀਂ ਇਕਹੇਰਾ ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਹੀ ਸੰਰਚਿਤ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਕੁਝ ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕੁਝ ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
-
 #: ../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 "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਹੁਣ ਸ਼ਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਕੁਝ ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕੁਝ ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
 
 #: ../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 "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕੁਝ ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾਂਦਾ ਹੈ।"
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਹੁਣ ਸ਼ਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
 
 #: ../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 ""
+"ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕੁਝ ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ "
+"ਨਹੀਂ ਜਾਂਦਾ ਹੈ।"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
-msgstr "{0} ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਲਿਸਟ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
+msgstr "{0} ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਡੈਲੀਗੇਟ ਹੈ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
-msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਲਿਸਟ ਵਿੱਚ ਹੈ"
+msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਸੂਚੀ ਵਿੱਚ ਹੈ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
@@ -17328,11 +17823,13 @@ msgstr "ਬਾਹਰੀ ਐਡੀਟਰ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "ਮੂਲ ਕਮਾਂਡ, ਜੋ ਕਿ ਐਡੀਟਰ ਵਜੋਂ ਵਰਤੀ ਜਾਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../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 ""
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਨੂੰ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਵਰਤਣ ਲਈ ਪਲੱਗਇਨ। ਤੁਸੀਂ ਕੇਵਲ ਸਮਤਲ-ਪਾਠ ਸੁਨੇਹੇ ਹੀ ਭੇਜ ਸਕਦੇ ਹੋ।"
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17349,12 +17846,18 @@ msgid "Editor not launchable"
 msgstr "ਐਡੀਟਰ ਚੱਲਣਯੋਗ ਨਹੀਂ ਹੈ"
 
 #: ../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."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੀ ਮੇਲ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਆਰਜ਼ੀ ਫਾਈਲ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
 #: ../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 "ਤੁਹਾਡੀ ਪਲੱਗਇਨ ਪਸੰਦ ਵਿੱਚ ਬਾਹਰੀ ਐਡੀਟਰ ਸੈੱਟ ਕੀਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇੱਕ ਵੱਖਰਾਐਡੀਟਰ ਸੈੱਟ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ। "
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"ਤੁਹਾਡੀ ਪਲੱਗਇਨ ਪਸੰਦ ਵਿੱਚ ਬਾਹਰੀ ਐਡੀਟਰ ਸੈੱਟ ਕੀਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇੱਕ ਵੱਖਰਾਐਡੀਟਰ "
+"ਸੈੱਟ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ। "
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 #, fuzzy
@@ -17365,11 +17868,11 @@ msgstr "ਬਾਹਰੀ ਐਡੀਟਰ ਵਿੱਚ ਕੰਪੋਜ਼ ਕਰ�
 msgid "Compose messages using an external editor"
 msgstr "ਸੁਨੇਹੇ ਬਾਹਰੀ ਐਡੀਟਰ ਨਾਲ ਲਿਖੋ"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "ਐਡੀਟਰ ਚਾਲੂ ਕਰਨ ਲਈ ਚਲਾਉਣ ਵਾਸਤੇ ਕਮਾਂਡ:"
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17377,33 +17880,35 @@ msgstr ""
 "Emacs ਲਈ \"xemacs\" ਵਰਤੋਂ\n"
 "VI ਲਈ \"gvim\" ਵਰਤੋਂ"
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "ਇੱਕ (48*48) png ਆਕਾਰ ਚੁਣੋ < 700ਬਾਇਟ"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG ਫਾਇਲਾਂ"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "ਫੇਸ(_F)"
 
 #: ../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."
+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 ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "ਫੇਸ"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "ਫੋਲਡਰ \"%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."
+#, fuzzy
+#| msgid ""
+#| "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr "ਫੋਲਡਰ ਲੜੀ ਪਰਸੰਗ ਮੇਨੂ ਵਿੱਚ ਪੱਤਰ ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
@@ -17414,25 +17919,12 @@ msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ ਹਟਾਓ"
 msgid "_Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../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
-msgid "Google"
-msgstr "ਗੂਗਲ"
-
-#: ../plugins/google-account-setup/google-source.c:439
-#, fuzzy
-msgid "Please enter user name first."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਨਾਂ ਚੁਣੋ"
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:421
 #, fuzzy, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "ਫੋਲਡਰ ਨੂੰ ਆਪਣੀ ਫੋਲ਼ਡਰ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
+msgstr "ਫੋਲਡਰ ਨੂੰ ਆਪਣੀ ਫੋਲ਼ਡਰ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:521
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17441,44 +17933,53 @@ msgstr ""
 "ਗੂਗਲ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:683
 #, fuzzy
 msgid "Cal_endar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:718
 #, fuzzy
 msgid "Retrieve _list"
 msgstr "%s ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "ਗੂਗਲ"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
 #, fuzzy
 msgid "<b>Server</b>"
 msgstr "<b>ਮੈਂਬਰ</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 #, fuzzy
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "ਜਾਂਚ ਲਿਸਟ"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+#| msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+#| msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "ਗਰੁੱਪਵਾਈਜ ਅਕਾਊਂਟ ਸੈਟਅੱਪ"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17503,24 +18004,24 @@ msgstr ""
 "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ 'ਅੱਗੇ' ਦਬਾਓ\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲ ਕਰੋ"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲੇਸ਼ਨ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "ਕੂੜਾ ਸੈਟਿੰਗ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "ਕੂੜਾ ਪੱਤਰ ਸੈਟਿੰਗ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "ਕੂੜਾ ਪੱਤਰ ਸੈਟਿੰਗ..."
 
@@ -17533,7 +18034,7 @@ msgid "Email:"
 msgstr "ਈ-ਮੇਲ:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "ਅਯੋਗ(_D)"
 
@@ -17551,8 +18052,10 @@ msgid "Message Retract"
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ"
 
 #: ../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 ""
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr "ਇੱਕ ਸੁਨੇਹੇ ਨੂੰ ਮੁੜ-ਜਾਂਚਣ ਨਾਲ ਇਸ ਨੂੰ ਪ੍ਰਾਪਤ-ਕਰਤਾ ਦੇ ਮੇਲ ਬਕਸੇ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਇਹ ਕਰਨ ਲਈ ਯਕੀਨੀ ਹੋ?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17563,15 +18066,21 @@ msgid "Retract Mail"
 msgstr "ਪੱਤਰ ਮੁੜ-ਜਾਂਚ"
 
 #: ../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"
+msgid "Add Send Options to GroupWise messages"
 msgstr "ਸਮੂਹੀਕ੍ਰਿਤ ਸੁਨੇਹਿਆਂ ਲਈ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "ਗਰੁੱਪਵਾਇਜ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+#| msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "ਗਰੁੱਪਵਾਇਜ ਫੀਚਰ"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17591,23 +18100,26 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਨਵੇਂ ਕੰ�
 msgid "Invalid user"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "ਫਾਇਲ &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
 #, fuzzy
 msgid "Specify User"
 msgstr "ਯੂਜ਼ਰ ਚੁਣੋ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 #, fuzzy
 msgid "You have already given proxy permissions to this user."
 msgstr "ਤੁਹਾਨੂੰ ਮੇਰੇ ਫੋਲਡਰ ਲਈ ਹੇਠ ਦਿੱਤੇ ਅਧਿਕਾਰ ਦਿੱਤੇ ਗਏ ਹਨ:"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਹੱਕ ਦੇਣ ਲਈ ਇੱਕ ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ।"
 
@@ -17625,34 +18137,40 @@ msgid "Account Already Exists"
 msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
 
 #: ../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 ""
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "&quot;{0}&quot; ਵਜੋਂ ਪਰਾਕਸੀ ਲਾਗਇਨ ਫੇਲ੍ਹ ਰਿਹਾ। ਆਪਣਾ ਈਮੇਲ ਸਿਰਨਾਵਾਂ ਚੈੱਕ ਕਰੋ ਅਤੇ ਮੁੜ-ਲਾਗਇਨ ਦੀ ਟਰਾਈ ਕਰੋ।"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
 msgid "This is a recurring meeting"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
 msgid "Would you like to accept it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 #, fuzzy
 msgid "Would you like to decline it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
 #, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "ਆਟੋਮੈਟਿਕ ਫਾਇਲ &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"
-msgstr "ਤੁਹਾਨੂੰ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ, ਜਿਸ ਨੂੰ ਲਿਸਟ 'ਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+#| msgid "You have to specify a user name whom you want to add to the list"
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "ਤੁਹਾਨੂੰ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ, ਜਿਸ ਨੂੰ ਸੂਚੀ 'ਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "ਅਜ਼ਮਾਇਸੀ ਆਰਜ਼ੀ"
 
@@ -17669,7 +18187,7 @@ msgid "Con_tacts..."
 msgstr "ਸੰਪਰਕ(_t)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
@@ -17738,7 +18256,8 @@ msgstr "ਲਿਖਣ(_W)"
 msgid "permission to read|_Read"
 msgstr "ਪੜ੍ਹਨ(_R)"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "ਪਰਾਕਸੀ"
 
@@ -17746,14 +18265,15 @@ msgstr "ਪਰਾਕਸੀ"
 msgid "<b>Account Name</b>"
 msgstr "<b>ਅਕਾਊਂਟ ਨਾਂ</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਇਨ"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%1$s %2$s (ਯੂਜ਼ਰ %3$s) ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
@@ -17761,99 +18281,107 @@ msgstr "%1$s %2$s (ਯੂਜ਼ਰ %3$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 "ਪਰਾਕਸੀ ਲਾਗਇਨ(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਆਨਲਾਇਨ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਯੋਗ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+#| msgid "Insert advanced send options"
+msgid "Advanced send options"
+msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
+
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "ਯੂਜ਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "ਯੂਜ਼ਰ ਦਿਓ ਅਤੇ ਅਧਿਕਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਫੋਲਡਰ(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "ਸਾਂਝ"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 #, fuzzy
 msgid "Custom Notification"
 msgstr "ਇਕਸਾਰ"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "ਸੋਧ"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "ਵਲੋਂ:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "ਲਿਖਣ ਮਿਤੀ:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ਕੀਤੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "ਖੋਲ੍ਹੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "ਮਨਜ਼ੂਰ ਕੀਤੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "ਹਟਾਏ: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "ਇਨਕਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "ਪੂਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "ਅਣ-ਡਿਲਵਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ ਟਰੈਕ..."
 
@@ -17883,7 +18411,7 @@ msgstr "<b>IMAP ਹੈੱਡਰ</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr "ਮੁੱਢਲੇ ਅਤੇ ਮੇਲਿੰਗ ਲਿਸਟ ਹੈੱਡਰ (ਮੂਲ) (_M)"
+msgstr "ਮੁੱਢਲੇ ਅਤੇ ਮੇਲਿੰਗ ਸੂਚੀ ਹੈੱਡਰ (ਮੂਲ) (_M)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
@@ -17891,7 +18419,8 @@ msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_l)"
 
 #: ../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 ""
 "ਵਾਧੂ ਹੈੱਡਰ ਦਿੰਦੀ ਹੈ, ਜਿਸ ਦੀ ਤੁਹਾਨੂੰ ਸਟੈਂਡਰਡ ਹੈੱਡਰ ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n"
@@ -17911,7 +18440,7 @@ msgid ""
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "ਮੂਲ ਹੈੱਡਰ - (ਸਭ ਤੋਂ ਤੇਜ਼) (_B)\n"
-"ਇਹ ਚੁਣੋ, ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ ਨਹੀਂ ਹਨ"
+"ਇਹ ਚੁਣੋ, ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ ਨਹੀਂ ਹਨ"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "A plugin for the features in the IMAP accounts."
@@ -17921,28 +18450,28 @@ msgstr "IMAP ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇ
 msgid "IMAP Features"
 msgstr "IMAP ਫੀਚਰ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:77
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "ਕੈਲੰਡਰ ਆਯਾਤ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "ਕੰਮ ਆਯਾਤ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:200
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS ਆਯਾਤ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:223
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
-msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
+msgstr "ਕੰਮ ਸੂਚੀ ਚੁਣੋ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:227
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "ਆਯਾਤ(_I)"
 
@@ -17955,30 +18484,41 @@ msgstr "ਆਯਾਤ ਲਈ ਕੈਲੰਡਰ"
 msgid "Imports ICS attachments to calendar."
 msgstr "ICS ਨੱਥੀ ਕੈਲੰਡਰ ਲਈ ਆਯਾਤ ਕਰੋ।"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "ਹਾਰਡਵੇਅਰ ਅਬਸਟਸ਼ਨ ਲੇਅਰ ਲੋਡ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
-msgstr "\"hald\" ਸਰਵਿਸ ਲੋੜੀਦੀ ਸੀ, ਪਰ ਇਸ ਵੇਲੇ ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ। ਸਰਵਿਸ ਯੋਗ ਕਰੋ ਅਤੇ ਇਹ ਪਰੋਗਰਾਮ ਮੁੜ-ਚਾਓ ਜਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+#: ../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 ""
+"\"hald\" ਸਰਵਿਸ ਲੋੜੀਦੀ ਸੀ, ਪਰ ਇਸ ਵੇਲੇ ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ। ਸਰਵਿਸ ਯੋਗ ਕਰੋ ਅਤੇ ਇਹ ਪਰੋਗਰਾਮ ਮੁੜ-"
+"ਚਾਓ ਜਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "ਇੱਕ iPod ਖੋਜ ਫੇਲ੍ਹ ਹੋਈ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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 "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਇੱਕ iPod ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਜਾਂ ਤਾਂ ਇਹ ਤੁਹਾਡੇ ਸਿਸਟਮ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਹੈ ਜਾਂ ਇਹ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
+#: ../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 ""
+"ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਇੱਕ iPod ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਜਾਂ ਤਾਂ ਇਹ ਤੁਹਾਡੇ ਸਿਸਟਮ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ "
+"ਹੈ ਜਾਂ ਇਹ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar ਫਾਰਮੈਟ (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "ਐਪਲ ਆਈਪੋਡ ਨਾਲ ਚੁਣੀ ਟਾਸਕ/ਮੀਮੋ/ਕੈਲੰਡਰ/ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ"
+#, fuzzy
+#| msgid ""
+#| "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "ਐਪਲ ਆਈਪੋਡ ਨਾਲ ਚੁਣੀ ਟਾਸਕ/ਮੀਮੋ/ਕੈਲੰਡਰ/ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17988,631 +18528,652 @@ msgstr "iPod ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼"
 msgid "iPod Synchronization"
 msgstr "iPod ਸਿਕਰੋਨਾਈਜ਼"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%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 "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
-msgstr "ਕਿਸੇ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
-msgstr "ਕਿਸੇ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਕਿਸੇ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
-msgstr "ਟਾਸਕ ਜਾਣਕਾਰੀ ਭੇਜੀ"
+msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
-msgstr "ਟਾਸਕ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਟਾਸਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਕੰਮ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../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:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (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:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇਕਾਈ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../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"
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾਸ ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1584
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਆਯਾਤ ਕਰਨਾ ਪਵੇਗਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "ਇਹ ਮੀਟਿੰਗ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
-msgstr "ਇਹ ਟਾਸਕ ਫੇਰ ਹੋਵੇਗੀ"
+msgstr "ਇਹ ਕੰਮ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "ਅਪਵਾਦ ਖੋਜ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189
-#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "ਅੱਜ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "ਅੱਜ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "ਅੱਜ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "ਅੱਜ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ਕੱਲ੍ਹ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "ਕੱਲ੍ਹ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "ਕੱਲ੍ਹ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ਕੱਲ੍ਹ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਜਵਾਬ ਭੇਜੋ ਜੀ"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਲਿਆ"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ਤੁਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ਤਾਜ਼ੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤਾ ਮੀਟਿੰਗ ਜਾਵਾਬ ਵਾਪਸ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੇ ਮੀਟਿੰਗ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ।"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਟਾਸਕ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਟਾਸਕ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
+msgstr "<b>%s</b> ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਕੰਮ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਟਾਸਕ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ:"
+msgstr "<b>%s</b> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਭੇਜੇ ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ਨੇ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ(_O))"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "ਮਨਜ਼ੂਰ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "ਆਰਜ਼ੀ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "ਸਭ ਮਨਜ਼ੂਰ(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "ਅੱਪਡੇਟ(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "ਟਿੱਪਣੀ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ ਦਿਓ(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "ਟਾਈਮ ਫਰੀ ਵਾਂਗ ਵੇਖੋ(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "ਅਟੈਂਚਮਿੰਟ ਰੀਮਾਈਡਰ"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "ਕੰਮ(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "ਮੀਮੋ :"
 
@@ -18625,7 +19186,9 @@ msgid "Itip Formatter"
 msgstr "Itip ਫਾਰਮੈਟਰ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
 msgstr "&quot;{0}&quot; ਮੀਟਿੰਗ ਲਈ ਡੈਲੀਗੇਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੈਲੀਗੇਟ &quot;{1}&quot; ਨੂੰ ਜੋੜਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18636,7 +19199,7 @@ msgstr "ਇਹ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ"
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਭੇਜਣ ਵਾਲੇ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਆਉਟ(_L)"
 
@@ -18670,7 +19233,9 @@ msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ D-BUS �
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 #, fuzzy
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "ਕੀ ਨਵੇਂ ਸੁਨੇਹੇ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਜਾਂ ਬੀਪ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18713,22 +19278,22 @@ msgstr "ਕੀ ਆਈਕਾਨ ਝਪਕਦਾ ਹੋਣਾ ਚਾਹੀਦਾ �
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ਕੀ ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿਚਲੇ ਸੁਨੇਹਿਆਂ ਲਈ ਹੀ ਨੋਟੀਫਾਈ ਕਰਨਾ ਹੈ।"
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 #, fuzzy
 msgid "Evolution's Mail Notification"
 msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 #, fuzzy
 msgid "Mail Notification Properties"
 msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18743,68 +19308,74 @@ msgstr[1] ""
 "ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵੇਂ ਸੁਨੇਹੇ\n"
 "ਆਏ ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ਤੁਹਾਨੂੰ ਇੱਕ ਨਵਾਂ %d  ਸੁਨੇਹਾ ਆਇਆ ਹੈ।"
 msgstr[1] "ਤੁਹਾਨੂੰ %d  ਨਵੇਂ ਸੁਨੇਹੇ ਆਏ ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "ਨਵੀਂ ਈਮੇਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਏ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖੋ(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਵਿੱਚ ਆਈਕਾਨ ਝਪਕਾਓ(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "ਆਈਕਾਨ ਨਾਲ ਸੁਨੇਹਾ ਵੀ ਪੋਪਅੱਪ ਕਰੋ(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "ਬੀਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "ਸਾਊਂਡ ਫਾਈਲ ਚਲਾਓ(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "ਖਾਸ ਫਾਇਲ ਨਾਂ(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "ਚਲਾਓ(_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ(_I)"
 
 #: ../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 "ਇੱਕ ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ ਜਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਆਈਕਾਨ ਨਾਲ ਨੋਟੀਫਾਈ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਦਾ ਹੈ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+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 ""
+"ਇੱਕ ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ ਜਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਆਈਕਾਨ ਨਾਲ ਨੋਟੀਫਾਈ ਕੀਤਾ ਜਾਂਦਾ ਹੈ "
+"ਅਤੇ ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਦਾ ਹੈ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #: ../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 "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਤੋਂ ਮੀਟਿੰਗਾਂ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
@@ -18815,17 +19386,21 @@ msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
 msgid "Mail to meeting"
 msgstr "ਮੀਟਿੰਗ ਲਈ ਪੱਤਰ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
-msgstr "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਟਾਸਕ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
+#: ../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 "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਕੰਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
 
 #: ../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 "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗ ਤੋਂ ਕੰਮ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
@@ -18843,19 +19418,19 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਨਵੇਂ ਕੰ�
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮਾਲਕ(_o)"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮਾਲਕ(_o)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
-msgstr "ਲਿਸਟ ਅਕਾਇਵ ਲਵੋ(_a)"
+msgstr "ਸੂਚੀ ਅਕਾਇਵ ਲਵੋ(_a)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 msgid "Get list _usage information"
-msgstr "ਵਰਤੋਂ ਲਿਸਟ ਜਾਣਕਾਰੀ ਲਵੋਂ(_u)"
+msgstr "ਵਰਤੋਂ ਸੂਚੀ ਜਾਣਕਾਰੀ ਲਵੋਂ(_u)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਕਾਰਵਾਈ"
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਕਾਰਵਾਈ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
@@ -18864,19 +19439,19 @@ msgstr "ਮੇਲਿੰਗ ਲਿਸਟ(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "ਆਮ ਮੇਲਿੰਗ ਲਿਸਟ ਕਮਾਂਡਾਂ (ਮੈਂਬਰ ਬਣੋ, ਹਟੋ,...) ਉਪਲੱਬਧ ਕਰਵਾਉਦਾ ਹੈ।"
+msgstr "ਆਮ ਮੇਲਿੰਗ ਸੂਚੀ ਕਮਾਂਡਾਂ (ਮੈਂਬਰ ਬਣੋ, ਹਟੋ,...) ਉਪਲੱਬਧ ਕਰਵਾਉਦਾ ਹੈ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
-msgstr "ਲਿਸਟ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
+msgstr "ਸੂਚੀ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
-msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
+msgstr "ਸੂਚੀ ਲਈ ਮੈਂਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
-msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
+msgstr "ਸੂਚੀ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18884,13 +19459,16 @@ msgstr "ਕਾਰਵਾਈ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #: ../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 ""
-"URL \"{0}\" ਨੂੰ ਈ-ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾਵੇਗਾ, ਤੁਸੀਂ ਆਟੋਮੈਟਿਕ ਸੁਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ, ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ ਵੇਖ ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
+"URL \"{0}\" ਨੂੰ ਈ-ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾਵੇਗਾ, ਤੁਸੀਂ ਆਟੋਮੈਟਿਕ ਸੁਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ, ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ "
+"ਵੇਖ ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
 "\n"
-"ਤੁਸੀਂ ਮੇਲਿੰਗ ਲਿਸਟ ਤੇ ਭੇਜਣ ਬਾਅਦ ਤਰੁੰਤ ਜਵਾਬ ਪ੍ਰਾਪਤ ਕਰ ਲਵੋਗੇ।"
+"ਤੁਸੀਂ ਮੇਲਿੰਗ ਸੂਚੀ ਤੇ ਭੇਜਣ ਬਾਅਦ ਤਰੁੰਤ ਜਵਾਬ ਪ੍ਰਾਪਤ ਕਰ ਲਵੋਗੇ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -18905,21 +19483,27 @@ msgid "Posting not allowed"
 msgstr "ਪੋਸਟਿੰਗ ਉੱਤੇ ਪਾਬੰਦੀ ਹੈ"
 
 #: ../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 "ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੇ ਪੱਤਰ ਭੇਜਣ ਤੇ ਰੋਕ ਹੈ। ਸੰਭਵ ਤੌਰ ਤੇ, ਇਹ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੀ ਪੱਤਰ ਲਿਸਟ ਹੈ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਲਿਸਟ ਪ੍ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"ਇਸ ਮੇਲਿੰਗ ਸੂਚੀ ਤੇ ਪੱਤਰ ਭੇਜਣ ਤੇ ਰੋਕ ਹੈ। ਸੰਭਵ ਤੌਰ ਤੇ, ਇਹ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੀ ਪੱਤਰ ਸੂਚੀ ਹੈ। ਵਧੇਰੇ "
+"ਜਾਣਕਾਰੀ ਲਈ ਸੂਚੀ ਪ੍ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
+msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਸੂਚੀ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
 
 #: ../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 ""
-"ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਹ ਦਾ ਅਰਥ ਹੈ, ਕਿ ਇਸ ਕਾਰਵਾਈ ਲਈ ਮੁੱਖ ਵਿੱਚ ਉਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ, ਜਿਸ ਨੂੰ ਅਸੀਂ ਹੈਂਡਲ ਕਰ ਸਕਦੇ ਹਾਂ।\n"
+"ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਹ ਦਾ ਅਰਥ ਹੈ, ਕਿ ਇਸ ਕਾਰਵਾਈ ਲਈ ਮੁੱਖ ਵਿੱਚ ਉਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ "
+"ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ, ਜਿਸ ਨੂੰ ਅਸੀਂ ਹੈਂਡਲ ਕਰ ਸਕਦੇ ਹਾਂ।\n"
 "\n"
 "ਹੈੱਡਰ: {0}"
 
@@ -18934,7 +19518,9 @@ msgstr ""
 "ਹੈੱਡਰ: {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."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਹੈੱਡਰ ਵਿੱਚ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18947,68 +19533,70 @@ msgstr "ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮਾਲਕ(_O)"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮਾਲਕ(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਦੇ ਮਾਲਕ ਨਾਲ ਸੰਪਰਕ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਦੇ ਮਾਲਕ ਨਾਲ ਸੰਪਰਕ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
-msgstr "ਲਿਸਟ ਅਕਾਇਵ ਲਵੋ(_A)"
+msgstr "ਸੂਚੀ ਅਕਾਇਵ ਲਵੋ(_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get List _Usage Information"
-msgstr "ਵਰਤੋਂ ਲਿਸਟ ਜਾਣਕਾਰੀ ਲਵੋਂ(_U)"
+msgstr "ਵਰਤੋਂ ਸੂਚੀ ਜਾਣਕਾਰੀ ਲਵੋਂ(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੇ ਅਕਾਇਵ ਖੋਜੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਸੂਚੀ ਦੇ ਅਕਾਇਵ ਖੋਜੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਵੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਸੂਚੀ ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਵੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰ ਬਣੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਮੈਂਬਰ ਬਣੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "ਲਿਸਟ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
+msgstr "ਸੂਚੀ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
-msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
+msgstr "ਸੂਚੀ ਲਈ ਮੈਂਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
-msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
+msgstr "ਸੂਚੀ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
+#: ../plugins/mark-all-read/mark-all-read.c:39
 #, fuzzy
 msgid "Also mark messages in subfolders?"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:41
 #, fuzzy
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+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 "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
 #, fuzzy
 msgid "Current Folder and _Subfolders"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਉੱਤੇ(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
 #, fuzzy
 msgid "Current _Folder Only"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
@@ -19025,22 +19613,6 @@ msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਹੋਏ ਬਣਾ�
 msgid "Used for marking all the messages under a folder as read"
 msgstr "ਇੱਕ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆਂ ਬਣਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "ਕੈਲੰਡਰ ਆਫਲਾਇਨ ਬਣਾਓ"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਨੂੰ ਆਫਲਾਇਨ ਵੇਖਣ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ।"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਨਾ ਕਰਵਾਓ(_D)"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਕਰਵਾਓ(_M)"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "ਮੋਨੋ ਪਲੱਗ-ਇਨ ਦੇ ਸੈਟਿੰਗ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
@@ -19055,7 +19627,7 @@ msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਲੱਗ-ਇਨਾਂ �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "ਪਲੱਗ-ਇਨ ਮੈਨੇਜਰ"
 
@@ -19067,34 +19639,36 @@ msgstr "ਪਲੱਗ-ਇਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
 msgid "_Plugins"
 msgstr "ਪਲੱਗ-ਇਨ(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "ਲੇਖਕ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ਸੰਰਚਨਾ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ਨੋਟ: ਕੁਝ ਤਬਦੀਲੀਆਂ ਮੁੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਪ੍ਰਭਾਵੀ ਨਹੀਂ ਹੋ ਸਕਦੀਆਂ ਹਨ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "ਸੰਖੇਪ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "ਪਲੱਗ-ਇਨ"
 
 #: ../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 ""
-"ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+"ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML "
+"ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "\n"
 "ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਝਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
 
@@ -19107,19 +19681,19 @@ msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
 msgid "Prefer plain-text"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਸੰਦ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖਾਓ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "ਸਧਾਰਨ ਹੀ ਪਸੰਦ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "ਹਮੇਸ਼ਾ ਸਧਾਰਨ ਹੀ ਵੇਖਾਓ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HT_ML ਮੋਡ"
 
@@ -19131,6 +19705,49 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਪਰੋਫਾਇਲਰ"
 msgid "Writes a log of profiling data events."
 msgstr "ਡਾਟਾ ਘਟਨਾਵਾਂ ਨੂੰ ਪਰੋਫਾਇਲ ਕਰਨ ਦਾ ਲਾਗ ਰੱਖੋ।"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import mail from Pine."
+msgid "Import Outlook messages from PST file"
+msgstr "Pine ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook PST import"
+msgstr "ਆਉਟਲੁੱਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook ਨਿੱਜੀ ਫੋਲਡਰ (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+#, fuzzy
+#| msgid "Address Book"
+msgid "_Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਬੁੱਕ"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+#, fuzzy
+#| msgid "Appointments"
+msgid "A_ppointments"
+msgstr "ਮੁਲਾਕਾਤ"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+#, fuzzy
+#| msgid "Journal"
+msgid "_Journal entries"
+msgstr "ਜਰਨਲ"
+
+#: ../plugins/pst-import/pst-importer.c:352
+#, fuzzy
+#| msgid "Importing Elm data"
+msgid "Importing Outlook data"
+msgstr "ਈਲਨ ਡਾਟਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "ਕੈਲੰਡਰਾਂ ਨੂੰ ਵੈੱਬ ਉੱਤੇ ਪਰਕਾਸ਼ਿਤ ਹੋਣ ਲਈ ਮਨਜ਼ੂਰ ਕਰਦਾ ਹੈ"
@@ -19147,8 +19764,10 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+#| msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "ਕੀ ਤੁਸੀਂ URL ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19186,8 +19805,17 @@ msgid "Publishing _Frequency:"
 msgstr "ਪਰਕਾਸ਼ਨ ਆਵਿਰਤੀ(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
+#| msgid ""
+#| "SSH\n"
+#| "Public FTP\n"
+#| "FTP (with login)\n"
+#| "Windows share\n"
+#| "WebDAV (HTTP)\n"
+#| "Secure WebDAV (HTTPS)\n"
+#| "Custom Location"
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19235,6 +19863,18 @@ msgstr ""
 "iCal\n"
 "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+#| msgid "Location"
+msgid "New Location"
+msgstr "ਟਿਕਾਣਾ"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+#| msgid "Location"
+msgid "Edit Location"
+msgstr "ਟਿਕਾਣਾ"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 #, fuzzy
 msgid "Hello Python"
@@ -19253,76 +19893,82 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "ਪਾਈਥਨ ਈ-ਪਲੱਗਇਨ ਲੋਡਰ ਲਈ ਟੈਸਟ ਪਲੱਗਇਨ।"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
-msgstr ""
+msgid "A plugin which loads other plugins written using Python."
+msgstr "ਇੱਕ ਪਲੱਗਇਨ, ਜੋ ਹੋਰ ਪਲੱਗਇਨ ਲੋਡ ਕਰਦੀ ਹੈ, ਪਾਈਥਨ ਨਾਲ ਲਿਖੀ।"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 #, fuzzy
 msgid "Python Loader"
 msgstr "ਮੋਨੋ ਲੋਡਰ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (ਬਿਲਟ-ਇਨ)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, fuzzy, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ਜੰਕ ਪਲੱਗ-ਇਨ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, fuzzy, c-format
 msgid "Failed to create pipe: %s"
-msgstr "ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "ਸਥਾਨਕ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, fuzzy, c-format
 msgid "Error after fork: %s"
 msgstr ""
 "%s ਤੇ ਗਲਤੀ:\n"
 " %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 ""
+msgstr "SpamAssassin ਚਾਈਲਡ ਪਰੋਸੈਸ ਜਵਾਬ ਨਹੀਂ ਦਿੰਦਾ, ਖਤਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr ""
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "SpamAssassin ਚਾਈਲਡ ਪਰੋਸੈੱਸ ਦਖਲ ਦੀ ਉਡੀਕ, ਖਤਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../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 ""
+msgstr "SpamAssassin ਲਈ ਪਾਈਪ ਫੇਲ੍ਹ, ਗਲਤੀ ਕੋਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, fuzzy, c-format
 msgid "SpamAssassin is not available."
 msgstr "ਭੇਜਣ ਚੋਣ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 #, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ਇਹ Spamassasin ਨੂੰ ਹੋਰ ਵੀ ਭਰੋਸੇਯੋਗ ਬਣਾਉਦਾ ਹੈ, ਪਰ ਹੌਲੀ ਕਰਦਾ ਹੈ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮੋਟ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ(_n)"
 
 #: ../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 "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin ਇੰਸਟਾਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+"SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin ਇੰਸਟਾਲ "
+"ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin ਜੰਕ ਪਲੱਗ-ਇਨ"
+#, fuzzy
+#| msgid "Spamassassin Options"
+msgid "SpamAssassin Options"
+msgstr "Spamassassin ਚੋਣਾਂ"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Spamassassin ਚੋਣਾਂ"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin ਜੰਕ ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19330,7 +19976,7 @@ msgstr "ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਨੱਥੀ ਸਭ ਦਸਤਾ�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
@@ -19342,15 +19988,15 @@ msgstr "ਨੱਥੀ ਸੰਭਾਲੋ..."
 msgid "Save all attachments"
 msgstr "ਸਭ ਨੱਥੀ ਸੰਭਾਲੋ..."
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "ਸੰਭਾਲ ਮੂਲ ਨਾਂ ਚੁਣੋ"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME ਕਿਸਮ"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -19358,79 +20004,79 @@ msgstr "ਸੰਭਾਲੋ"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "ਵੇਰਵਾ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "ਟਿੱਪਣੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "ਬਣਾਇਆ"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "ਦਰਸ਼ਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "ਸੋਧਿਆ"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "ਸੁਝਾਇਆ ਹੈੱਡਰ"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "ਮੂਲ ਸੀਮਾ:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "ਰਿਕਾਰਡ ਸੀਮਾ:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਮੁੱਲ਼ ਫਾਰਮੈਟ (.csv)"
 
@@ -19451,15 +20097,15 @@ msgstr "ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮੈਟ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚੁਣੋ"
 
@@ -19477,32 +20123,33 @@ msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖਾਓ(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "ਕੇਵਲ ਮੇਮਰੀ ਲਿਸਟ ਹੀ ਵੇਖੋ(_o)"
+msgstr "ਕੇਵਲ ਮੇਮਰੀ ਸੂਚੀ ਹੀ ਵੇਖੋ(_o)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "ਸਿਰਫ਼ ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖਾਓ(_O)"
+msgstr "ਸਿਰਫ਼ ਇਹ ਕੰਮ ਸੂਚੀ ਹੀ ਵੇਖਾਓ(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
-msgstr ""
+msgstr "ਆਪਣੇ ਸ਼ੁਰੂਆਤੀ ਅਕਾਊਂਟ ਸੈਟਅੱਪ ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਮੱਦਦ।"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 #, fuzzy
 msgid "Setup Assistant"
 msgstr "ਸਹਾਇਕ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈੱਟਅੱਪ ਸਹਾਇਕ "
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "ਜੀ ਆਇਆ ਨੂੰ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"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 ""
@@ -19511,29 +20158,29 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਜਾਰੀ ਰਹਿਣ ਲਈ \"ਅੱਗੇ\" ਬਟਨ ਦਬਾਓ।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "ਫਾਇਲਾਂ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:143
+#: ../plugins/startup-wizard/startup-wizard.c:137
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਆਯਾਤ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../plugins/startup-wizard/startup-wizard.c:152
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "ਵੱਲੋਂ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
-#: ../shell/e-shell-importer.c:507
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "ਡਾਟਾ ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:521
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 
@@ -19550,35 +20197,39 @@ msgid "Thread messages by subject"
 msgstr "ਵਿਸ਼ੇ ਰਾਹੀਂ ਮਸਲਾ ਸੁਨੇਹੇ"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "ਥਰਿੱਡ ਸੁਨੇਹਿਆਂ ਵਾਸਤੇ ਫਾਲਬੈਕ ਲਈ ਵਿਸ਼ਾ(_a)"
 
 #: ../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 ""
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:603
 #, fuzzy
 msgid "No title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 #, fuzzy
 msgid "Save as _Template"
 msgstr "ਡੈਲੀਗੇਟ ਵਾਂਗ ਭੇਜੋ"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 #, fuzzy
 msgid "Save as Template"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr ""
+msgstr "ਟੈਪਲੇਟ ਪਲੱਗਇਨ ਮੁਤਾਬਕ ਡਰਾਫਟ"
 
 #: ../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."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "ਇੱਕ ਸੈਂਪਲ ਪਲੱਗਇਨ, ਜੋ ਕਿ tnef ਅਟੈਂਚਮਿੰਟ ਨੂੰ ਡੀਕੋਡ ਕਰਨ ਲਈ ytnef ਵਰਤਦਾ ਹੈ।"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19595,20 +20246,19 @@ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ �
 msgid "WebDAV contacts"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
 #, fuzzy
 msgid "URL:"
 msgstr "_URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
-msgstr ""
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "ਜੇ-ਮੇਲ ਅਣਡਿੱਠਾ (_Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19628,7 +20278,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਟੈਸਟ ਭਾਗ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "ਪਰਾਕਸੀ ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਪਰਮਾਣਿਤ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
@@ -19657,7 +20307,7 @@ msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਚੌੜਾਈ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
+msgstr "ਜਦੋਂ HTTP/ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਵਰਤਣਾ ਹੋਵੇ ਤਾਂ ਪਰਾਕਸੀ ਸਥਾਪਨ ਚਾਲੂ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -19681,7 +20331,11 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ਭਾਗ ਦਾ ID ਜਾਂ ਉਪਨਾਂ ਨੂੰ ਸ਼ੁਰੂਆਤ ਤੇ ਵੇਖਿਆ ਜਾਇਆ ਕਰੇਗਾ।"
 
 #: ../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."
+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 ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
@@ -19698,7 +20352,7 @@ msgstr "ਗ਼ੈਰ-ਪਰਾਕਸੀ ਹੋਸਟ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "ਜਦੋਂ HTTP ਪਰਾਕਸੀ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪਰਮਾਣਕਿਤਾ ਵਾਸਪੇ ਪਾਸਵਰਡ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 #, fuzzy
@@ -19722,7 +20376,11 @@ msgid "Secure HTTP proxy port"
 msgstr "ਸੁਰੱਖਿਅਤ 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."
+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 ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -19733,8 +20391,7 @@ msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਡਾਈਲਾਗ ਛੱਡੋ"
 
-#: ../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 "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
@@ -19743,7 +20400,9 @@ msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
 #: ../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 "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
@@ -19759,39 +20418,58 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
 #: ../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 "ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0"
+"\")"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "ਪਰਾਕਸੀ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "ਪਰਕਾਸੀ ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "ਪਰਾਕਸੀ ਸਾਕਟ ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
 #: ../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."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h: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 "ਵਿੰਡੋ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਹੈ। \"ਟੈਕਸਟ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਟੂਲਬਾਰ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਟੂਲਬਾਰ\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
+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 ""
+"ਵਿੰਡੋ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਹੈ। \"ਟੈਕਸਟ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਟੂਲਬਾਰ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਟੂਲਬਾਰ"
+"\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
 
 #: ../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)."
+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 ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
@@ -19809,7 +20487,7 @@ msgstr "HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "ਪਰਮਾਣਕਿਤਾ ਵਜੋਂ ਦੇਣ ਲਈ ਯੂਜ਼ਰ ਨਾਂ, ਜਦੋਂ ਕਿ HTTP ਪਰਾਕਸੀ ਜਾਰੀ ਹੋਵੇ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19864,20 +20542,26 @@ msgid "Choose the type of importer to run:"
 msgstr "ਚਲਾਉਣ ਲਈ ਆਯਾਤਕਾਰ ਦੀ ਕਿਸਮ ਚੁਣੋ:"
 
 #: ../shell/e-shell-importer.c:134
+#, fuzzy
+#| msgid ""
+#| "Choose the file that you want to import into Evolution, and select what "
+#| "type of file it is from the list.\n"
+#| "\n"
+#| "You can select \"Automatic\" if you do not know, and Evolution will "
+#| "attempt to work it out."
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
 msgstr ""
-"ਫਾਇਲ, ਜੋ ਵੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਆਯਾਤ ਕਰਨੀ ਹੈ ਅਤੇ ਇਸ ਦੀ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚੋਂ ਚੁਣੋ।\n"
+"ਫਾਇਲ, ਜੋ ਵੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਆਯਾਤ ਕਰਨੀ ਹੈ ਅਤੇ ਇਸ ਦੀ ਕਿਸਮ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੋ।\n"
 "\n"
 "ਜੇਕਰ ਤੁਸੀਂ ਨਹੀਂ ਜਾਣਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ \"ਆਟੋਮੈਟਿਕ\" ਨੂੰ ਚੁਣੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਖੁਦ ਕੋਸ਼ਿਸ ਕਰੇਗਾ।"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "ਇਸ ਆਯਾਤ ਲਈ ਨਿਯਤ ਸਥਾਨ ਚੁਣੋ"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19889,34 +20573,33 @@ msgstr ""
 "ਆਯਾਤ ਕੀਤੀ ਜਾ ਸਕੇ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹੁੰਦੇ\n"
 "ਹੋ ਤਾਂ \"ਪਿੱਛੇ\" ਬਟਨ ਨੂੰ ਦਬਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "ਪੁਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਆਯਾਤ ਕਰੋ"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "ਇੱਕ ਇਕਹੇਰੀ ਫਾਇਲ ਆਯਾਤ ਕਰੋ(_s)"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਸੰਦ"
 
 #. 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 - ਈਵੇਲੂਸ਼ਨ"
@@ -19941,81 +20624,74 @@ msgstr "ਬੱਗ-ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸ
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "FAQ ਵੈੱਬ-ਪੇਜ਼ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "ਆਨ-ਲਾਇਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:968
-#: ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ਆਫ਼-ਲਾਇਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "ਆਫ-ਲਾਇਨ ਜਾਓ"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 #, fuzzy
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 #, fuzzy
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਇਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "ਅਣਜਾਣ ਸਿਸਟਮ ਗਲਤੀ ਹੈ।"
 
-#: ../shell/e-shell.c:839
-#: ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ਕਿਬਾ"
 
-#: ../shell/e-shell.c:1298
-#: ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨਹੀਂ ਲੱਭਾ ਹੈ"
 
@@ -20060,8 +20736,10 @@ msgid "Importer Type"
 msgstr "ਆਯਾਤਕਾਰ ਕਿਸਮ"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "ਆਯਾਤ ਚੁਣੋ"
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select Information to Import"
+msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20078,7 +20756,7 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20113,7 +20791,7 @@ msgstr ""
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
 "ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20121,43 +20799,43 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਖਾਸ ਭਾਗ ਦੀ ਸਰਗਰਮੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ ਈਵੇਲੂਸ਼ਨ ਭਾਗ ਮਜਬੂਰ ਕਰਕੇ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ਈਵੇਲੂਸ਼ਨ ੧.੪ ਤੋਂ ਮਜਬੂਰ ਕਰਕੇ ਵਾਪਿਸ"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਟਾਸਕ ਲਈ ਝਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
+msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਕੰਮ ਲਈ ਝਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20171,70 +20849,103 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਯਾਦ ਰੱਖੇ ਹੋਏ ਪਾਸਵਰਡ ਭੁੱਲਣ ਲਈ ਤਿਆਰ ਹੋ?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Cannot start Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "ਜਾਰੀ"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "ਵਰਜਨ {0} ਦਾ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਓ?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ।"
 
-#: ../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 "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
+#: ../shell/shell.error.xml.h:6
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ "
+"ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
 
 #  shell:upgrade-nospace primary
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "ਅੱਪਗਰੇਡ ਲਈ ਲੋੜੀਦੀ ਡਿਸਕ ਥਾਂ ਨਹੀਂ ਹੈ।"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "ਕੀ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"
 
 #  shell:upgrade-remove-1-4-confirm secondary
-#: ../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 ""
 "ਡਾਇਰੈਕਟਰੀ &quot;evolution&quot; ਦੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹਨ।\n"
 "\n"
-"ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖੁਦ ਜਾਂਚ ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪੁਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
+"ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖੁਦ ਜਾਂਚ "
+"ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪੁਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
 "\n"
-"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ ਨਾ ਵਰਤੋਂ।\n"
+"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ "
+"ਨਾ ਵਰਤੋਂ।\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"
+#| "\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"
 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 ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੇ ਡਾਟਾ ਕਿਸੇ ਵੱਖਰੇ ਟਿਕਾਣੇ ਉੱਤੇ ਸੰਭਾਲਿਆ ਸੀ।\n"
 "\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ "
+"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;"
+"evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "ਪੁਰਾਣੇ ਵਰਜਨ ਉੱਤੇ ਅੱਪਗਰੇਡ ਅਸਫਲ: {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 ""
-"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ ਹੈ।\n"
+"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ "
+"ਹੈ।\n"
 "\n"
 "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਹੋਰ ਥਾਂ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20244,7 +20955,7 @@ msgstr ""
 "\n"
 "ਵੇਰਵੇ ਲਈ ਮੱਦਦ ਵੇਖੋ।"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20258,23 +20969,24 @@ msgstr ""
 "\n"
 "ਵੇਰਵੇ ਲਈ ਮੱਦਦ ਵੇਖੋ।"
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "ਭੁੱਲੋ(_F)"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "ਡਾਟਾ ਰੱਖੋ(_K)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "ਮੈਨੂੰ ਬਾਅਦ ਵਿੱਚ ਯਾਦ ਕਰਵਾਓ(_R)"
 
-#: ../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"
@@ -20292,12 +21004,22 @@ msgstr ""
 "ਵਿਸ਼ਵਾਸ ਸੈਟਿੰਗ ਵਿੱਚ ਸੋਧ:"
 
 #: ../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 "ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾਂ ਕਰਦੇ ਹੋ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾਂ ਕਰਦੇ ਹੋ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ "
+"ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
 
 #: ../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 "ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾ ਨਹੀਂ ਕਰਦੇ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
+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 ""
+"ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾ ਨਹੀਂ ਕਰਦੇ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਨਹੀਂ ਕਰ "
+"ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -20326,9 +21048,8 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਨਾਂ"
 msgid "Purposes"
 msgstr "ਮਕਸਦ"
 
-#: ../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 "ਕਰਮ ਅੰਕ"
 
@@ -20342,34 +21063,34 @@ msgstr "ਸਭ ਈਮੇਲ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
 #: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ"
+msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
 
 #: ../smime/gui/certificate-manager.c:613
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਰਸ਼ਕ: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "`%s' ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਡਾਟਾਬੇਸ ਲਈ ਨਵਾਂ ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਭਰੋ"
 
 #  FIXME: add serial no, validity date, uses
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20378,7 +21099,7 @@ msgstr ""
 "ਇਸ ਨੂੰ ਜਾਰੀ ਕੀਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20387,7 +21108,7 @@ msgstr ""
 "ਇਸ ਨੇ ਜਾਰੀ ਕੀਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
@@ -20440,11 +21161,14 @@ msgid "Backup All"
 msgstr "ਸਭ ਦਾ ਬੈਕਅੱਪ"
 
 #: ../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 "ਕਿਸੇ ਕੰਮ ਲਈ ਇਸ CA ਤੇ ਭਰੋਸਾ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਵੇਖ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"ਕਿਸੇ ਕੰਮ ਲਈ ਇਸ CA ਤੇ ਭਰੋਸਾ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਵੇਖ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ "
+"ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
 
-#: ../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 "ਸਰਟੀਫਿਕੇਟ"
 
@@ -20520,13 +21244,11 @@ msgstr "ਸੰਗਠਨ ਇਕਾਈ (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL ਕਲਾਇਟ ਸਰਟੀਫਿਕੇਟ"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"
 
@@ -20572,187 +21294,182 @@ msgstr "CA ਭਰੋਸਾ ਸੋਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../smime/lib/e-cert.c:239
-#: ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "ਵਰਜਨ"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "ਵਰਜਨ 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "ਵਰਜਨ 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ਇਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਕੁੰਜੀ ਵਰਤੋਂ"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "ਨੈੱਟਸਕੇਪ ਸਰਟੀਫਿਕੇਟ ਕਿਸਮ"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਕੀ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ਇਕਾਈ ਪਛਾਣਕਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "ਐਲੋਗਰਿਥਮ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "ਐਲੋਗਰਿਥਮ ਪੈਰਾਮੀਟਰ"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵਜਨਕ ਕੀ ਜਾਣਕਾਰੀ"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼ੇ ਦਾ ਸਰਵਜਨਕ ਕੀ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼ੇ ਦੀ ਸਰਵਜਨਕ ਕੀ"
 
-#: ../smime/lib/e-cert.c:810
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "ਗਲਤੀ: ਕਾਰਜ ਵਾਧੇ ਲਈ ਅਸਫਲ"
 
-#: ../smime/lib/e-cert.c:831
-#: ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "ਆਬਜੈਕਟ ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "ਈ-ਮੇਲ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "ਨਾ-ਇਨਕਾਰ"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "ਕੀ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "ਡਾਟਾ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "ਕੁੰਜੀ ਇਕਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../smime/lib/e-cert.c:941
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "ਘਾਤਕ ਨਹੀਂ"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092
-#: ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "ਜਾਰੀ ਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "ਜਾਰੀ ਕਰਤਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਮੁੱਲ"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ਫਾਇਲ ਪਾਸਵਰਡ"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ਫਾਇਲ ਲਈ ਪਾਸਵਰਡ:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 
@@ -20771,7 +21488,7 @@ msgstr "%s (%s) ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ (_B)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿਸ਼ੇਸ਼ਤਾ (_B)"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
@@ -20785,22 +21502,22 @@ msgstr "ਸਭ ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਨਕਲ (_p)..."
 msgid "Contact _Preview"
 msgstr "ਸੰਪਰਕ ਝਲਕ(_P)"
 
-#: ../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 "ਨਕਲ"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
 msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਭਾਗਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
-#: ../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 "ਚੁਣੇ ਦੀ ਨਕਲ"
 
@@ -20809,23 +21526,23 @@ msgid "Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "ਨਵਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ ਬਣਾਓ"
+#, fuzzy
+#| msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
+msgstr "ਨਵਾਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../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 "ਕੱਟੋ"
 
-#: ../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 "ਚੁਣੇ ਕੱਟੋ"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਹਟਾਓ(_e)"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਹਟਾਓ(_e)"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
@@ -20844,7 +21561,9 @@ msgid "Mo_ve All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜੋ(_v)..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
 msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -20855,14 +21574,12 @@ msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹ�
 msgid "Move to Folder..."
 msgstr "ਫੋਲਡਰ ਭੇਜੋ..."
 
-#: ../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 "ਚਿਪਕਾਉ"
 
-#: ../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 "ਕਲਿੱਪਬੋਰਡ ਚਿਪਕਾਓ"
 
@@ -20880,22 +21597,23 @@ msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦਾ ਨਾਂ-ਤਬਦੀਲ"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ VC_ard ਵਾਂਗ ਸੰਭਾਲੋ"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ VC_ard ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "VCard ਇੰਝ ਸੰਭਾਲੋ..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+#| msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਨੂੰ VCard ਰਾਹੀ ਸੰਭਾਲੋ"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ 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 "ਸਭ ਚੁਣੋ"
 
@@ -20908,7 +21626,9 @@ msgid "Select all contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਚੁਣੋ"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+#| msgid "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
 msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ।"
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -20916,7 +21636,9 @@ msgid "Send message to contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+#| msgid "Send selected contacts to another person."
+msgid "Send selected contacts to another person"
 msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਭੇਜੋ।"
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -20939,8 +21661,7 @@ msgstr "ਲੋਡ ਕਰਨ ਨੂੰ ਰੋਕੋ"
 msgid "View the current contact"
 msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "ਕਾਰਵਾਈ(_A)"
@@ -20969,8 +21690,7 @@ msgstr "ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "ਫੋਲਡਰ ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)"
 
-#: ../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 "ਨਵਾਂ(_N)"
 
@@ -21030,9 +21750,8 @@ msgstr "ਸੂਚੀ"
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
@@ -21040,9 +21759,8 @@ msgstr "ਅੱਗੇ"
 msgid "Previews the calendar to be printed"
 msgstr "ਪਰਿੰਟ ਕਰਨ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਝਲਕ"
 
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
@@ -21050,8 +21768,7 @@ msgstr "ਪਿੱਛੇ"
 msgid "Print this calendar"
 msgstr "ਇਹ ਕੈਲੰਡਰ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../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 "ਨਿਚੋੜ(_e)"
 
@@ -21077,7 +21794,7 @@ msgstr "ਅੱਜ ਚੁਣੋ"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
-msgstr "ਲਿਸਟ ਦੀ ਤਰਾਂ ਵੇਖੋ"
+msgstr "ਸੂਚੀ ਦੀ ਤਰਾਂ ਵੇਖੋ"
 
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
@@ -21099,15 +21816,23 @@ msgstr "ਕਾਰਜਕਾਰੀ ਹਫਤਾ ਵੇਖਾਓ"
 msgid "View the current appointment"
 msgstr "ਮੌਜੂਦਾ ਮੁਲਾਕਾਤ ਦੇਖੋ"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "ਲਾਗ ਸੁਨੇਹਿਆਂ ਲਈ ਡੀਬੱਗ ਕਨਸੋਂਲ ਵੇਖੋ"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "ਕੰਮ ਹਫਤਾ"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "ਡੀਬੱਗ ਲਾਗ(_D)"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਖੋਲ੍ਹੋ(_O)"
 
@@ -21139,8 +21864,7 @@ msgstr "ਆਫਲਾਇਨ ਲਈ ਮਾਰਕ ਕੀਤੇ ਅਕਾਊਂਟ/�
 msgid "Empty _Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_T)"
 
-#: ../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 "ਫੋਲਡਰ(_o)"
 
@@ -21163,11 +21887,11 @@ msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵੇਖਾਓ(_P)"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
-msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖਾਓ"
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ ਨਾਲ-ਨਾਲ ਹੀ ਵੇਖਾਓ"
+msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ ਨਾਲ-ਨਾਲ ਹੀ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
@@ -21177,10 +21901,6 @@ msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵਿੰਡੋ ਵੇਖਾਓ"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣੋ ਜਾਂ ਹਟਾਓ"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "ਲਾਗ ਸੁਨੇਹਿਆਂ ਲਈ ਡੀਬੱਗ ਕਨਸੋਂਲ ਵੇਖੋ"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "ਟਕਸਾਲੀ ਝਲਕ(_C)"
@@ -21189,10 +21909,6 @@ msgstr "ਟਕਸਾਲੀ ਝਲਕ(_C)"
 msgid "_Copy Folder To..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "ਡੀਬੱਗ ਲਾਗ(_D)"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "ਆਫਲਾਈਨ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ(_D)"
@@ -21217,7 +21933,9 @@ msgstr "ਝਲਕ(_P)"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+#, fuzzy
+#| msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "ਮੈਂਬਰੀ(_S)"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21297,10 +22015,6 @@ msgstr "ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਇਸ ਫੋਲਡਰ ਵਿੱ�
 msgid "Permanently remove this folder"
 msgstr "ਇਹ ਫੋਲਡਰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "ਤਾਜ਼ਾ ਕਰੋ(_f)..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕਰੋ"
@@ -21357,15 +22071,14 @@ msgstr "ਮਸਲਾ ਸੁਨੇਹਾ ਲਿਸਟ"
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ ਗਰੁੱਪ(_G)"
 
-#: ../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 "ਸੁਨੇਹਾ(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ(_d)"
+msgstr "ਭੇਜਣ ਵਾਲਾ ਸਿਰਨਾਵਾਂ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ(_d)"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
@@ -21374,7 +22087,7 @@ msgstr "ਫਿਲਟਰ ਲਗਾਓ(_p)"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
+msgstr "ਭੇਜਣ ਵਾਲਾ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
@@ -21398,7 +22111,7 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਸਾਰੇ ਪ੍ਰਾਪਤ �
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
@@ -21422,7 +22135,7 @@ msgstr "ਇਹਨਾਂ ਸੁਨੇਹੀਆਂ ਤੋਂ ਇੱਕ ਖੋਜ �
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
+msgstr "ਇਸ ਮੇਲਿੰਗ ਸੂਚੀ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
@@ -21442,7 +22155,7 @@ msgstr "ਇਹਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂ�
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
@@ -21490,7 +22203,7 @@ msgstr "ਅੱਗੇ ਭੇਜੇ ਇਸ ਵਾਂਗ(_O)..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ(_L)..."
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਫਿਲਟਰ(_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
@@ -21658,7 +22371,7 @@ msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਟੈਕਸਟ ਫਾਇਲ਼ ਦੇ �
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_L)..."
+msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipien_ts..."
@@ -21684,8 +22397,7 @@ msgstr "ਸਭ ਟੈਕਸਟ ਚੁਣੋ(_A)"
 msgid "Select all the text in a message"
 msgstr "ਇੱਕ ਸੁਨੇਹੇ ਵਿੱਚ ਸਭ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../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 "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫਾ ਸੈਟਿੰਗ ਵੇਖਾਓ"
 
@@ -21814,8 +22526,7 @@ msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../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 "ਮੁੱਖ ਟੂਲਬਾਰ"
 
@@ -21837,11 +22548,11 @@ msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਮੀਮੋ ਚੇਪੋ"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਮੀਮੋ ਦੀ ਲਿਸਟ ਦੀ ਝਲਕ"
+msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਮੀਮੋ ਦੀ ਸੂਚੀ ਦੀ ਝਲਕ"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "ਮੀਮੋ ਦੀ ਲਿਸਟ ਪਰਿੰਟ ਕਰੋ"
+msgstr "ਮੀਮੋ ਦੀ ਸੂਚੀ ਪਰਿੰਟ ਕਰੋ"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -21881,19 +22592,19 @@ msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਕਾਰਜ ਚੇਪੋ
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "ਪਰਿੰਟ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਾਰਜ ਲਿਸਟ ਦੀ ਝਲਕ"
+msgstr "ਪਰਿੰਟ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਾਰਜ ਸੂਚੀ ਦੀ ਝਲਕ"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "ਟਾਸਕ ਲਿਸਟ ਪਰਿੰਟ ਕਰੋ"
+msgstr "ਕੰਮ ਸੂਚੀ ਪਰਿੰਟ ਕਰੋ"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "ਟਾਸਕ ਝਲਕ ਵਿੰਡੋ ਵੇਖਾਓ"
+msgstr "ਕੰਮ ਝਲਕ ਵਿੰਡੋ ਵੇਖਾਓ"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "ਟਾਸਕ ਝਲਕ(_P)"
+msgstr "ਕੰਮ ਝਲਕ(_P)"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
@@ -21901,7 +22612,7 @@ msgstr "ਚੁਣੇ ਕਾਰਜ ਵੇਖੋ"
 
 #: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
-msgstr "ਟਾਸਕ ਖੋਲ੍ਹੋ(_O)"
+msgstr "ਕੰਮ ਖੋਲ੍ਹੋ(_O)"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -22102,12 +22813,11 @@ msgstr "ਕੰਪਨੀ ਨਾਲ(_C)"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "ਐਡਰੈੱਸ ਕਾਰਡ(_A)"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਾਰਡ(_A)"
 
-#: ../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 "ਲਿਸਟ ਝਲਕ(_L)"
+msgstr "ਸੂਚੀ ਝਲਕ(_L)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -22192,18 +22902,19 @@ msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "ਸਮਾਂ-ਖੇਤਰ ਲਟਕਦੀ ਕੰਬੋ ਬਾਕਸ"
 
 #: ../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 ""
 "ਮਾਊਸ ਦਾ ਖੱਬਾ ਬਟਨ ਖੇਤਰ ਦਾ ਆਕਾਰ ਵੱਡਾ ਕਰਨ ਲਈ ਵਰਤੋਂ ਅਤੇ ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ।\n"
 "ਮਾਊਸ ਦਾ ਸੱਜਾ ਬਟਨ ਖੇਤਰ ਘਟਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗਾ।"
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ਭੰਡਾਰ"
 
@@ -22224,17 +22935,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "ਟੇਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "ਮੌਕਾ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਸੰਭਾਲੋ"
 
@@ -22247,42 +22958,42 @@ msgid "_Replace existing view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਤਬਦੀਲ(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_u)"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "ਝਲਕ ਚੁਣੋ: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਇੱਕ ਕਸਟਮਾਈਜ਼ ਝਲਕ ਹੈ"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "ਮੌਜੂਦਾ ਕਸਟਮਾਈਜ਼ ਵਿਊ ਸੰਭਾਲੋ"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "ਵਿਊ ਬਣਾਓ ਜਾਂ ਸੋਧ"
 
@@ -22306,20 +23017,17 @@ msgstr "ਝਲਕ ਦੀ ਕਿਸਮ"
 msgid "Type of view:"
 msgstr "ਝਲਕ ਦੀ ਕਿਸਮ:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ"
 
-#: ../widgets/misc/e-attachment.c:290
-#: ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590
-#: ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
-#: ../widgets/misc/e-attachment.c:298
-#: ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
@@ -22341,451 +23049,434 @@ msgid "Suggest automatic display of attachment"
 msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਵੇਖਾਉਣ ਲਈ ਸੁਝਾਅ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "ਮਹੀਨਾ ਕੈਲੰਡਰ"
 
-#: ../widgets/misc/e-canvas-background.c:453
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "ਰੰਗ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c: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 "GDK ਰੰਗ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:474
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "ਸਟਿਪਲ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92
-#: ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:93
-#: ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "ਖਾਲੀ ਥਾਂ"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "ਹੁਣ"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ਸਮੇਂ ਦਾ ਫਾਰਮੈਟ ਇੰਝ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਖਾਸ ਤੌਰ ਤੇ 0 ਤੇ 100 ਦੇ ਦਰਮਿਆਨ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "ਅਰਬੀ"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "ਬਾਲਟਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "ਕੇਦਰੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "ਚੀਨ"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "ਸਰੀਲਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "ਗਰੀਕ"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "ਹੈਬਰਿਊ"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "ਜਾਪਾਨੀ"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "ਕੋਰੀਆ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "ਥਾਈ"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "ਤੁਰਕਿਸ਼"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "ਯੂਨੀਕੋਡ"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ, ਨਵਾਂ"
 
-#: ../widgets/misc/e-charset-picker.c:88
-#: ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "ਮੂਲ"
 
-#: ../widgets/misc/e-charset-picker.c:91
-#: ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "ਸਧਾਰਨ"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "ਯੂਕਰੇਨ"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "ਦਿੱਖ"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "ਅਣਪਛਾਤਾ ਅੱਖਰ ਸਮੂਹ: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲਈ ਅੱਖਰ ਦਿਓ"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "ਹੋਰ..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "ਮਿਤੀ ਦੇਣ ਲਈ ਟੈਕਸਟ ਇੰਦਰਾਜ਼"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 #, fuzzy
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾਂ ਚੁਣਨ ਲਈ ਲਟਕਦਾ ਬਕਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "ਹੁਣੇ(_w)"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "ਅੱਜ(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "ਗਲਤ ਤਾਰੀਖ ਮੁੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "ਗਲਤ ਸਮਾਂ ਮੁੱਲ"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "ਫੈਲਿਆ"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "ਫੈਲਾਓ ਦੇ ਲੇਬਲ ਦਾ ਟੈਕਸਟ"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "ਹੇਠਾਂ ਰੇਖਾ ਵਰਤੋਂ"
 
-#: ../widgets/misc/e-expander.c:197
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+#: ../widgets/misc/e-expander.c:199
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr "ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਤਾਂ, ਟੈਕਸਟ ਵਿੱਚ ਦਿੱਤਾ ਅੱਖਰ ਪ੍ਰਵੇਸ਼ਕ ਕੀ ਨੂੰ ਵੇਖਾਏਗਾ"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "ਲੇਬਲ ਤੇ ਅਗਲੇ ਵਿੱਚਕਾਰ ਅੰਤਰ ਦਿਓ"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "ਲੇਬਲ ਵਿਦਗਿਟ"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "ਆਮ ਫੈਲਾਓ ਲੇਬਲ ਦੀ ਥਾਂ ਤੇ ਇੱਕ ਵਿਦਗਿਟ ਵੇਖਾਓ"
 
-#: ../widgets/misc/e-expander.c:221
-#: ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "ਫੈਲਾਓ ਆਕਾਰ"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "ਫੈਲਾਉ ਤੀਰ ਦਾ ਆਕਾਰ"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "ਸੰਕੇਤਕ ਥਾਂ"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "ਫੈਲਾਓ ਤੀਰ ਦੁਆਲੇ ਖਾਲੀ ਥਾਓ"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130
-#: ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311
-#: ../widgets/misc/e-filter-bar.c:753
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "ਤਕਨੀਕੀ ਖੋਜ"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "ਖੋਜ ਸੰਭਾਲੋ"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲੀ ਖੋਜ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-#: ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨਕਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
 #, fuzzy
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "ਸਮਾਂ-ਖੇਤਰ ਚੁਣਨ ਲਈ ਮਾਊਸ-ਅਧਾਰਿਤ ਸੁੰਦਰ ਨਕਸ਼ਾ ਹੈ। ਕੀ-ਬੋਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਲੇ ਸਮਾਂ-ਖੇਤਰ ਲਈ ਹੇਠਾਂ ਦਿੱਤਾ ਕੰਬੋਸਮਾਂ ਖੇਤਰ ਬਕਸਾ ਵਰਤ ਸਕਦੇ ਹਨ।"
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"ਸਮਾਂ-ਖੇਤਰ ਚੁਣਨ ਲਈ ਮਾਊਸ-ਅਧਾਰਿਤ ਸੁੰਦਰ ਨਕਸ਼ਾ ਹੈ। ਕੀ-ਬੋਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਲੇ ਸਮਾਂ-ਖੇਤਰ ਲਈ ਹੇਠਾਂ "
+"ਦਿੱਤਾ ਕੰਬੋਸਮਾਂ ਖੇਤਰ ਬਕਸਾ ਵਰਤ ਸਕਦੇ ਹਨ।"
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 #, fuzzy
 msgid "Online"
 msgstr "ਲਾਇਨ 'ਚ"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "ਬਟਨ ਹਾਲਤ ਆਨਲਾਈਨ ਹੈ"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "ਕੈਟਾਗਰੀ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-reflow.c:1448
-#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1455
-#: ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1462
-#: ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "ਖੋਜ ਟਾਈਪ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "ਸਾਫ਼(_C)"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ਇਕਾਈ ID"
 
-#: ../widgets/misc/e-search-bar.c:875
-#: ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "ਵੇਖਾਓ(_w): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "ਖੋਜ(_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " ਅੰਦਰ(_n) "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "ਕਰਸਰ ਕਾਲਮ"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "ਕ੍ਰਮਬੱਧਕ"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "ਚੋਣ ਢੰਗ"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "ਹਟਾਉਣ ਤੇ(_l):"
 
@@ -22915,25 +23606,25 @@ msgid "_When opened:"
 msgstr "ਜਦੋਂ ਖੋਲ੍ਹਿਆ ਜਾਵੇ(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "URL ਉੱਤੇ ਜਾਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr "ਮਾਸਟਰ ਕੈਟਾਗਰੀ ਲਿਸਟ ਸੋਧ..."
+msgstr "ਮਾਸਟਰ ਕੈਟਾਗਰੀ ਸੂਚੀ ਸੋਧ..."
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
@@ -22947,7 +23638,7 @@ msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_A):"
 msgid "categories"
 msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "ਪੋਪਅੱਪ ਲਿਸਟ"
 
@@ -22967,23 +23658,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚੁਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਲਾਈਨ"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -22991,13 +23682,11 @@ msgstr "BG ਰੰਗ ਕਾਲਮ"
 msgid "State"
 msgstr "ਸਥਿਤੀ"
 
-#: ../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 "(ਵੱਧਦਾ ਕਰਮ)"
 
-#: ../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 "(ਘੱਟਦਾ ਕਰਮ)"
 
@@ -23023,7 +23712,7 @@ msgid "A_vailable Fields:"
 msgstr "ਉਪਲੱਬਧ ਖੇਤਰ(_v):"
 
 #: ../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 "ਵੱਧਦਾ ਕਰਮ"
 
@@ -23036,7 +23725,7 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../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 "ਘੱਟਦਾ ਕਰਮ"
 
@@ -23097,16 +23786,16 @@ msgid "_Sort..."
 msgstr "ਲੜੀਬੱਧ(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "DnD ਕੋਡ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "ਪੂਰਾ ਹੈੱਡਰ"
 
@@ -23126,535 +23815,305 @@ msgstr ""
 "ਆਪਣੇ ਟੇਬਲ ਵਿੱਚ ਇੱਕ ਕਾਲਮ ਨੂੰ ਜੋੜਨ ਲਈ, ਇਸ\n"
 "ਨੂੰ ਉਸ ਜਗਾ ਉੱਤੇ ਸੁੱਟ ਦਿਓ, ਜਿੱਥੇ ਤੁਸੀਂ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d ਇਕਾਈ)"
 msgstr[1] "%s : %s (%d ਇਕਾਈ)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ਇਕਾਈ)"
 msgstr[1] "%s (%d ਆਈਟਮਾਂਂ)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032
-#: ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039
-#: ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344
-#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 
+#: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046
-#: ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350
-#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 
+#: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053
-#: ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356
-#: ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "ਫੋਕਸ ਖਿੱਚੋ"
 
+#: ../widgets/table/e-table-group-container.c:950
 #: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060
-#: ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਮੋਡ"
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "ਚੋਣ ਮਾਡਲ"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067
-#: ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325
+#: ../widgets/table/e-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
-#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "ਮੁੱਢਲੀ ਲੰਬਾਈ"
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101
-#: ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332
+#: ../widgets/table/e-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
-#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "ਇਕਸਾਰ ਕਤਾਰ ਉਚਾਈ"
 
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "ਸਥਿਰ"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ਕ੍ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "ਘੱਟਦਾ ਕ੍ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "ਗੈਰ-ਕ੍ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "ਇਸ ਖੇਤਰ ਨਾਲ ਗਰੁੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "ਬਕਸੇ ਨਾਲ ਗਰੁੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "ਇਹ ਕਾਲਮ ਹਟਾਓ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "ਕਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "ਵਧੀਆ ਫਿੱਟ(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "ਕਾਲਮ ਫਾਰਮੈਟ(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "ਲੜੀਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "ਫੋਂਟ ਵੇਰਵਾ"
 
-#: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ਲੜੀ"
 
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "ਟੇਬਲ ਹੈੱਡਰ"
 
-#: ../widgets/table/e-table-item.c:3018
-#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "ਟੇਬਲ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3094
-#: ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "ਹਮੇਸ਼ਾ ਖੋਜੋ"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲਈ ਦਬਾਓ"
 
-#: ../widgets/table/e-tree.c:3363
-#: ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ETree ਟੇਬਲ ਐਡਪਟਰ"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ਖੋਜ"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "ਲਾਈਨਾਂ ਖਿੱਚੋ ਅਤੇ +/- ਫੈਲਾਓ"
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../widgets/text/e-text.c:3558
-#: ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "ਘਟਨਾ ਪ੍ਰੋਸੈਂਸਰ"
 
-#: ../widgets/text/e-text.c:3572
-#: ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "ਗੂੜਾ"
 
-#: ../widgets/text/e-text.c:3579
-#: ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "ਵਿੰਨ੍ਹੋ"
 
-#: ../widgets/text/e-text.c:3586
-#: ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "ਅੰਕਰ"
 
-#: ../widgets/text/e-text.c:3594
-#: ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "ਇਕਸਾਰ"
 
-#: ../widgets/text/e-text.c:3601
-#: ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "ਕਲਿੱਪ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3608
-#: ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "ਕਲਿੱਪ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3615
-#: ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "ਕਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3622
-#: ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "ਕਲਿੱਪ ਚਤਰਭੁਜ ਭਰੋ"
 
-#: ../widgets/text/e-text.c:3629
-#: ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "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 "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 "ਟੈਕਸਟ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "ਟੈਕਸਟ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3694
-#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "ਅੰਡਾਕਾਰ ਵਰਤੋਂ"
 
-#: ../widgets/text/e-text.c:3701
-#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "ਅੰਡਾਕਾਰ"
 
-#: ../widgets/text/e-text.c:3708
-#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "ਲਾਈਨ ਲਪੇਟੋ"
 
-#: ../widgets/text/e-text.c:3715
-#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "ਅੰਤਰਾਲ ਅੱਖਰ"
 
-#: ../widgets/text/e-text.c:3722
-#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "ਅਧਿਕਤਮ ਲਾਈਨਾਂ"
 
-#: ../widgets/text/e-text.c:3744
-#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "ਹਾਸ਼ੀਆਂ ਖਿੱਚੋ"
 
-#: ../widgets/text/e-text.c:3751
-#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "ਨਵੀਆਂ-ਲਾਈਨਾਂ ਮਨਜ਼ੂਰ"
 
-#: ../widgets/text/e-text.c:3758
-#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3765
-#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "ਬਟਨ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3772
-#: ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ"
 
-#: ../widgets/text/e-text.c:3779
-#: ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "IM ਪਰਸੰਗ"
 
-#: ../widgets/text/e-text.c:3786
-#: ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "ਪੋਪਅੱਪ ਸੰਭਾਲੋ"
 
-#~ msgid "Permission Denied."
-#~ msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।"
-#~ msgid "_Properties..."
-#~ msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)..."
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>ਡਿਸਪਲੇਅ</b>"
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>ਸਰਵਰ ਜਾਣਕਾਰੀ</b>"
-#~ msgid "D_escription:"
-#~ msgstr "ਵੇਰਵਾ(_e):"
-#~ msgid "De_scription:"
-#~ msgstr "ਵੇਰਵਾ(_s):"
-#~ msgid "Updating query"
-#~ msgstr "ਨਵੀਵੀਕਰਨ ਸਵਾਲ"
-#~ msgid "Upcoming Appointments"
-#~ msgstr "ਆ ਰਹੀਆਂ ਮੁਲਾਕਾਤਾਂ"
-#~ msgid "Unknown reason"
-#~ msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ"
-#~ msgid "Open File"
-#~ msgstr "ਫਾਇਲ ਖੋਲੋ"
-#~ msgid "_Save Message"
-#~ msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)"
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "ਫਾਇਲ਼ &quot;{0}&quot; ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-#~ msgid "folder-display|%s (%u)"
-#~ msgstr "%s (%u)"
-#~ msgid "Attach original message"
-#~ msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰੋ"
-#~ msgid "Do not quote original message"
-#~ msgstr "ਅਸਲੀ ਸੁਨੇਹੇ ਦਾ ਹਵਾਲਾ ਨਹੀਂ"
-#~ msgid "Quote original message"
-#~ msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਵੇਰਵਾ"
-#~ msgid "Enter a name for this signature."
-#~ msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਨਾਂ ਦਿਓ।"
-#~ msgid "Name:"
-#~ msgstr "ਨਾਂ:"
-#~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
-#~ msgstr ""
-#~ "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "ਕੀ ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਹਨ?"
-#~ msgid "Do you want the operation to be performed also in the subfolders?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
-#~ msgid "Mark all messages in this folder and subfolders as read?"
-#~ msgstr "ਕੀ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਉਣੇ ਹਨ?"
-#~ msgid "Only on _Current Folder"
-#~ msgstr "ਕੇਵਲ ਮੌਜੂਦ ਫੋਲਡਰ ਉੱਤੇ(_C)"
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "ਨੱਥੀ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰੋ"
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "ਅਟੈਂਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਯੋਗ ਹੈ।"
-#~ msgid "Remind _missing attachments"
-#~ msgstr "ਗੁੰਮ ਅਟੈਂਚਮਿੰਟ ਯਾਦ ਕਰਵਾਓ(_m)"
-#~ msgid "_Refresh:"
-#~ msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_R):"
-#~ msgid "There is no configuration option for this plugin."
-#~ msgstr "ਇਹ ਪਲੱਗਇਨ ਲਈ ਕੋਈ ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ।"
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "ਕੰਪੋਜ਼ਰ ਤੋਂ ਪਰਿੰਟ ਕਰਨ ਲਈ ਇੱਕ ਚੋਣ ਦਿਓ।"
-#~ msgid "Print Message"
-#~ msgstr "ਸੁਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
-#~ msgid "Prints the message"
-#~ msgstr "ਸੁਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
-#~ msgid "A plugin that handles the Startup wizard."
-#~ msgstr "ਸ਼ੁਰੂਆਤੀ ਸਹਾਇਕ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਵਾਲੀ ਪਲੱਗ-ਇਨ ਹੈ।"
-#~ msgid "Startup wizard"
-#~ msgstr "ਸ਼ੁਰੂਆਤੀ ਸਹਾਇਕ"
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਸੈਟਿੰਗ ਬਾਰੇ ਇੱਕ ਲਾਈਨ"
-#~ msgid "Decides whether the crash detection should be run or not."
-#~ msgstr "ਚੋਣ ਕਰੋ ਕਿ ਕੀ ਕਰੈਸ਼ ਖੋਜ ਨੂੰ ਚਲਾਇਆ ਜਾਵੇ ਕਿ ਨਾ"
-#~ msgid "Skip recovery warning dialog"
-#~ msgstr "ਰਿਕਵਰੀ ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ ਛੱਡੋ"
-#~ msgid "Whether crash detection should be done or not"
-#~ msgstr "ਕੀ ਕਰੈਸ਼ ਖੋਜ ਕੀਤੀ ਜਾਵੇ ਕਿ ਨਾ"
-#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
-#~ msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਰਿਕਵਰੀ ਡਾਈਲਾਗ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
-#~ msgid "No folder name specified."
-#~ msgstr "ਕੋਈ ਫੋਲਡਰ ਨਾਂ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹੈ।"
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ Enter ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"#\" ਨਾਲ ਆਰੰਭ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' ਅਤੇ '..' ਰਾਖਵੇਂ ਫੋਲਡਰ ਨਾਂ ਹਨ।"
-#~ msgid "Evolution Crash Detection"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਕਰੈਸ਼ ਖੋਜ"
-#~ msgid "Ig_nore"
-#~ msgstr "ਅਣਡਿੱਠਾ(_n)"
-#~ msgid "_Do not show this message again"
-#~ msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)"
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "ਚੋਣ ਦੀ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ"
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "ਚੋਣ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਲਈ ਕੱਟੋ"
-#~ msgid "Paste from clipboard"
-#~ msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
-#~ msgid "All Day Event"
-#~ msgstr "ਸਭ ਦਿਨ ਘਟਨਾ"
-#~ msgid "Send _Options"
-#~ msgstr "ਭੇਜਣ ਚੋਣਾਂ(_O)"
-#~ msgid "Show messages in the normal style"
-#~ msgstr "ਸੁਨੇਹੇ ਸਧਾਰਨ ਸਟਾਇਲ ਵਿੱਚ ਵੇਖਾਓ"
-#~ msgid "Delete all but signature"
-#~ msgstr "ਸਭ ਹਟਾਓ ਪਰ ਦਸਤਖਤ"
-#~ msgid "For_mat"
-#~ msgstr "ਫਾਰਮੈਟ(_m)"
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-#~ msgid "Open a file"
-#~ msgstr "ਇੱਕ ਫਾਇਲ ਖੋਲ੍ਹੋ"
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP ਇੰਕ੍ਰਿਪਟ"
-#~ msgid "PGP Sign"
-#~ msgstr "PGP ਦਸਤਖਤ"
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ"
-#~ msgid "S/MIME Sign"
-#~ msgstr "S/MIME ਦਸਤਖਤ"
-#~ msgid "Save As"
-#~ msgstr "ਇੰਞ ਸੰਭਾਲੋ"
-#~ msgid "Save in folder..."
-#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ..."
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "ਸੁਨੇਹੇ ਨੂੰ ਖਾਸ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ"
-#~ msgid "Send"
-#~ msgstr "ਭੇਜੋ"
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "ਪੱਤਰ HTML ਫਾਰਮੈਟ ਵਿੱਚ ਭੇਜੋ"
-#~ msgid "_Delete all"
-#~ msgstr "ਸਭ ਹਟਾਉ(_D)"
-#~ msgid "_Open..."
-#~ msgstr "ਖੋਲ੍ਹੋ(_O)..."
-#~ msgid "C_lose"
-#~ msgstr "ਬੰਦ ਕਰੋ(_l)"
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-#~ msgid "Save and _Close"
-#~ msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_C)"
-#~ msgid "Save the current file and close the window"
-#~ msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ ਅਤੇ ਵਿੰਡੋ ਬੰਦ ਕਰ ਦਿਓ"
-#~ msgid "Refresh List"
-#~ msgstr "ਤਾਜ਼ਾ ਲਿਸਟ"
-#~ msgid "Refresh List of Folders"
-#~ msgstr "ਫੋਲਡਰ ਲਿਸਟ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ"
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "ਫੋਲਡਰ ਨੂੰ ਮੇਰੀ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਓ"
-#~ msgid "Subscribe"
-#~ msgstr "ਮੈਂਬਰੀ"
-#~ msgid "Unsubscribe"
-#~ msgstr "ਮੈਂਬਰ ਨਹੀਂ"
-#~ msgid "_Invert Selection"
-#~ msgstr "ਉਲਟ ਚੋਣ(_I)"
-#~ msgid "Status Details"
-#~ msgstr "ਹਾਲਤ ਵੇਰਵਾ"
-#~ msgid "Time Zone"
-#~ msgstr "ਸਮਾਂ ਖੇਤਰ"
-#~ msgid "TimeZone Combobox"
-#~ msgstr "ਸਮਾਂ-ਖੇਤਰ ਲਟਕਦਾ ਬਕਸਾ"
-#~ msgid "_Categories..."
-#~ msgstr "ਕੈਟਾਗਰੀ(_C)..."
-#~ msgid "\n"
-#~ msgstr "\n"
-#~ msgid "Add an email to the List"
-#~ msgstr "ਈ-ਮੇਲ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚੋਂ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਸ਼ਾਮਿਲ"
-#~ msgid "Members"
-#~ msgstr "ਮੈਂਬਰ"
-#~ msgid "Remove an email address from the List"
-#~ msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਓ"
-#~ msgid "_Select"
-#~ msgstr "ਚੁਣੋ(_S)"
-#~ msgid "Or_ganiser:"
-#~ msgstr "ਪ੍ਰਬੰਧਕ(_g):"
-#~ msgid "Task sort"
-#~ msgstr "ਕੰਮ ਕਰਮਬੱਧ"
-#~ msgid "Memo sort"
-#~ msgstr "ਮੀਮੋ ਕ੍ਰਮਬੱਧ"
-#~ msgid "SMTWTFS"
-#~ msgstr "SMTWTFS"
-
diff --git a/po/pl.po b/po/pl.po
index 8a4272424a..8d88642c28 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,24 +1,23 @@
 # Copyright (C) 2001-2005 Free Software , Inc.
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aktualną wersję tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl
-# (:pserver:anonymous@cvs.gnome.pl:/gnomepl, puste hasło)
+# Aviary.pl
 # Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres:
-# translators@gnomepl.org
+# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
+# gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-13 23:16+0100\n"
-"PO-Revision-Date: 2009-01-14 00:29+0100\n"
+"POT-Creation-Date: 2009-01-22 21:31+0100\n"
+"PO-Revision-Date: 2009-01-22 21:30+0100\n"
 "Last-Translator: wadim dziedzic <wdziedzic@aviary,pl>\n"
-"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language-Team: Polish <gnomepl@aviary.pl>\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"
-"X-Poedit-Bookmarks: -1,-1,2323,-1,-1,-1,-1,-1,-1,-1\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -27,12 +26,12 @@ msgid "evolution address book"
 msgstr "książka adresowa evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Nowa lista kontaktów"
 
@@ -117,8 +116,7 @@ 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."
@@ -128,8 +126,7 @@ 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 +155,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:803
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -169,9 +166,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-day-view.c:1578
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -179,9 +175,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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -189,10 +185,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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -202,9 +198,8 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-day-view.c:1594
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -345,12 +340,20 @@ 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."
@@ -369,8 +372,14 @@ 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."
@@ -381,8 +390,15 @@ 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}'?"
@@ -428,12 +444,19 @@ 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."
@@ -441,11 +464,17 @@ 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."
@@ -472,27 +501,41 @@ 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
@@ -516,8 +559,7 @@ 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
+#: ../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}"
@@ -558,11 +600,12 @@ msgstr "Certyfikaty"
 msgid "Configure autocomplete here"
 msgstr "Konfiguracja automatycznego uzupełniania"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:307
-#: ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -600,68 +643,81 @@ msgstr "Kontrola konfiguracji ustawień katalogu Evolution"
 msgid "Manage your S/MIME certificates here"
 msgstr "Zarządzanie certyfikatami S/Mime"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199
-#: ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195
-#: ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202
-#: ../mail/em-migrate.c:2967
-#: ../mail/mail-component.c:316
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208
-#: ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204
-#: ../mail/em-migrate.c:1058
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Osobiste"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Na serwerze LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Tworzy nową listę kontaktów"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Tworzy nową książkę adresową"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Nie można zaktualizować ustawień książki adresowej lub katalogów."
 
@@ -684,9 +740,8 @@ msgstr "Lokalne _kopiowanie zawartości książki dla operacji bez podłączenia
 #: ../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
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Ogólne"
@@ -726,14 +781,12 @@ 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\":"
@@ -748,11 +801,13 @@ 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..."
 
@@ -811,41 +866,31 @@ msgid "Save As vCard..."
 msgstr "Zapisz jako vCard..."
 
 #: ../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
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../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:663
+#: ../calendar/gui/calendar-component.c:681
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../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: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
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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"
 
@@ -889,8 +934,12 @@ 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 autocompleted name with an address"
@@ -901,8 +950,12 @@ 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."
+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"
@@ -913,12 +966,14 @@ 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:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Vertical pane position"
 msgstr "Pozycja panelu pionowego"
 
 #: ../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."
+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
@@ -1001,8 +1056,10 @@ 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"
@@ -1053,20 +1110,39 @@ 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"
@@ -1085,32 +1161,68 @@ 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 program Evolution przy uwierzytelnianiu. Uwaga: 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)"
@@ -1177,8 +1289,7 @@ msgstr "karty"
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../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:524
@@ -1318,7 +1429,7 @@ msgstr "_Urodziny:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Kalendarz:"
 
@@ -1426,8 +1537,7 @@ msgstr "Adres"
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
 #: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Modyfikowalny"
@@ -2448,8 +2558,7 @@ msgstr "Usługa"
 
 #: ../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
+#: ../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"
@@ -2469,7 +2578,7 @@ msgstr "Dom"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Inne"
 
@@ -2730,7 +2839,7 @@ 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/dialogs/cal-prefs-dialog.c:220
 #: ../calendar/gui/e-day-view-time-item.c:815
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
@@ -2784,7 +2893,9 @@ 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?"
@@ -2820,17 +2931,14 @@ msgstr "Połącz kontakt"
 #: ../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
+#: ../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: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
+#: ../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"
 
@@ -2871,8 +2979,7 @@ msgstr "Błąd przy pobieraniu widoku książki adresowej"
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
 #: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
@@ -2903,10 +3010,9 @@ msgid "Save as vCard..."
 msgstr "Zapisz jako vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/dialogs/comp-editor.c:2090
 #: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1746
-#: ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otwórz"
@@ -2962,16 +3068,11 @@ msgstr "_Wytnij"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:487
 #: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1753
-#: ../calendar/gui/e-memo-table.c:931
-#: ../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
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "S_kopiuj"
@@ -2982,15 +3083,13 @@ msgstr "_Wklej"
 
 #. All, unmatched, separator
 #: ../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: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:632 ../calendar/gui/cal-search-bar.c:675
 #: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "Nie pasujące"
@@ -3166,10 +3265,8 @@ msgstr "Witryna internetowa"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:116
 #: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85
-#: ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424
-#: ../widgets/misc/e-reflow.c:1425
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
@@ -3177,29 +3274,23 @@ msgstr "Witryna internetowa"
 #: ../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:3077
-#: ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730
-#: ../widgets/text/e-text.c:3731
+#: ../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: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/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:3083
-#: ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738
-#: ../widgets/text/e-text.c:3739
+#: ../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ść"
 
@@ -3311,8 +3402,7 @@ msgstr "Wybrano"
 msgid "Has Cursor"
 msgstr "Posiada kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../mail/em-popup.c:623
+#: ../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"
 
@@ -3321,8 +3411,7 @@ msgstr "Otwórz odnośnik w p_rzeglądarce"
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Wyślij nową wiadomość do..."
 
@@ -3369,7 +3458,7 @@ msgstr "Rozmowa wideo"
 #: ../addressbook/gui/widgets/eab-contact-display.c:628
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2496
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3405,12 +3494,12 @@ msgid "Web Log"
 msgstr "Dziennik WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2507
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Urodziny"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2508
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Rocznica"
 
@@ -3482,8 +3571,7 @@ msgstr "Protokół nie jest obsługiwany"
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653
-#: ../calendar/gui/print.c:2554
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "Anulowano"
 
@@ -3494,12 +3582,13 @@ msgstr "Nie można anulować"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
@@ -3535,21 +3624,39 @@ msgid "Unsupported authentication method"
 msgstr "Nieobsługiwana metoda uwierzytelniania"
 
 #: ../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."
+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:119
 #, c-format
-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."
+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: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."
+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 "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."
+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 message:"
@@ -3752,8 +3859,7 @@ msgstr "Widok karty"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importowanie..."
 
@@ -3838,8 +3944,7 @@ 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
@@ -4016,16 +4121,23 @@ 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."
@@ -4045,32 +4157,49 @@ 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
@@ -4078,16 +4207,19 @@ 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."
@@ -4193,12 +4325,19 @@ msgid "Editor could not be loaded."
 msgstr "Nie można wczytać edytora."
 
 #: ../calendar/calendar.error.xml.h:38
-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."
+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ć."
+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"
@@ -4218,16 +4357,28 @@ msgid "Error on '{0}'"
 msgstr "Błąd w \"{0}\""
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "Jeżeli informacja o odwołaniu nie zostanie wysłana, inni uczestnicy mogą się nie dowiedzieć, że zebranie się nie odbędzie."
+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 "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."
+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 "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 ""
+"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 "No response from the server."
@@ -4249,20 +4400,36 @@ 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."
+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ń."
+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."
+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."
+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."
@@ -4351,8 +4518,14 @@ 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: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."
+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:79
 msgid "You have changed this appointment, but not yet saved it."
@@ -4364,27 +4537,33 @@ msgstr "Wprowadzono zmiany w zadaniu, ale nie zostały one jeszcze zapisane."
 
 #: ../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: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: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: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:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Porzuć zmiany"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Zapisz"
 
@@ -4393,8 +4572,7 @@ msgid "_Save Changes"
 msgstr "_Zapisz zmiany"
 
 #: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:142
+#: ../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"
@@ -4450,13 +4628,13 @@ 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:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalendarz i zadania"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1343
 msgid "Calendars"
 msgstr "Kalendarze"
 
@@ -4497,24 +4675,18 @@ msgid "Memo_s"
 msgstr "_Notatki"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278
-#: ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1807
-#: ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016
-#: ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:1025 ../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: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/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:482
 #: ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
@@ -4549,8 +4721,7 @@ msgstr[2] "minut"
 #: ../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:525
@@ -4576,7 +4747,7 @@ msgstr "Spotkania"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1614
 #: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "Location:"
 msgstr "Położenie:"
 
@@ -4590,18 +4761,14 @@ msgid "_Dismiss"
 msgstr "Zamknij"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:170
+#: ../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: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
+#: ../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"
@@ -4654,13 +4821,15 @@ msgstr ""
 #: ../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"
@@ -4675,16 +4844,18 @@ 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:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4694,8 +4865,7 @@ 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:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4707,8 +4877,7 @@ 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:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4743,8 +4912,10 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendarze dla których będą uruchamiane przypomnienia"
 
 #: ../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)."
+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."
@@ -4856,7 +5027,9 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Kolor linii Marcusa Bainsa - pasek czasu"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
@@ -4892,28 +5065,50 @@ msgid "Overdue tasks color"
 msgstr "Kolor zaległych zadań"
 
 #: ../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."
+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: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."
+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:46
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+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: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)."
+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: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."
+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: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."
+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:50
 msgid "Programs that are allowed to be run by alarms."
@@ -4937,7 +5132,8 @@ msgstr "Pokazuj pole roli w edytorze zdarzeń/zadań/zebrań"
 
 #: ../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:56
 msgid "Show categories field in the event/meeting/task editor"
@@ -4970,165 +5166,211 @@ 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:63
-msgid "Show week numbers in date navigator"
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
 msgstr "Wyświetlanie numerów tygodni w nawigatorze dat"
 
 #: ../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 ""
+msgid "Show week numbers in date navigator"
+msgstr "Wyświetlanie numerów tygodni w nawigatorze dat"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Kolor zadań na dziś"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Położenie pionowe panela zadań"
 
-#: ../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ę."
-
 #: ../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\"."
+#, 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ę."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "The second timezone for a Day View"
+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: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."
+msgid "The second timezone for a Day View"
+msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, 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:73
 msgid "Time divisions"
 msgstr "Przedziały czasu:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Czas uruchomienia ostatniego porzypomnienia, w time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: ../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:76
+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:77
 msgid "Twenty four hour time format"
 msgstr "24-godzinny format czasu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "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: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:79
+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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Początek tygodnia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Początkowy dzień tygodnia, od Niedzieli (0) do Soboty (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Określa, czy używać obszaru powiadamiania do wyświetlania przypomnień."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Określa, czy potwierdzać kasowanie spotkań i zadań."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Określa, czy potwierdzać usunięcie spotkań i zadań."
 
-#: ../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: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."
+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: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."
+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."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Określa czy rysować w kalendarzu wskazującą bieżący czas linię Marcusa "
+"Bainsa."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 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:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 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:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 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:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 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:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 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:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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: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: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ń"
+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:96
+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ń"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 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:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Określa, czy wyświetlać numery tygodni w nawigatorze dat."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 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:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 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:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Dni robocze"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Godzina końca dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minuta końca dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Godzina początku dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minuta początku dnia roboczego"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "czas zimowy"
 
@@ -5180,26 +5422,28 @@ msgstr "Aktualne spotkania"
 msgid "Next 7 Days' Appointments"
 msgstr "Spotkania w następnych 7 dniach"
 
-#: ../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
+#: ../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: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."
+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:321
 msgid "Purge events older than"
 msgstr "Usunięcie zdarzeń starszych niż"
 
 #: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: ../filter/filter.glade.h:14
+#: ../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:526
@@ -5209,99 +5453,103 @@ msgstr "Usunięcie zdarzeń starszych niż"
 msgid "days"
 msgstr "dni"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../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
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "W sieci"
 
-#: ../calendar/gui/calendar-component.c:318
-#: ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Urodziny i rocznice"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Pogoda"
 
-#: ../calendar/gui/calendar-component.c:658
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Nowy kalendarz"
 
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500
-#: ../calendar/gui/tasks-component.c:491
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
 #: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505
-#: ../calendar/gui/tasks-component.c:496
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
 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
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "_Nie udostępniaj w trybie offline"
 
-#: ../calendar/gui/calendar-component.c:995
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Nie można zaktualizować kalendarzy."
 
-#: ../calendar/gui/calendar-component.c:1176
+#: ../calendar/gui/calendar-component.c:1194
 #, 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:1192
+#: ../calendar/gui/calendar-component.c:1210
 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:1305
+#: ../calendar/gui/calendar-component.c:1323
 msgid "Calendar Source Selector"
 msgstr "Wybór źródła kalendarza"
 
-#: ../calendar/gui/calendar-component.c:1521
+#: ../calendar/gui/calendar-component.c:1539
 msgid "New appointment"
 msgstr "Nowe spotkanie"
 
-#: ../calendar/gui/calendar-component.c:1523
+#: ../calendar/gui/calendar-component.c:1541
 msgid "Create a new appointment"
 msgstr "Tworzy nowe spotkanie"
 
-#: ../calendar/gui/calendar-component.c:1529
+#: ../calendar/gui/calendar-component.c:1547
 msgid "New meeting"
 msgstr "Nowe zebranie"
 
-#: ../calendar/gui/calendar-component.c:1531
+#: ../calendar/gui/calendar-component.c:1549
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o zebranie"
 
-#: ../calendar/gui/calendar-component.c:1537
+#: ../calendar/gui/calendar-component.c:1555
 msgid "New all day appointment"
 msgstr "Nowe spotkanie całodniowe"
 
-#: ../calendar/gui/calendar-component.c:1539
+#: ../calendar/gui/calendar-component.c:1557
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowe spotkanie całodniowe"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1563
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: ../calendar/gui/calendar-component.c:1547
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
@@ -5321,16 +5569,13 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../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:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../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"
 
@@ -5340,75 +5585,59 @@ msgstr "Załączniki"
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../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:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../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: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/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Tajny"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
+#: ../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:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../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:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../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:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../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:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../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/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Prywatny"
 
-#: ../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
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Publiczny"
 
@@ -5420,44 +5649,34 @@ msgstr "Powtarzanie"
 #: ../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:14
+#: ../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:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../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:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../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:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../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:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../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:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../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"
 
@@ -5473,8 +5692,7 @@ 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:1271
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -5614,33 +5832,29 @@ msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/event-page.c:2954
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../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
+#: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
 #: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Brak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendarze dla których będą uruchamiane alarmy"
 
@@ -5665,8 +5879,11 @@ msgstr ""
 
 #: ../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:9
 #: ../mail/mail-config.glade.h:10
@@ -5777,126 +5994,140 @@ msgid "Sh_ow a reminder"
 msgstr "_Przypomnienie na"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "_Przypomnienie na"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 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:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Wyświetlanie numerów tygodni w nawigatorze dat"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "Zadania na _dziś:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "_Czw"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Szablon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Strefa czasowa:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Środa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Środa"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Początek _tygodnia:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Dni robocze:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Potw_ierdzanie przed usunięciem elementów"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekendów na widoku miesięcznym"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "Początek _dnia:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Pią"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zakończonych zadań po"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "P_on"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "Z_aległe zadania:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_Sob"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "Pokaż _czasy zakończenia spotkań w widoku tygodniowym i miesięcznym"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "_Przedziały czasu:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Wto"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "Ś_ro"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "przed każdym spotkaniem"
 
@@ -5997,28 +6228,23 @@ 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:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2359
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr " (Zakończone "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "Zakończone"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (Należne "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "Należne "
 
@@ -6029,8 +6255,7 @@ msgstr "Załączona wiadomość - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417
-#: ../composer/e-msg-composer.c:1765
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
 #: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
@@ -6039,25 +6264,19 @@ 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: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
+#: ../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:490
-#: ../composer/e-msg-composer.c:2054
-#: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2107
+#: ../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:623
-#: ../calendar/gui/dialogs/comp-editor.c:3300
-#: ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
@@ -6067,200 +6286,194 @@ msgstr "załącznik"
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Modyfikacja spotkania"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Zebranie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Spotkanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Przypisane zadanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Notatka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Bez podsumowania"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Keep original item?"
 msgstr "Czy zachować element oryginalny?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Zamyka bieżące okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiuje zaznaczony tekst do schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Wycina zaznaczony tekst do schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Wyświetla dostępną pomoc"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Wkleja tekst ze schowka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Zapisuje bieżące okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Zaznacza cały tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1374
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "_Klasyfikacja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Plik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "W_staw"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Opcje"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Widok"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Załącznik..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Wybór załącznika"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Kategorie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Przełącza wyświetlanie kategorii"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Strefa c_zasowa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Przełącza wyświetlanie pola strefa czasowa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1457
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Określ jako publiczne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1462
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Prywatny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1464
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Określ jako prywatne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "P_oufny"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1471
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Oznacz jako poufne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1479
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "Pole R_ola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Przełącza wyświetlanie pola rola"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1487
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Przełącza wyświetlanie pola RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1495
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Stan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1497
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Przełącza wyświetlanie pola statusu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1503
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Typ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1505
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Przełącza wyświetlanie pola typ uczestnika"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1819
-#: ../composer/e-composer-private.c:64
-#: ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../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:1838
+#: ../calendar/gui/dialogs/comp-editor.c:1847
 #: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Załącz"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1933
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6268,47 +6481,48 @@ 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:1965
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "_Ukryj pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1968
-#: ../calendar/gui/dialogs/comp-editor.c:2271
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "_Pokaż pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2091
 #: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198
-#: ../composer/e-msg-composer.c:1039
+#: ../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:2085
+#: ../calendar/gui/dialogs/comp-editor.c:2094
 #: ../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:2293
+#: ../calendar/gui/dialogs/comp-editor.c:2302
 #: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Pokaż załączniki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Klawisz spacji przełącza pasek załączników"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2439
-#: ../calendar/gui/dialogs/comp-editor.c:2487
-#: ../calendar/gui/dialogs/comp-editor.c:3333
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 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:3362
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Nie można użyć bieżącej wersji!"
 
@@ -6628,8 +6842,7 @@ msgstr "Ko_ntakty..."
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111
-#: ../calendar/gui/print.c:2475
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "Notatka"
 
@@ -6638,14 +6851,10 @@ msgstr "Notatka"
 msgid "Unable to open memos in '%s'."
 msgstr "Nie można otworzyć notatek w '%s'."
 
-#: ../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
+#: ../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"
 
@@ -6702,7 +6911,9 @@ msgstr "Wszystkie instancje"
 
 #: ../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:892
 msgid "Recurrence date is invalid"
@@ -6875,6 +7086,10 @@ msgstr "tygodni"
 msgid "year(s)"
 msgstr "lat"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6899,20 +7114,16 @@ msgstr "<span weight=\"bold\">Stan</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:362
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652
-#: ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180
-#: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2551
-#: ../calendar/gui/tasktypes.xml.h:9
+#: ../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:2558 ../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:266
-#: ../calendar/gui/e-calendar-table.c:577
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Wysoki"
@@ -6923,25 +7134,21 @@ msgstr "Wysoki"
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651
-#: ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "W trakcie"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579
-#: ../calendar/gui/tasktypes.xml.h:16
+#: ../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: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
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Zwykły"
 
@@ -6950,8 +7157,7 @@ msgstr "Zwykły"
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nierozpoczęte"
@@ -6965,8 +7171,7 @@ msgid "Stat_us:"
 msgstr "_Stan:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
@@ -7113,15 +7318,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67
-#: ../mail/em-folder-view.c:3268
+#: ../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:129
-#: ../calendar/gui/e-cal-component-preview.c:171
-#: ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Bez nazwy"
 
@@ -7134,8 +7337,7 @@ msgstr "Data rozpoczęcia:"
 #: ../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
+#: ../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:"
@@ -7160,7 +7362,7 @@ msgstr "Czas zakończenia:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1181
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Status:"
 msgstr "Stan:"
 
@@ -7198,18 +7400,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029
-#: ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152
-#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c: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-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7217,64 +7416,50 @@ 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:1198
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../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
+#: ../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/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Przyporządkowano"
 
-#: ../calendar/gui/e-cal-popup.c:184
-#: ../mail/em-popup.c:414
+#: ../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:2214
+#: ../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:442
+#: ../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: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
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
-#: ../calendar/gui/e-cal-popup.c:287
-#: ../mail/em-popup.c:560
+#: ../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"
@@ -7283,8 +7468,7 @@ msgstr "Ustaw jako _tło"
 msgid "_Save Selected"
 msgstr "_Zapisz wybrane"
 
-#: ../calendar/gui/e-cal-popup.c:430
-#: ../mail/em-popup.c:828
+#: ../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..."
@@ -7295,7 +7479,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:2368
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -7303,7 +7487,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:2372
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
@@ -7361,68 +7545,55 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:670
-#: ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
 #: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:835
-#: ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Aktualizowanie obiektów"
 
 #: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1296
-#: ../calendar/gui/e-memo-table.c:819
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
 #: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Nowe _zadanie"
 
-#: ../calendar/gui/e-calendar-table.c:1589
-#: ../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:1591
-#: ../calendar/gui/e-calendar-view.c:1732
-#: ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Wy_drukuj..."
 
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../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:1602
-#: ../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"
@@ -7482,145 +7653,136 @@ msgstr "Data rozpoczęcia"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2307
 #: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:70
+#: ../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
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Przenoszenie elementów"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Kopiowanie elementów"
 
-#: ../calendar/gui/e-calendar-view.c:1726
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Nowe _spotkanie..."
 
-#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Nowe ze_branie"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1739
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Bieżący widok"
 
-#: ../calendar/gui/e-calendar-view.c:1741
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "_Dzisiejszy dzień"
 
-#: ../calendar/gui/e-calendar-view.c:1742
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Wybierz datę..."
 
-#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "Wydr_ukuj..."
 
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "S_kopiuj do kalendarza..."
 
-#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "P_rzenieś do kalendarza..."
 
-#: ../calendar/gui/e-calendar-view.c:1760
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Deleguj zebranie..."
 
-#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj zebranie..."
 
-#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Przekaż jako iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1763
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../mail/em-folder-view.c:1327
-#: ../mail/em-popup.c:564
-#: ../mail/em-popup.c:575
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Uczyń to wystąpienie p_rzenośnym"
 
-#: ../calendar/gui/e-calendar-view.c:1770
-#: ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
-#: ../calendar/gui/e-calendar-view.c:2223
+#: ../calendar/gui/e-calendar-view.c:2254
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2255
 #: ../calendar/gui/e-itip-control.c:1194
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2132
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: ../calendar/gui/e-calendar-view.c:2225
+#: ../calendar/gui/e-calendar-view.c:2256
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-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-calendar-view.c:2257
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: ../calendar/gui/e-calendar-view.c:2227
+#: ../calendar/gui/e-calendar-view.c:2258
 #, fuzzy
 msgid "Needs action"
 msgstr "Wymaga działania"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2388
-#: ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "Miejsce: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2422
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Czas: %s %s "
@@ -7664,27 +7826,29 @@ msgstr "Wyświetlanie panelu \"Podgląd\""
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1671
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:801
-#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
 #: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:804
-#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
 #: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Tydzień"
+
 #: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Tak (powtarzalność złożona)"
@@ -7772,8 +7936,7 @@ msgstr "Zakończenie"
 msgid "Due"
 msgstr "Wykonanie"
 
-#: ../calendar/gui/e-itip-control.c:998
-#: ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
@@ -7782,36 +7945,43 @@ msgstr "Informacje iKalendarza"
 msgid "iCalendar Error"
 msgstr "Błąd iKalendarza"
 
-#: ../calendar/gui/e-itip-control.c:1087
-#: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
 #: ../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."
+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:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Wstępnie zaakceptowane"
 
 #: ../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"
+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: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ń"
+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:1358
 #, c-format
@@ -7873,8 +8043,7 @@ msgstr "<b>%s</b> anulował zebranie."
 msgid "Meeting Cancelation"
 msgstr "Anulowanie zebrania"
 
-#: ../calendar/gui/e-itip-control.c:1406
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../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."
@@ -8005,28 +8174,30 @@ msgstr "Obiekt jest niepoprawny i nie można go zaktualizować\n"
 
 #: ../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: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:2068
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
 #: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "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:2106
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../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:2112
-#: ../calendar/gui/e-itip-control.c:2171
+#: ../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"
 
@@ -8071,8 +8242,7 @@ msgstr "Pobranie stanu wezwanej osoby"
 msgid "Send Latest Information"
 msgstr "Wysłanie najświeższej informacji"
 
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -8121,67 +8291,55 @@ msgid "Attendees"
 msgstr "Uczestnicy"
 
 #: ../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
+#: ../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: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
+#: ../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:164
-#: ../calendar/gui/e-meeting-store.c:89
-#: ../calendar/gui/e-meeting-store.c:106
+#: ../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:165
-#: ../calendar/gui/e-meeting-store.c:91
-#: ../calendar/gui/e-meeting-store.c:108
+#: ../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:176
-#: ../calendar/gui/e-meeting-store.c:120
-#: ../calendar/gui/e-meeting-store.c:137
+#: ../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: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
+#: ../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:178
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:141
+#: ../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:179
-#: ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:143
+#: ../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:201
-#: ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../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"
@@ -8191,8 +8349,7 @@ msgstr "Wymaga działania"
 msgid "Attendee                          "
 msgstr "Uczestnik                          "
 
-#: ../calendar/gui/e-meeting-store.c:182
-#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "W toku"
 
@@ -8310,13 +8467,11 @@ 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/e-memos.c:760 ../calendar/gui/e-tasks.c:910
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8325,17 +8480,16 @@ msgstr ""
 "Błąd przy URI %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Wczytywanie notatek"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 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:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
@@ -8343,16 +8497,16 @@ msgstr "Usuwanie zaznaczonych obiektów..."
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Wykańczanie zadań..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
@@ -8363,46 +8517,45 @@ 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:1652
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2621
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "_Własny widok"
 
-#: ../calendar/gui/gnome-cal.c:2622
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Zapisz własny widok"
 
-#: ../calendar/gui/gnome-cal.c:2627
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "Z_definiuj widoki..."
 
 # FIXME - upewnić się tego "at"
-#: ../calendar/gui/gnome-cal.c:2869
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Wczytywanie spotkań z %s"
 
 # FIXME - upewnić się tego "at"
-#: ../calendar/gui/gnome-cal.c:2884
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Wczytywanie zadań z %s"
 
-#: ../calendar/gui/gnome-cal.c:2893
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Wczytywanie notatek z %s"
 
-#: ../calendar/gui/gnome-cal.c:2998
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: ../calendar/gui/gnome-cal.c:3966
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Czyszczenie"
 
@@ -8462,8 +8615,7 @@ 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."
@@ -8472,23 +8624,19 @@ 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:772
+#: ../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:775
+#: ../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:778
+#: ../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:796
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "Informacja o zajętości"
 
@@ -8509,11 +8657,11 @@ msgstr "Informacja w formacie iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Musisz należeć do uczestników zdarzenia."
 
-#: ../calendar/gui/memos-component.c:499
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Nowa lista notatek"
 
-#: ../calendar/gui/memos-component.c:582
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8521,8 +8669,7 @@ msgstr[0] "%d notatka"
 msgstr[1] "%d notatki"
 msgstr[2] "%d notatek"
 
-#: ../calendar/gui/memos-component.c:584
-#: ../calendar/gui/tasks-component.c:575
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8530,75 +8677,78 @@ msgstr[0] ", %d zaznaczone"
 msgstr[1] ", %d zaznaczone"
 msgstr[2] ", %d zaznaczonych"
 
-#: ../calendar/gui/memos-component.c:631
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Nie można zaktualizować notatek."
 
-#: ../calendar/gui/memos-component.c:873
+#: ../calendar/gui/memos-component.c:882
 #, 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:886
+#: ../calendar/gui/memos-component.c:895
 msgid "There is no calendar available for creating memos"
 msgstr "Brak dostępnego kalendarza do utworzenia notatek"
 
-#: ../calendar/gui/memos-component.c:996
+#: ../calendar/gui/memos-component.c:1005
 msgid "Memo Source Selector"
 msgstr "Wybór źródła notek"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1184
 msgid "New memo"
 msgstr "Nowa notatka"
 
-#: ../calendar/gui/memos-component.c:1177
+#: ../calendar/gui/memos-component.c:1186
 msgid "Create a new memo"
 msgstr "Tworzy nową notatkę"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1192
 msgid "New shared memo"
 msgstr "Nowa współdzielona notatka"
 
-#: ../calendar/gui/memos-component.c:1185
+#: ../calendar/gui/memos-component.c:1194
 msgid "Create a shared new memo"
 msgstr "Tworzy nową współdzieloną notatkę"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1200
 msgid "New memo list"
 msgstr "Nowa lista notatek"
 
-#: ../calendar/gui/memos-component.c:1193
+#: ../calendar/gui/memos-component.c:1202
 msgid "Create a new memo list"
 msgstr "Tworzy nową listę notatek"
 
-#: ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Drukuj notatki"
 
 #: ../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"
@@ -8775,57 +8925,57 @@ msgstr "Pt"
 msgid "Sa"
 msgstr "So"
 
-#: ../calendar/gui/print.c:2471
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "Spotkanie"
 
-#: ../calendar/gui/print.c:2473
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "Zadanie"
 
-#: ../calendar/gui/print.c:2498
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "Podsumowanie: %s"
 
-#: ../calendar/gui/print.c:2521
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "Uczestnicy:"
 
-#: ../calendar/gui/print.c:2561
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: ../calendar/gui/print.c:2578
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: ../calendar/gui/print.c:2590
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zakończenia: %i"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: ../calendar/gui/print.c:2626
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: ../calendar/gui/tasks-component.c:490
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Nowa lista zadań"
 
-#: ../calendar/gui/tasks-component.c:573
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8833,64 +8983,66 @@ msgstr[0] "%d zadanie"
 msgstr[1] "%d zadania"
 msgstr[2] "%d zadań"
 
-#: ../calendar/gui/tasks-component.c:622
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Nie można zaktualizować zadań."
 
-#: ../calendar/gui/tasks-component.c:861
+#: ../calendar/gui/tasks-component.c:870
 #, 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:874
+#: ../calendar/gui/tasks-component.c:883
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: ../calendar/gui/tasks-component.c:985
+#: ../calendar/gui/tasks-component.c:994
 msgid "Task Source Selector"
 msgstr "Wybór źródła zadania"
 
-#: ../calendar/gui/tasks-component.c:1239
+#: ../calendar/gui/tasks-component.c:1248
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: ../calendar/gui/tasks-component.c:1241
+#: ../calendar/gui/tasks-component.c:1250
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: ../calendar/gui/tasks-component.c:1247
+#: ../calendar/gui/tasks-component.c:1256
 msgid "New assigned task"
 msgstr "Nowe przypisane zadanie"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Create a new assigned task"
 msgstr "Tworzy nowe przypisane zadanie"
 
-#: ../calendar/gui/tasks-component.c:1255
+#: ../calendar/gui/tasks-component.c:1264
 msgid "New task list"
 msgstr "Nowa lista zadań"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Create a new task list"
 msgstr "Tworzy nową listę zadań"
 
 #: ../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:445
-#: ../mail/em-folder-view.c:1123
+#: ../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:482
-#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Wydruku zadań"
 
@@ -8907,13 +9059,11 @@ msgstr " Anulowano"
 msgid "In progress"
 msgstr "W trakcie"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../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:29
-#: ../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ż"
 
@@ -8923,7 +9073,7 @@ msgstr "Spotkania i zebrania"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Otwieranie kalendarza"
 
@@ -10531,8 +10681,7 @@ msgstr "Wiadomość bez tytułu"
 msgid "Attach a file"
 msgstr "Załączenie pliku"
 
-#: ../composer/e-composer-actions.c:476
-#: ../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"
@@ -10541,22 +10690,16 @@ msgstr "Zam_knij"
 msgid "Close the current file"
 msgstr "Zamyka bieżący plik"
 
-#: ../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
+#: ../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: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
+#: ../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"
 
@@ -10727,8 +10870,12 @@ 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: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 "
+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:643
 msgid "Fr_om:"
@@ -10778,23 +10925,27 @@ 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:179
-#: ../composer/e-msg-composer.c:1552
+#: ../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: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"
+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: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"
+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:1494
-#: ../mail/em-format-html-display.c:1949
-#: ../mail/em-format-html-display.c:2596
-#: ../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"
@@ -10806,38 +10957,55 @@ msgstr[2] "Załączników"
 msgid "Hide _Attachment Bar"
 msgstr "_Ukryj pasek załączników"
 
-#: ../composer/e-msg-composer.c:1567
-#: ../composer/e-msg-composer.c:2792
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Tworzenie wiadomości"
 
 #: ../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>"
+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."
@@ -10876,13 +11044,22 @@ 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
 #, 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."
+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."
@@ -10890,21 +11067,29 @@ 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."
@@ -10946,8 +11131,7 @@ 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"
 
@@ -10963,15 +11147,11 @@ 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"
 
@@ -11024,15 +11204,13 @@ msgstr "Poziom zapisu"
 msgid "Time"
 msgstr "Czas"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291
-#: ../mail/message-list.c:2522
+#: ../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
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zamyka bieżące okno"
 
@@ -11056,10 +11234,8 @@ msgstr "Debug"
 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
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
@@ -11078,11 +11254,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}\"."
 
@@ -11106,8 +11282,7 @@ 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"
 
@@ -11161,7 +11336,9 @@ msgid "Label name cannot be empty."
 msgstr "Nazwa oznaczenia nie może być pusta."
 
 #: ../e-util/e-util-labels.c:362
-msgid "A label having the same tag already exists on the server. Please rename your label."
+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:1221
@@ -11289,8 +11466,7 @@ msgstr[2] "%d lat w przyszłości"
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybrać datę>"
 
-#: ../filter/filter-datespec.c:291
-#: ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
 #: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "teraz"
@@ -11362,14 +11538,12 @@ msgstr "Bez odpowiedzi lub rodzica"
 msgid "I_nclude threads"
 msgstr "_Wątki"
 
-#: ../filter/filter-rule.c:1045
-#: ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Przychodzące"
 
-#: ../filter/filter-rule.c:1045
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Wychodzące"
 
@@ -11393,8 +11567,7 @@ 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."
 
@@ -11471,8 +11644,7 @@ msgstr "w przyszłości"
 msgid "months"
 msgstr "miesięcy"
 
-#: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:198
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "sekund"
 
@@ -11484,8 +11656,7 @@ msgstr "bieżącym czasem"
 msgid "the time you specify"
 msgstr "podanym czasem"
 
-#: ../filter/filter.glade.h:22
-#: ../plugins/caldav/caldav-source.c:433
+#: ../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
@@ -11514,12 +11685,16 @@ 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"
@@ -11557,12 +11732,9 @@ 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:602
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597
-#: ../mail/mail-component.c:598
+#: ../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"
@@ -11604,16 +11776,13 @@ 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:258
+#: ../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:102
+#: ../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"
 
@@ -11621,13 +11790,11 @@ 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:95
+#: ../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:125
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
@@ -11639,41 +11806,34 @@ msgstr "Sprawdzanie _nowych wiadomości co"
 msgid "minu_tes"
 msgstr "minu_t"
 
-#: ../mail/em-account-editor.c:2326
-#: ../mail/mail-config.glade.h:139
+#: ../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:132
+#: ../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:84
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Asystent dodawania konta Evolution"
 
@@ -11690,10 +11850,8 @@ msgstr "Nazwa konta"
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../mail/em-composer-prefs.c:303
-#: ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190
-#: ../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"
 
@@ -11709,23 +11867,35 @@ msgstr "Dodawanie treści podpisu"
 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ść ----------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
-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:2105
+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
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-------- Wiadomość oryginalna ----------"
 
@@ -11776,10 +11946,8 @@ 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ń"
@@ -11828,8 +11996,7 @@ 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"
 
@@ -11857,8 +12024,7 @@ msgstr "nie jest ustawiony"
 msgid "is set"
 msgstr "jest ustawiony"
 
-#: ../mail/em-filter-i18n.h:40
-#: ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Niechciana"
@@ -11867,8 +12033,7 @@ msgstr "Niechciana"
 msgid "Junk Test"
 msgstr "Test spamu"
 
-#: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etykieta"
 
@@ -11909,13 +12074,11 @@ msgid "Play Sound"
 msgstr "Odtwórz dźwięk"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52
-#: ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Przeczytane"
 
-#: ../mail/em-filter-i18n.h:53
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Lista odbiorców"
 
@@ -11943,13 +12106,11 @@ msgstr "zwraca mniej niż"
 msgid "Run Program"
 msgstr "Uruchom program"
 
-#: ../mail/em-filter-i18n.h:60
-#: ../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:61
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Nadawca"
 
@@ -11990,12 +12151,9 @@ 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:311
+#: ../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:1115
 msgid "Subject"
@@ -12090,10 +12248,8 @@ msgid "Quota usage"
 msgstr "Użycie przydziału"
 
 #. translators: standard local mailbox names
-#: ../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/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
@@ -12118,42 +12274,34 @@ 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:980
-#: ../mail/mail-vfolder.c:1047
+#: ../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:165
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Szkice"
 
-#: ../mail/em-folder-tree-model.c:506
-#: ../mail/mail-component.c:168
+#: ../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
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Wychodzące"
 
-#: ../mail/em-folder-tree-model.c:514
-#: ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Wysłane"
 
-#: ../mail/em-folder-tree-model.c:536
-#: ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
@@ -12171,14 +12319,12 @@ msgstr "Przenoszenie katalogu %s"
 msgid "Copying folder %s"
 msgstr "Kopiowanie katalogu %s"
 
-#: ../mail/em-folder-tree.c:909
-#: ../mail/message-list.c:2013
+#: ../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:2015
+#: ../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"
@@ -12188,18 +12334,15 @@ 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:1059
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie katalogów w \"%s\""
@@ -12217,8 +12360,7 @@ msgstr "_Nowy katalog..."
 msgid "_Move..."
 msgstr "_Przenieś..."
 
-#: ../mail/em-folder-tree.c:2133
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "O_dśwież"
 
@@ -12226,10 +12368,9 @@ msgstr "O_dśwież"
 msgid "Fl_ush Outbox"
 msgstr "Wyślij wy_chodzące"
 
-#: ../mail/em-folder-tree.c:2140
-#: ../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"
+msgstr "_Opróżnij kosz"
 
 #: ../mail/em-folder-tree.c:2243
 #, fuzzy
@@ -12241,15 +12382,13 @@ msgstr "Utwórz katalog _wyszukiwania"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiowanie \"%s\" do \"%s\""
 
-#: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1183
+#: ../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:1198
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "Sk_opiuj"
 
@@ -12271,31 +12410,25 @@ msgstr "Tworzenie katalogu"
 msgid "Specify where to create the folder:"
 msgstr "Miejsce utworzenia katalogu:"
 
-#: ../mail/em-folder-view.c:1087
-#: ../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:1088
-#: ../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:1326
-#: ../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:1328
-#: ../mail/em-popup.c:566
-#: ../mail/em-popup.c:577
+#: ../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:1332
-#: ../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ść..."
 
@@ -12345,8 +12478,7 @@ msgstr "_Etykieta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1352
-#: ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Brak"
 
@@ -12404,8 +12536,7 @@ 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:2252
-#: ../mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
 #: ../plugins/google-account-setup/google-source.c:529
 #: ../plugins/google-account-setup/google-source.c:727
@@ -12475,89 +12606,117 @@ msgstr "_Następny"
 msgid "M_atch case"
 msgstr "Uwzględnianie _wielkości liter"
 
-#: ../mail/em-format-html-display.c:951
-#: ../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: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."
+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:952
-#: ../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: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."
+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:953
-#: ../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: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."
+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:954
-#: ../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: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."
+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:955
-#: ../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: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."
+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:962
-#: ../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: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."
+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:963
-#: ../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: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."
+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:964
-#: ../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: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ść."
+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:965
-#: ../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: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."
+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:1066
-#: ../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"
 
@@ -12614,8 +12773,7 @@ msgstr[0] "%d _załącznik"
 msgstr[1] "%d _załączniki"
 msgstr[2] "%d _załączników"
 
-#: ../mail/em-format-html-display.c:2297
-#: ../mail/em-format-html-display.c:2386
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_Zapisz"
 
@@ -12627,8 +12785,7 @@ msgstr "Zapisz _wszystkie"
 msgid "No Attachment"
 msgstr "Brak załącznika"
 
-#: ../mail/em-format-html-display.c:2529
-#: ../mail/em-format-html-display.c:2568
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Pokaż _niesformatowane"
 
@@ -12641,16 +12798,19 @@ msgid "O_pen With"
 msgstr "Ot_wórz z"
 
 #: ../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."
+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\""
@@ -12696,27 +12856,20 @@ 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"
@@ -12739,35 +12892,28 @@ msgstr "(%R %Z)"
 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/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:325
+#: ../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"
@@ -12781,14 +12927,16 @@ 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"
@@ -12802,14 +12950,11 @@ 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"
 
@@ -12862,18 +13007,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"
@@ -12906,43 +13051,50 @@ 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: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..."
 
@@ -12952,23 +13104,24 @@ 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: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."
+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:562
-#: ../mail/em-popup.c:573
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../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:625
-#: ../mail/em-popup.c:849
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "Dodaj d_o książki adresowej"
 
@@ -13088,20 +13241,32 @@ 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"
@@ -13156,28 +13321,52 @@ 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."
@@ -13202,19 +13391,22 @@ msgstr "Opróżnianie katalogów niechcianych wiadomości przy zakończeniu"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
-msgstr "Opróżnianie katalogów śmietnika przy zakończeniu"
+msgstr "Opróżnianie katalogów kosza 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."
-msgstr "Opróżnianie wszystkich katalogów śmietnika przy zakończeniu."
+msgstr "Opróżnianie wszystkich katalogów kosza 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"
@@ -13233,12 +13425,23 @@ 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."
@@ -13248,13 +13451,15 @@ msgstr "Renderowanie ograniczonej ilości tekstu wiadomości."
 msgid "Enable/disable caret mode"
 msgstr "Przełącza tryb karetki"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-#: ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
 msgid "Encode file names in an Outlook/GMail way"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Encode file names in the mail headers same as Outlook or GMail does, to let them understand localized file names sent by Evolution, because they do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+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
@@ -13270,41 +13475,81 @@ 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 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 ""
+"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 "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 ""
+"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
 #, 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."
+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 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 ""
+"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 "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."
+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 "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 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 prompt while marking multiple messages."
 msgstr "Włącza/wyłącza zapytanie podczas zaznaczania wielu wiadomości."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
-msgstr "Włącza/wyłącza powtarzane pytania o synchronizację przed przejściem w tryb offline."
+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 "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 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 "Last time empty junk was run"
@@ -13312,7 +13557,7 @@ 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"
+msgstr "Ostanie opróżnianie kosza"
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
@@ -13321,7 +13566,8 @@ msgstr "Lista etykiet i przypisanych im kolorów"
 #: ../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"
+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"
@@ -13332,8 +13578,12 @@ msgid "List of accounts"
 msgstr "Lista kont"
 
 #: ../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."
+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:78
 msgid "List of custom headers and whether they are enabled."
@@ -13344,8 +13594,12 @@ 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: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."
+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:81
 msgid "List of protocol names whose license has been accepted."
@@ -13358,8 +13612,14 @@ msgstr "Pobieranie obrazów dla wiadomości HTML poprzez protokół HTTP"
 
 #: ../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."
+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:84
 msgid "Log filter actions"
@@ -13403,23 +13663,28 @@ msgstr "Domyślna szerokość okna wiadomości"
 
 #: ../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: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:96
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minimalna liczba dni pomiędzy opróżnieniami śmietnika przy wyjściu"
+msgstr "Minimalna liczba dni pomiędzy opróżnieniami kosza przy wyjściu"
 
 #: ../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: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 kosza przy wyjściu."
 
 #: ../mail/evolution-mail.schemas.in.h:99
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -13434,12 +13699,14 @@ 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:102
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+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: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:104
 msgid "Prompt when deleting messages in search folder"
@@ -13451,19 +13718,26 @@ msgstr "Potwierdzanie podczas opróżniania katalogu przez użytkownika"
 
 #: ../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: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: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ą."
+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: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:110
 msgid "Prompt when user tries to send unwanted HTML"
@@ -13519,7 +13793,8 @@ msgstr "Wyświetlanie animowanych obrazów jako animacji."
 
 #: ../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:124
 msgid "Show deleted messages in the message-list"
@@ -13530,7 +13805,9 @@ msgid "Show photo of the sender"
 msgstr "Wyświetlanie zdjęcia nadawcy"
 
 #: ../mail/evolution-mail.schemas.in.h:128
-msgid "Show the email-address of the sender in a separate column in the message list."
+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:129
@@ -13575,7 +13852,7 @@ msgstr "Czas ostatniego usunięcia niechcianych wiadomości, w dniach od epoki."
 
 #: ../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."
+msgstr "Czas ostatniego opróżniania kosza, w dniach od początku epoki."
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
@@ -13586,45 +13863,93 @@ 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:142
-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."
+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
 #, 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)."
+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 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 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 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."
+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 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 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 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 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 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 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 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."
+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."
+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."
@@ -13728,20 +14053,28 @@ msgstr "Element menu Widok/Odpowiedz do jest zaznaczony."
 
 #: ../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: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."
+msgstr ""
+"Określa, czy wyłączyć funkcję skracania nazw katalogów w drzewie katalogów."
 
 #: ../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."
+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: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:181
 msgid "Width of the message-list pane"
@@ -13783,8 +14116,7 @@ msgstr "Import formatu Berkeley Mailbox"
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
 
-#: ../mail/importers/mail-importer.c:231
-#: ../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\""
@@ -13811,8 +14143,7 @@ msgstr "Importuj pocztę z Pine."
 msgid "Mail to %s"
 msgstr "Wiadomość do %s"
 
-#: ../mail/mail-autofilter.c:236
-#: ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Wiadomość od %s"
@@ -14050,7 +14381,8 @@ 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"
@@ -14167,7 +14499,9 @@ 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"
@@ -14191,7 +14525,7 @@ msgstr "Adres _e-mail:"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
-msgstr "_Opróżnianie katalogów śmietnika przy zakończeniu"
+msgstr "_Opróżnianie katalogów kosza przy zakończeniu"
 
 #: ../mail/mail-config.glade.h:79
 #, fuzzy
@@ -14258,8 +14592,7 @@ msgstr "Oryginalna wiadomość w treści (styl Outlook)"
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etykiety"
 
@@ -14288,16 +14621,22 @@ msgid "No _Proxy for:"
 msgstr "_Bez pośrednika dla:"
 
 #: ../mail/mail-config.glade.h:108
-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."
+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 "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: 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."
+msgstr ""
+"Opcja jest ignorowana jeśli dopasowany własny nagłówek niechcianej poczty."
 
 #: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
@@ -14320,12 +14659,22 @@ msgstr ""
 "Nazwa ta używana będzie tylko do wyświetlania."
 
 #: ../mail/mail-config.glade.h:117
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Proszę podać informacje o metodzie wysyłania wiadomości. W razie wątpliwości najlepiej skontaktować się z  administratorem lub dostawcą internetu (ISP)."
+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."
+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"
@@ -14337,7 +14686,8 @@ msgstr "Port:"
 
 #: ../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:122
 msgid "Quoted"
@@ -14444,8 +14794,12 @@ msgid "T_ype: "
 msgstr "R_odzaj: "
 
 #: ../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."
+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:152
 msgid ""
@@ -14462,7 +14816,8 @@ 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:157
@@ -14473,8 +14828,7 @@ msgstr "Nazwa _użytkownika:"
 msgid "Use Authe_ntication"
 msgstr "Uwierzytel_nianie"
 
-#: ../mail/mail-config.glade.h:159
-#: ../plugins/caldav/caldav-source.c:387
+#: ../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
@@ -14557,7 +14911,9 @@ msgstr "Ś_cieżka:"
 
 #: ../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:182
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14661,8 +15017,7 @@ 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:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Zaznacz do kontynuacji"
 
@@ -14734,8 +15089,7 @@ 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:573
-#: ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14763,13 +15117,11 @@ msgstr "Wysyłanie %d. z %d wiadomości"
 msgid "Failed to send %d of %d messages"
 msgstr "Niepowodzenie przy wysyłaniu %d z %d wiadomości"
 
-#: ../mail/mail-ops.c:764
-#: ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Anulowano."
 
-#: ../mail/mail-ops.c:766
-#: ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Gotowe."
 
@@ -14830,15 +15182,14 @@ msgstr "Zapisywanie konta \"%s\""
 msgid "Refreshing folder"
 msgstr "Odświeżanie katalogu"
 
-#: ../mail/mail-ops.c:1689
-#: ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Oczyszczanie katalogu"
 
 #: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Opróżnianie śmietnika w \"%s\""
+msgstr "Opróżnianie kosza w \"%s\""
 
 #: ../mail/mail-ops.c:1737
 msgid "Local Folders"
@@ -14878,8 +15229,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Zapisywanie załącznika"
 
-#: ../mail/mail-ops.c:2178
-#: ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14928,8 +15278,7 @@ msgstr "Anuluj _wszystko"
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: ../mail/mail-send-recv.c:503
-#: ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
@@ -14938,26 +15287,26 @@ msgstr "Oczekiwanie..."
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowych wiadomości"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Proszę podać hasło dla %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Hasło"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez użytkownika."
 
@@ -15034,7 +15383,8 @@ 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"
@@ -15042,16 +15392,26 @@ 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?"
@@ -15062,7 +15422,8 @@ 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
@@ -15070,12 +15431,20 @@ 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?"
@@ -15131,7 +15500,8 @@ 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}\"."
@@ -15150,8 +15520,13 @@ 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}\"."
@@ -15182,8 +15557,12 @@ 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."
@@ -15222,8 +15601,11 @@ 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?"
@@ -15259,11 +15641,16 @@ 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."
@@ -15282,8 +15669,12 @@ 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"
@@ -15299,8 +15690,17 @@ 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"
@@ -15327,15 +15727,21 @@ 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}"
 
@@ -15357,7 +15763,8 @@ 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."
@@ -15397,18 +15804,29 @@ 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 ""
@@ -15453,32 +15871,47 @@ 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."
@@ -15494,10 +15927,12 @@ 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 katalogu wyszukiwania spowoduje także usunięcie wiadomości z jej oryginalnego katalogu.\n"
+"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
@@ -15523,7 +15958,8 @@ 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"
@@ -15593,48 +16029,45 @@ msgstr "Wyższy"
 msgid "Highest"
 msgstr "Najwyższy"
 
-#: ../mail/message-list.c:1655
-#: ../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:1662
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dziś %k:%M"
 
-#: ../mail/message-list.c:1671
-#: ../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:1683
-#: ../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:1691
-#: ../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:1693
-#: ../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:3984
-#: ../mail/message-list.c:4449
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "Tworzenie listy wiadomości"
 
 #: ../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."
+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:4290
 msgid "There are no messages in this folder."
@@ -15692,8 +16125,7 @@ msgstr "Kontynuuj"
 msgid "For Your Information"
 msgstr "Do twojej informacji"
 
-#: ../mail/message-tag-followup.c:59
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Przekaż"
 
@@ -15701,13 +16133,11 @@ msgstr "Przekaż"
 msgid "No Response Necessary"
 msgstr "Odpowiedź niekonieczna"
 
-#: ../mail/message-tag-followup.c:63
-#: ../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:64
-#: ../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"
 
@@ -15752,12 +16182,20 @@ 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:475
 #: ../plugins/templates/templates.c:390
@@ -15770,12 +16208,20 @@ 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"
@@ -15787,8 +16233,12 @@ msgstr "_Zmodyfikuj wiadomość"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, 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."
+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"
@@ -15816,10 +16266,12 @@ 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
@@ -15865,7 +16317,8 @@ 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"
@@ -15949,12 +16402,21 @@ 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"
@@ -15973,8 +16435,18 @@ 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"
@@ -15988,8 +16460,7 @@ msgstr "P_rzywróć ustawienia..."
 msgid "_Backup Settings..."
 msgstr "_Utwórz kopię zapasową..."
 
-#: ../plugins/bbdb/bbdb.c:615
-#: ../plugins/bbdb/bbdb.c:624
+#: ../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"
@@ -16010,7 +16481,8 @@ msgstr "Kontakty komunikatora"
 #. Enable Gaim Checkbox
 #: ../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:681
 msgid "Select Address book for Pidgin buddy list"
@@ -16022,8 +16494,14 @@ 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"
@@ -16059,8 +16537,12 @@ 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"
@@ -16076,8 +16558,7 @@ msgstr "Filtruje niechciane wiadomości za pomocą Bogofilter."
 
 # FIXME - albo inaczej?
 #. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80
-#: ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -16198,8 +16679,12 @@ 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"
@@ -16210,12 +16695,17 @@ 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 "
@@ -16251,7 +16741,9 @@ 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
@@ -16294,12 +16786,19 @@ 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 \";\""
-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 \";\"."
+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]"
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
 msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -16325,16 +16824,24 @@ msgstr "Hasło bezpieczne"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../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)."
+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:74
 msgid "Plaintext Password"
 msgstr "Hasło tekstowe"
 
 #: ../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."
+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:272
 msgid "Out Of Office"
@@ -16439,14 +16946,17 @@ msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Program Evolution jest w trybie offline. Katalogi 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
@@ -16509,8 +17019,12 @@ msgstr "Uprawnienia dla %s"
 #. summarizing the permissions assigned to him.
 #.
 #: ../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."
+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.
 #.
@@ -16687,10 +17201,12 @@ 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
@@ -16871,8 +17387,11 @@ 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"
@@ -16895,8 +17414,12 @@ msgid "Cannot perform the operation."
 msgstr "Nie można wykonać operacji."
 
 #: ../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."
+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."
@@ -16962,7 +17485,9 @@ msgstr "Nie można uaktualnić stanu Poza biurem"
 
 #: ../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:23
 msgid "Exchange Account is offline."
@@ -17020,8 +17545,12 @@ 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: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."
+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."
@@ -17061,7 +17590,8 @@ msgstr "Proszę podać ID delegata lub odznaczyć opcję \"Wyślij jako delegat\
 
 #: ../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:54
 msgid "Please restart Evolution for changes to take effect"
@@ -17143,8 +17673,12 @@ 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: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."
+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"
@@ -17159,16 +17693,28 @@ 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:79
-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."
+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 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. 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."
+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."
@@ -17203,8 +17749,12 @@ 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
@@ -17220,12 +17770,20 @@ 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"
@@ -17260,8 +17818,14 @@ 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
@@ -17271,7 +17835,8 @@ msgstr "Odsubskrybowanie katalogu \"%s\""
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 #, fuzzy
 msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "Umożliwia anulowanie skubskrypcji katalogów w menu kontekstowym drzewa."
+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"
@@ -17292,7 +17857,9 @@ msgstr "Google"
 #: ../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:540
 #, c-format
@@ -17411,8 +17978,12 @@ 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"
@@ -17469,19 +18040,27 @@ msgstr "Temu użytkownikowi nadano już uprawnienia pełnomocnika."
 #. 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"
@@ -17500,7 +18079,8 @@ msgstr "Odrzucić je?"
 #: ../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;"
+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:9
 #, fuzzy
@@ -17593,7 +18173,8 @@ msgstr "_Napisz"
 msgid "permission to read|_Read"
 msgstr "_Odczyt"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -17601,7 +18182,8 @@ msgstr "Proxy"
 msgid "<b>Account Name</b>"
 msgstr "<b>Nazwa konta</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Login proxy"
 
@@ -17751,7 +18333,8 @@ 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"
@@ -17820,16 +18403,24 @@ 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
@@ -17837,8 +18428,10 @@ 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"
@@ -17859,617 +18452,654 @@ msgstr "Nie można wczytać kalendarza '%s'."
 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:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Znaleziono spotkanie w kalendarzu '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Nie można znaleźć żadnego kalendarza"
 
-#: ../plugins/itip-formatter/itip-formatter.c:748
+#: ../plugins/itip-formatter/itip-formatter.c:759
 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:752
+#: ../plugins/itip-formatter/itip-formatter.c:763
 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:756
+#: ../plugins/itip-formatter/itip-formatter.c:767
 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:827
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Wyszukiwanie istniejącej wersji spotkania"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Nie można przeanalizować elementu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1054
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nie można wysłać elementu do kalendarza \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1066
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Wysłane do kalendarza \"%s\" jako zaakceptowane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Wysłane do kalendarza \"%s\" jako wstępne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1075
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Wysłane do kalendarza \"%s\" jako odrzucone"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1080
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Wysłane do kalendarza '%s' jako odwołane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1174
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator usunął delegata %s."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1181
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Wysłano informację o odwołaniu do delegata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nie można wysłać informacji o odwołaniu do delegata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1318
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nie można uaktualnić uczestnika. \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1322
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Stan uczestnika został uaktualniony"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Wysłano informacje o zebraniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Wysłano informacje o zadaniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1354
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Wysłano informacje o notatce"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nie można wysłać informacji o zebraniu. Zebranie nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nie wysłać informacji dot. tego zadania. Zadanie nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nie można wysłać informacji o notatce. Notatka nie istnieje."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Przypisany kalendarz jest niepoprawny"
 
-#: ../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."
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "Wiadomość zawiera kalendarz, ale nie jest on formatu iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1490
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-#: ../plugins/itip-formatter/itip-formatter.c:1600
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Element w kalendarzu nie jest poprawny"
 
-#: ../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:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Wiadomość zawiera kalendarz, ale nie zawiera on zdarzeń, zadań lub "
+"informacji o zajętości"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1530
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Załączony kalendarz zawiera wiele elementów"
 
-#: ../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:1584
+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:2240
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Spotkanie powtarzalne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2243
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Zadanie powtarzalne"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2246
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Notatka powtarzalna"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Usunięcie wiadomości po wykonaniu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2492
-#: ../plugins/itip-formatter/itip-formatter.c:2524
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Wyszukiwanie konfliktów"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2507
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "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
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Dziś"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Dziś %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Dziś %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Dziś %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Jutro"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Jutro %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Jutro %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Jutro %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Jutro %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Proszę odpowiedzieć w imieniu <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Otrzymano w imieniu <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> poprzez %s opublikował(a) następującą informację o zebraniu:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> opublikował(a) następującą informację o zebraniu:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegował następujące zebranie:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> 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
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> zwraca się o twoją obecność na następującym zebraniu:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> poprzez %s chce dodania do istniejącego zebrania:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> chce dodania do istniejącego zebrania:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the 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
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> 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
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> 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
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> odesłał(a) następującą odpowiedź odnośnie zebrania:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> poprzez %s anulował(a) następujące zebranie:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> anulował(a) następujące zebranie."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> poprzez %s zaproponawał(a) następujące zmiany zebrania."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> zaproponawał(a) następujące zmiany zebrania."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> poprzez %s odrzucił(a) następujące zmiany zebrania:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> odrzucił(a) następujące zmiany zebrania:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> poprzez %s opublikował(a) następujące zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> opublikował(a) następujące zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> zwraca się o przypisanie %s do następującego zadania:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> poprzez %s przypisał(a) tobie zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> przypisał(a) tobie zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> poprzez %s chce dodania do istniejącego zadania:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> chce dodania do istniejącego zadania:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the 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
+#: ../plugins/itip-formatter/itip-view.c:472
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:476
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> odesłał(a) odpowiedź przypisanego zadania:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> poprzez %s anulował(a) następujące przypisane zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> anulował(a) następujące przypisane zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
-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
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> zaproponował(a) następujące zmiany przypisania zadania:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> poprzez %s odrzucił(a) następujące przypisane zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> odrzucił(a) następujące przypisane zadanie:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> poprzez %s opublikował(a) następującą notatkę:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> opublikował(a) następującą notatkę:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> poprzez %s chce dodania do istniejącej notatki:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> chce dodania do istniejącej notatki:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> poprzez %s anulował(a) następującą notatkę wspódzieloną:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> anulował(a) następującą notatkę współdzieloną:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Otwórz kalendarz"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Odmów"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Odmów"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "_Akceptuj"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "_Odmów wszystko"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "_Wstępnie wszystko"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Wstępnie"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Akceptuj wszystko"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Wyślij informacje"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Aktualizuj stan uczestników"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Aktualizuj"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Czas rozpoczęcia:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Czas zakończenia:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Wyślij _uaktualnienia do uczestników"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "_Zastosuj do wszystkich instancji"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Wyświetlanie czasu jako _wolny"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Przypomnienie o załącznikach"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Zadania :"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Notatki :"
 
@@ -18482,16 +19112,22 @@ 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:46
 msgid "Proxy _Logout"
@@ -18526,8 +19162,12 @@ 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."
@@ -18551,15 +19191,20 @@ 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."
@@ -18567,7 +19212,8 @@ 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:256
 msgid "Generate a _D-Bus message"
@@ -18654,15 +19300,21 @@ 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
@@ -18679,11 +19331,17 @@ 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
@@ -18721,8 +19379,10 @@ 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"
@@ -18742,13 +19402,17 @@ 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"
@@ -18763,8 +19427,13 @@ 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?"
@@ -18773,11 +19442,13 @@ 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. The header for this action did not contain any action that could be processed.\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}"
 
@@ -18792,8 +19463,11 @@ 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"
@@ -18856,8 +19530,12 @@ 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"
@@ -18928,11 +19606,13 @@ 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"
 
@@ -18945,19 +19625,19 @@ msgstr "Tryb tekstowy"
 msgid "Prefer plain-text"
 msgstr "Format tekstowy"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Wyświetlanie HTML jeżeli obecny"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Preferowanie tekstu"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Wyświetlanie tylko tekstu"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_Tryb HTML"
 
@@ -18969,6 +19649,20 @@ msgstr "Profiler Evolution"
 msgid "Writes a log of profiling data events."
 msgstr "Zapisuje dziennik zdarzeń danych wydajności."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Importuj pocztę z Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Importer CVS i Tab z MS Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Pozwala publikować kalendarze w sieci."
@@ -19076,14 +19770,12 @@ msgstr ""
 "Wolny/Zajęty"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:461
-#, fuzzy
 msgid "New Location"
-msgstr "Położenie"
+msgstr "Nowe położenie"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:463
-#, fuzzy
 msgid "Edit Location"
-msgstr "Położenie"
+msgstr "Edycja położenia"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -19102,9 +19794,8 @@ 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
-#, fuzzy
 msgid "A plugin which loads other plugins written using Python."
-msgstr "Wtczka, która wczytuje inne wtyczki napisane w języku python."
+msgstr "Wtyczka, która wczytuje inne wtyczki napisane w języku Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
@@ -19152,15 +19843,21 @@ msgstr "Program SpamAssassin nie jest dostępny"
 
 #: ../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: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
 #, fuzzy
@@ -19173,7 +19870,8 @@ 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
@@ -19349,11 +20047,14 @@ 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 ""
-"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"
+"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\". "
 
@@ -19401,7 +20102,9 @@ 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:603
@@ -19497,8 +20200,11 @@ 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"
@@ -19521,16 +20227,27 @@ 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"
@@ -19561,8 +20278,16 @@ 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"
@@ -19572,8 +20297,7 @@ 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:483
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
@@ -19582,7 +20306,9 @@ 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
@@ -19598,8 +20324,12 @@ 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."
@@ -19614,24 +20344,52 @@ 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"
@@ -19651,7 +20409,9 @@ 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."
@@ -19670,8 +20430,11 @@ 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."
@@ -19695,15 +20458,20 @@ 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"
@@ -19748,8 +20516,7 @@ 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:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19786,8 +20553,7 @@ msgstr "Witryna WWW Evolution"
 msgid "_Work Online"
 msgstr "Praca _z podłączeniem"
 
-#: ../shell/e-shell-window-commands.c:1183
-#: ../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"
 
@@ -19825,14 +20591,12 @@ msgstr "Przełącz do %s"
 msgid "Unknown system error."
 msgstr "Nieznany błąd systemowy."
 
-#: ../shell/e-shell.c:838
-#: ../shell/e-shell.c:839
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261
-#: ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "OK"
 
@@ -19969,7 +20733,8 @@ msgstr "Wymusza ponowną migrację z Evolution 1.4"
 
 #: ../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:497
 msgid "Disable loading of any plugins."
@@ -20014,8 +20779,12 @@ msgid "Evolution can not start."
 msgstr "Nie można uruchomić Evolution."
 
 #: ../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."
+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:8
 msgid "Insufficient disk space for upgrade."
@@ -20027,28 +20796,42 @@ msgstr "Na pewno usunąć stare dane?"
 
 #: ../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:16
 #, fuzzy
 msgid ""
 "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:20
 msgid "Upgrade from previous version failed: {0}"
@@ -20056,13 +20839,17 @@ msgstr "Aktualizacja z poprzedniej wersji nie powiodła się: {0}"
 
 #: ../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:24
 msgid ""
@@ -20104,11 +20891,13 @@ msgstr "_Przypomnij później"
 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
@@ -20122,12 +20911,23 @@ 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
@@ -20156,8 +20956,7 @@ msgstr "Nazwa certyfikatu"
 msgid "Purposes"
 msgstr "Zastosowania"
 
-#: ../smime/gui/certificate-manager.c:289
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../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"
@@ -20251,7 +21050,8 @@ 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>"
@@ -20270,11 +21070,15 @@ 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:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certyfikat"
 
@@ -20350,13 +21154,11 @@ msgstr "Jednostka organizacyjna (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odcisk SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:802
+#: ../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:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certyfikat serwera SSL"
 
@@ -20382,11 +21184,15 @@ msgstr "Wyświetl"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr "Użytkownik posiada certyfikaty identyfikujące 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 następują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:"
@@ -20406,8 +21212,7 @@ msgstr "_Modyfikuj zaufanie CA"
 msgid "Certificate already exists"
 msgstr "Certyfikat już istnieje"
 
-#: ../smime/lib/e-cert.c:222
-#: ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
@@ -20489,13 +21294,11 @@ msgstr "Algorytm klucza publicznego tematu"
 msgid "Subject's Public Key"
 msgstr "Klucz publiczny tematu"
 
-#: ../smime/lib/e-cert.c:793
-#: ../smime/lib/e-cert.c:842
+#: ../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:814
-#: ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Podpisujący obiekt"
 
@@ -20541,8 +21344,7 @@ msgstr "Podpisujący CRL"
 msgid "Critical"
 msgstr "Krytyczne"
 
-#: ../smime/lib/e-cert.c:924
-#: ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Nie krytyczne"
 
@@ -20555,8 +21357,7 @@ msgstr "Rozszerzenia"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075
-#: ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Algorytm podpisu certyfikatu"
 
@@ -20617,8 +21418,7 @@ 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"
@@ -20632,8 +21432,7 @@ msgstr "Kopiuj wybrane kontakty do innego katalogu..."
 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"
 
@@ -20645,14 +21444,12 @@ 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"
 
@@ -20689,14 +21486,12 @@ 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"
 
@@ -20729,8 +21524,7 @@ msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 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:2724
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
@@ -20776,8 +21570,7 @@ 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:39
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Akcje"
@@ -20806,8 +21599,7 @@ 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"
 
@@ -20867,8 +21659,7 @@ 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"
@@ -20877,8 +21668,7 @@ 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"
@@ -20887,8 +21677,7 @@ 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"
 
@@ -20936,8 +21725,7 @@ msgstr "Wyświetla tydzień roboczy"
 msgid "View the current appointment"
 msgstr "Wyświetla bieżące spotkanie"
 
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../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"
 
@@ -20949,8 +21737,7 @@ msgstr "Tydzień"
 msgid "Work Week"
 msgstr "Tydzień roboczy"
 
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
 msgstr "Dziennik _debugowania"
 
@@ -20984,10 +21771,9 @@ msgstr "Pobiera wiadomości z kont/katalogów zaznaczonych do trybu offline"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
-msgstr "Opróżnij śmie_tnik"
+msgstr "_Opróżnij kosz"
 
-#: ../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"
 
@@ -21022,7 +21808,9 @@ 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"
+msgstr ""
+"Pozwala za zasubskrybowanie lub odsubskrybowanie katalogów na zdalnych "
+"serwerach"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -21113,8 +21901,11 @@ 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"
@@ -21154,7 +21945,8 @@ 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"
@@ -21192,8 +21984,7 @@ 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ść"
@@ -21362,7 +22153,8 @@ 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"
@@ -21521,8 +22313,7 @@ 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"
 
@@ -21653,8 +22444,7 @@ 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"
 
@@ -21868,7 +22658,8 @@ 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"
@@ -21942,8 +22733,7 @@ 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"
 
@@ -22034,10 +22824,12 @@ 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
@@ -22148,16 +22940,13 @@ msgstr "Typ widoku:"
 msgid "Attachment Bar"
 msgstr "Pasek załącznika"
 
-#: ../widgets/misc/e-attachment.c:290
-#: ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590
-#: ../widgets/misc/e-attachment.c:607
+#: ../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:298
-#: ../widgets/misc/e-attachment.c:599
+#: ../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"
@@ -22188,8 +22977,7 @@ msgid "Month Calendar"
 msgstr "Kalendarz miesięczny"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455
-#: ../widgets/text/e-text.c:3644
+#: ../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"
@@ -22197,17 +22985,14 @@ msgstr "Kolor wypełnienia"
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../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/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:475
-#: ../widgets/misc/e-canvas-background.c:476
-#: ../widgets/text/e-text.c:3666
+#: ../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"
@@ -22232,24 +23017,21 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91
-#: ../widgets/misc/e-reflow.c:1417
+#: ../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:3070
 msgid "Minimum width"
 msgstr "Szerokość minimalna"
 
-#: ../widgets/misc/e-canvas-vbox.c:92
-#: ../widgets/misc/e-reflow.c:1418
+#: ../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:3071
 msgid "Minimum Width"
 msgstr "Szerokość minimalna"
 
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../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"
@@ -22323,16 +23105,13 @@ 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"
 
@@ -22414,8 +23193,12 @@ msgid "Use underline"
 msgstr "Użycie podkreślenia"
 
 #: ../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."
+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:207
 msgid "Space to put between the label and the child"
@@ -22429,13 +23212,11 @@ msgstr "Widget etykiety"
 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:223
-#: ../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:224
-#: ../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"
 
@@ -22448,10 +23229,8 @@ 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"
 
@@ -22468,18 +23247,15 @@ 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..."
 
@@ -22508,8 +23284,13 @@ 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"
@@ -22531,29 +23312,24 @@ msgstr "Prywatne rekordy synchronizacji:"
 msgid "Sync Categories:"
 msgstr "Kategorie synchronizacji:"
 
-#: ../widgets/misc/e-reflow.c:1439
-#: ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Pusta wiadomość"
 
-#: ../widgets/misc/e-reflow.c:1446
-#: ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Model przeformatowania"
 
-#: ../widgets/misc/e-reflow.c:1453
-#: ../widgets/misc/e-reflow.c:1454
+#: ../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"
@@ -22574,8 +23350,7 @@ msgstr "Wy_czyść"
 msgid "Item ID"
 msgstr "ID pozycji"
 
-#: ../widgets/misc/e-search-bar.c:872
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
 #: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Tekst"
@@ -22826,13 +23601,11 @@ 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)"
 
@@ -22981,8 +23754,7 @@ 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:3028
-#: ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Podmienianie kolorów wierszy"
 
@@ -22990,10 +23762,8 @@ 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:3035
-#: ../widgets/table/e-table-item.c:3036
-#: ../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"
 
@@ -23001,10 +23771,8 @@ 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:3042
-#: ../widgets/table/e-table-item.c:3043
-#: ../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"
 
@@ -23013,10 +23781,8 @@ 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:3049
-#: ../widgets/table/e-table-item.c:3050
-#: ../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"
 
@@ -23024,8 +23790,7 @@ 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:3056
-#: ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Tryb kursora"
 
@@ -23033,8 +23798,7 @@ 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:3021
-#: ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Model wyboru"
 
@@ -23042,10 +23806,8 @@ 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:3063
-#: ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326
-#: ../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"
@@ -23054,10 +23816,8 @@ 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:3097
-#: ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333
-#: ../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"
@@ -23143,23 +23903,19 @@ msgstr "Informacje o sortowaniu"
 msgid "Tree"
 msgstr "Drzewo"
 
-#: ../widgets/table/e-table-item.c:3007
-#: ../widgets/table/e-table-item.c:3008
+#: ../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:3014
-#: ../widgets/table/e-table-item.c:3015
+#: ../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:3090
-#: ../widgets/table/e-table-item.c:3091
+#: ../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:3340
-#: ../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"
@@ -23169,8 +23925,7 @@ 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"
 
@@ -23186,362 +23941,438 @@ msgstr "Rysowanie linii oraz elementów rozwijających +/-."
 msgid "Input Methods"
 msgstr "Metody wejściowe"
 
-#: ../widgets/text/e-text.c:3559
-#: ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Pocesor zdarzeń"
 
-#: ../widgets/text/e-text.c:3573
-#: ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: ../widgets/text/e-text.c:3580
-#: ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Przekreślenie"
 
-#: ../widgets/text/e-text.c:3587
-#: ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Zakotwiczenie"
 
-#: ../widgets/text/e-text.c:3595
-#: ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Justyfikacja"
 
-#: ../widgets/text/e-text.c:3602
-#: ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Szerokość przycięcia"
 
-#: ../widgets/text/e-text.c:3609
-#: ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Wysokość przycięcia"
 
-#: ../widgets/text/e-text.c:3616
-#: ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Przycięcie"
 
-#: ../widgets/text/e-text.c:3623
-#: ../widgets/text/e-text.c:3624
+#: ../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:3630
-#: ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "Przesunięcie X"
 
-#: ../widgets/text/e-text.c:3637
-#: ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Przesunięcie Y"
 
-#: ../widgets/text/e-text.c:3673
-#: ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Szerokość tekstu"
 
-#: ../widgets/text/e-text.c:3680
-#: ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Wysokość tesktu"
 
-#: ../widgets/text/e-text.c:3695
-#: ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Użycie elipsy"
 
-#: ../widgets/text/e-text.c:3702
-#: ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Elipsa"
 
-#: ../widgets/text/e-text.c:3709
-#: ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Zawijanie wierszy"
 
-#: ../widgets/text/e-text.c:3716
-#: ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Znaki przerywające"
 
-#: ../widgets/text/e-text.c:3723
-#: ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Maksymalna ilość linii"
 
-#: ../widgets/text/e-text.c:3745
-#: ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Rysowanie krawędzi"
 
-#: ../widgets/text/e-text.c:3752
-#: ../widgets/text/e-text.c:3753
+#: ../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:3759
-#: ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Rysowanie tła"
 
-#: ../widgets/text/e-text.c:3766
-#: ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Rysowanie przycisku"
 
-#: ../widgets/text/e-text.c:3773
-#: ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Pozycja kursora"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781
-#: ../widgets/text/e-text.c:3783
+#: ../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:3789
-#: ../widgets/text/e-text.c:3790
+#: ../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"
@@ -23550,161 +24381,236 @@ 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 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 "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."
@@ -23713,163 +24619,234 @@ 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"
@@ -23880,34 +24857,45 @@ 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"
@@ -23932,6 +24920,7 @@ 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"
@@ -23942,6 +24931,7 @@ 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"
@@ -23954,159 +24944,230 @@ 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 "
@@ -24118,29 +25179,41 @@ 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 All"
 #~ msgstr "Zamknij wszystko"
+
 #~ msgid ""
 #~ "Alarm on %s\n"
 #~ "%s\n"
@@ -24151,133 +25224,191 @@ 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"
 
@@ -24296,34 +25427,42 @@ 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/po/pt_BR.po b/po/pt_BR.po
index 89072a7935..d5f352811e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,17 +6,18 @@
 # Guilherme de S. Pastore <gpastore@gnome.org>, 2007.
 # Raul Pereira <contato@raulpereira.com>, 2007.
 # Rodrigo Flores <rodrigomarquesflores@gmail.com>, 2007.
-# Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2008.
 # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2008
 # Fabrício Godoy <skarllot@gmail.com>, 2008
 # Og Maciel <ogmaciel@gnome.org>, 2008.
+# Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2008, 2009.
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-12 01:48+0000\n"
-"PO-Revision-Date: 2008-12-21 16:35-0200\n"
-"Last-Translator: Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
+"POT-Creation-Date: 2009-01-29 14:45-0300\n"
+"PO-Revision-Date: 2009-01-29 14:23-0300\n"
+"Last-Translator: Jonh Wendell <wendell@bani.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,12 +34,12 @@ msgid "evolution address book"
 msgstr "catálogo de endereços do Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Novo contato"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
@@ -159,7 +160,7 @@ msgid "calendar view for one or more days"
 msgstr "exibição de agenda para um ou mais dias"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -170,8 +171,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -179,9 +180,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:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -189,10 +190,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:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -202,15 +203,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:768
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Agenda do GNOME"
 
@@ -423,7 +424,7 @@ msgstr "Falha ao autenticar-se com o servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Falha ao excluir contatos"
 
@@ -436,7 +437,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP não respondeu com informação de esquema válido."
 
 #: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Versão do servidor"
 
@@ -571,7 +572,7 @@ msgstr "_Usar como está"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -580,21 +581,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Endereço padrão de sincronização:"
 
-#: ../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 "Não foi possível carregar o catálogo de endereços"
 
-#: ../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 "Não foi possível ler os dados do aplicativo de endereços do PDA"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Completar automaticamente"
 
@@ -610,10 +612,12 @@ msgstr "Certificados"
 msgid "Configure autocomplete here"
 msgstr "Configure aqui o completamento automático"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1325
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
@@ -651,76 +655,96 @@ msgstr "Controle de definições das configurações de pasta do Evolution"
 msgid "Manage your S/MIME certificates here"
 msgstr "Gerencie aqui os seus certificados S/MIME"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../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:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "Neste computador"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../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
+#: ../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/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
 #: ../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
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Pessoal"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contato"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Cria um novo contato"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contatos"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Cria uma nova lista de contatos"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Novo catálogo de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Catálogo de _endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Cria um novo catálogo de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Falha ao atualizar as pastas ou configurações do catálogo de endereços."
@@ -741,18 +765,18 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/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:2436
+#: ../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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Catálogo de endereços"
@@ -848,53 +872,60 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra os dados de sincronização com "
 "o PDA..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Renomear pasta"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "O nome da pasta não pode conter o caractere \"/\""
 
-#: ../addressbook/gui/component/addressbook-view.c:941
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Novo catálogo de endereços"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Salvar como vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:945
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../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
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Renomear..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../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 "E_xcluir"
 
-#: ../addressbook/gui/component/addressbook-view.c:948
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2039
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "_Propriedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1336
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Seletor de origem de contatos"
 
@@ -915,7 +946,7 @@ msgstr "Digite a senha para %s (usuário %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:422
 #: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -942,10 +973,14 @@ msgstr ""
 "de visualização, em pixels."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar o e-mail junto com o nome"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Mostrar o painel de visualização"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -953,23 +988,39 @@ msgstr ""
 "O número de caracteres que deve ser digitado antes que o Evolution tente "
 "completar automaticamente."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI para a última pasta a ser usada no diálogo selecionar nomes"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para a última pasta usada no diálogo selecionar nomes."
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "Posição do painel vertical"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Se o e-mail deve ou não ser mostrado junto com o nome no recurso de "
+"completamento automático."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Mostrar o painel de visualização."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "_Sempre mostrar o e-mail do contato"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "Procurar nos catálogos de endereços"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -1167,7 +1218,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
@@ -1184,10 +1235,10 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
+"Este é o método que o Evolution usará para autenticá-lo.  Note que a opção "
 "\"Endereço de E-mail\" requer acesso anônimo ao seu servidor LDAP."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
@@ -1238,7 +1289,7 @@ msgstr "Modo de au_tenticação:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:177
+#: ../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:"
@@ -1253,7 +1304,7 @@ msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1271,13 +1322,14 @@ msgid "cards"
 msgstr "cartões"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-contacts-source.c:366
 msgid "minutes"
 msgstr "minutos"
 
@@ -1318,8 +1370,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabalho</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1330,16 +1382,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Contato"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -1348,11 +1400,12 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Imagem"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1365,146 +1418,150 @@ msgid "Nic_kname:"
 msgstr "_Apelido:"
 
 #: ../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 "Informação pessoal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefone"
 
 #. 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:193
+#: ../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 "Trabalho"
 
-#: ../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 "_Endereço:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "Bod_as:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Assistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "Aniver_sário:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:791
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "Em_presa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "A_rquivar em:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "Disponibi_lidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Página web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Gerente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "Escritóri_o:"
 
-#: ../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 "Caixa _postal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profissão:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Côn_juge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stado/Província:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "Bate-papo com _vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Dese_ja receber correio HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "On_de:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "CEP/Códi_go postal:"
 
-#: ../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 "Endereço"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
@@ -1513,980 +1570,980 @@ msgstr "Endereço"
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Editável"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afeganistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Argélia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antártica"
 
-#: ../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 "Antígua e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armênia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Áustria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbaijão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../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 "Beielorússia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Butão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bósnia e Herzegovina"
 
-#: ../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 "Ilhas Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Território do Oceano Índico Britânico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Camboja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Ilhas Cayman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "República Centro-Africana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Chade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Ilhas Christmas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas dos Cocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, República Democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Croácia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egito"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estônia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Ilhas Falkland (Malvinas)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Ilhas Faroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finlândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "França"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Territórios Franceses do Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Alemanha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grécia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guiné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guiné-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guiana"
 
-#: ../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 "Ilhas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Santa Sé"
 
-#: ../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 "Hungria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Índia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Irã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Iraque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Ilha de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Itália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Cazaquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Quênia"
 
-#: ../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 "Coréia do Norte"
 
-#: ../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 "Coréia do Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Quirguistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Letônia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Libéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Líbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Lituânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Macedônia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../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 "Ilhas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Maurício"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Micronésia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldova, República da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Mônaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
-#: ../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 "Nigéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Ilhas 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 "Ilhas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Omã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Paquistão"
 
-#: ../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 "Território Palestino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polônia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunião"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romênia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Federação Russa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts e 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 "Santa Lúcia"
 
-#: ../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 "São Vicente e Granadinas"
 
-#: ../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 "São Tome e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Sérvia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Eslovênia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "África do Sul"
 
-#: ../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 "Ilhas Georgia do Sul e Sandwich do Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Espanha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../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 "Ilhas Svalbard e 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 "Suazilândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Síria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Formosa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzânia, República Unida da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turcomenistão"
 
-#: ../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 "Ilhas Turks e 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 "Ucrânia"
 
-#: ../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 "Emirados Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../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 "Ilhas ao Largo dos Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbequistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnã"
 
-#: ../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 "Ilhas Virgens, Inglaterra"
 
-#: ../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 "Ilhas Virgens, EUA"
 
-#: ../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 "Ilhas Wallis e 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 Ocidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Iêmen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
-#: ../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
@@ -2498,118 +2555,125 @@ msgstr "Zimbábue"
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Mensageiro Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Serviço"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Local"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Casa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Outro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Catálogo fonte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Catálogo alvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "É um novo contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Campos graváveis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Campos necessários"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione uma imagem para este contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2617,43 +2681,43 @@ msgstr ""
 "Os dados do contato são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" possui um formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" está vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Contato inválido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Adição rápida de contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Selecionar catálogo de endereços"
 
@@ -2790,7 +2854,7 @@ msgstr "Serviço de M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/calendar-weather/calendar-weather.c:372
 #: ../plugins/exchange-operations/exchange-calendar.c:247
 #: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
@@ -2806,6 +2870,9 @@ msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Selecionar..."
 
@@ -2834,7 +2901,7 @@ msgstr "_Membros"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2892,23 +2959,23 @@ msgstr "Juntar contatos"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
 #: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
@@ -2929,7 +2996,7 @@ msgstr[1] "%d contatos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2943,8 +3010,8 @@ msgstr "Erro ao obter exibição do catálogo"
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Modelo"
 
@@ -2952,108 +3019,114 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Salvar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_brir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Novo contato..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nova _lista de contatos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Salvar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Encaminhar contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Encaminhar contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Enviar _mensagem ao contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Enviar _mensagem à lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Enviar _mensagem aos contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar para o catálogo de endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o catálogo de endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:484
-#: ../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:2052 ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../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 "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "C_olar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
 #: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
 #: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Não combinadas"
+
 #: ../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 "Assistente"
 
@@ -3083,7 +3156,7 @@ msgstr "Telefone do carro"
 
 #: ../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
@@ -3091,7 +3164,7 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Empresa"
 
@@ -3140,22 +3213,22 @@ msgid "Journal"
 msgstr "Diário"
 
 #: ../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 "Gerente"
 
 #: ../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 "Telefone celular"
 
 #: ../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 "Apelido"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Nota"
 
@@ -3184,14 +3257,14 @@ msgid "Radio"
 msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Cônjuge"
 
@@ -3233,7 +3306,7 @@ msgstr "Site da web"
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
 #: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Largura"
 
@@ -3248,7 +3321,7 @@ msgstr "Largura"
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
 #: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Altura"
 
@@ -3360,61 +3433,61 @@ msgstr "Selecionado"
 msgid "Has Cursor"
 msgstr "Possui cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "Abrir link no _navegador"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "Copiar local do _link"
 
-#: ../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 "En_viar nova mensagem para..."
 
-#: ../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 "Copiar _endereço de e-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Listar membros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Bate-papo com vídeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2451
+#: ../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:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3426,50 +3499,48 @@ msgstr "Bate-papo com vídeo"
 msgid "Calendar"
 msgstr "Agenda"
 
-#: ../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 "Disponibilidade"
 
-#: ../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 "Telefone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Página web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Web log"
 
-#: ../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:2538
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: ../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:2539
 msgid "Anniversary"
 msgstr "Bodas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Função"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Página web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
@@ -3503,7 +3574,7 @@ msgstr "Não existe contato próprio definido"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Permissão negada"
 
@@ -3525,11 +3596,11 @@ msgstr "Protocolo sem suporte"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3540,12 +3611,13 @@ msgstr "Não foi possível cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "A autenticação falhou"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Necessita autenticação"
 
@@ -3582,56 +3654,47 @@ msgstr "Método de autenticação sem suporte"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "Não foi possível abrir esse catálogo de endereços. Isso significa que esse "
 "catálogo não está marcado para uso desconectado ou ainda não foi baixado "
-"para uso desconectado. Por favor, carregue o catálogo de endereços uma vez "
-"em modo conectado para baixar seu conteúdo"
+"para uso desconectado. Por favor, carregue o catálogo de endereços quando "
+"estiver no modo conectado para baixar seu conteúdo."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "Não foi possível abrir este catálogo de endereços. Por favor, verifique se o "
 "caminho %s existe e se você possui as permissões para acessá-lo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Não foi possível abrir este catálogo de endereços. Isto significa que você "
-"digitou um URI incorreto ou que o servidor LDAP está fora do ar."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"Esta versão do Evolution não foi compilada incluindo suporte a LDAP. Se você "
-"deseja usar LDAP no Evolution, você deve instalar um pacote do Evolution com "
-"LDAP habilitado."
+"Esta versão do Evolution não foi compilada com suporte a LDAP. Para usar "
+"LDAP no Evolution, você deve instalar um pacote do Evolution com LDAP "
+"habilitado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "Não foi possível abrir este catálogo de endereços. Isto significa que você "
 "digitou um URI incorreto ou que o servidor está fora do ar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
-msgid "Detailed error:"
-msgstr "Erro detalhado:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "Mennsagem detalhada do erro:"
 
 # alterei para ter o mesmo tamanho
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3643,10 +3706,10 @@ msgstr ""
 "Por favor, torne a sua pesquisa mais específica ou aumente o limite \n"
 "nas preferências do servidor de diretório para este catálogo de endereços."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
@@ -3655,48 +3718,48 @@ msgstr ""
 "torne a sua pesquisa mais específica ou aumente o limite de tempo nas\n"
 "preferências do servidor de diretório para este catálogo de endereços."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "O backend para este catálogo de endereços não pôde analisar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "O backend para este catálogo de endereços se recusou a processar esta "
 "consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:190
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não foi concluída com sucesso."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
-#: ../addressbook/gui/widgets/eab-gui-util.c:688
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Erro ao adicionar contato"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Erro ao modificar contato"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:638
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Erro ao remover contato"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3711,16 +3774,16 @@ msgstr[1] ""
 "Abrir %d contatos também abrirá %d novas janelas.\n"
 "Você realmente deseja exibir todos estes contatos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "Não _mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:326
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Mostr_ar todos os contatos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3729,65 +3792,65 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:356
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-#: ../addressbook/gui/widgets/eab-gui-util.c:400
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contato"
 msgstr[1] "contatos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:483
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Selecionar catálogo de endereços"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:749
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Mover contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Copiar contato para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Mover contatos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Copiar contatos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Vários vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:921
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Informações de contato"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:949
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informações de contato para %s"
@@ -3824,7 +3887,7 @@ msgstr "Exibição de cartão"
 #: ../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:673 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importando..."
 
@@ -4016,7 +4079,7 @@ msgstr "Sombreamento"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
 #: ../plugins/exchange-operations/exchange-calendar.c:236
 #: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
@@ -4047,30 +4110,8 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Teste de editor de estilo de impressão de contato"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright © 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr ""
-"Isto deveria testar o editor de estilo de componente de impressão de contato"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Teste de impressão de contato"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Isto deveria testar o código de impressão de contato"
-
-#: ../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 "Não foi possível abrir o arquivo"
@@ -4288,42 +4329,46 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Você tem certeza de que deseja enviar a tarefa sem um resumo?"
 
 #: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "O repositório da agenda está desconectado."
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Não foi possível criar um novo evento"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Não foi possível salvar o evento"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Excluir a agenda \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Excluir a lista de memorandos \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Excluir a lista de tarefas \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Não enviar"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Transferência em progresso. Você quer salvar o compromisso?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Transferência em progresso. Você deseja salvar a tarefa?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "O editor não pôde ser carregado."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4331,26 +4376,31 @@ msgstr ""
 "Convites serão enviados por e-mail a todos os participantes, permitindo que "
 "eles aceitem esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Convites serão enviados por e-mail a todos os participantes, permitindo que "
 "eles respondam."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Erro ao carregar a agenda"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Erro ao carregar a lista de memorandos"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Erro ao carregar a lista de tarefas"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "Erro no '{0}'"
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4358,7 +4408,7 @@ msgstr ""
 "Se você não enviar um aviso de cancelamento, os outros participantes poderão "
 "não saber que a reunião foi cancelada."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4366,7 +4416,7 @@ msgstr ""
 "Se você não enviar um aviso de cancelamento, os outros participantes poderão "
 "não saber que o memorando foi excluído."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4374,19 +4424,23 @@ msgstr ""
 "Se você não enviar um aviso de cancelamento, os outros participantes poderão "
 "não saber que a tarefa foi excluída."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "Nenhuma resposta do servidor."
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "Save Appointment"
 msgstr "Salvar compromisso"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:50
 msgid "Save Memo"
 msgstr "Salvar memorando"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid "Save Task"
 msgstr "Salvar tarefa"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4394,7 +4448,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas agendas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4402,7 +4456,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas listas de tarefas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4410,7 +4464,7 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar o compromisso agora causará a "
 "perda desses anexos."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4418,85 +4472,93 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar a tarefa agora causará a perda "
 "desses anexos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Alguns recursos podem não funcionar corretamente com a versão do seu "
 "servidor atual."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "A agenda do Evolution saiu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "A agenda do Evolution terminou abruptamente."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "O memorando do Evolution saiu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saíram inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "A agenda não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de memorandos não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Esta agenda será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de memorandos será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "Não é possível abrir a agenda"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Você deseja salvar as alterações realizadas neste compromisso?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Você deseja salvar as alterações realizadas neste memorando?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Você deseja salvar as alterações realizadas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Você deseja enviar um aviso de cancelamento para este memorando?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Você deseja enviar um aviso de cancelamento a todos os participantes?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Você deseja enviar convites de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Você deseja enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Você deseja enviar informação atualizada de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Você deseja enviar informação atualizada de tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../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 "
@@ -4506,110 +4568,110 @@ msgstr ""
 "um servidor GroupWise ao qual não há suporte. Para melhores resultados o "
 "servidor deve ser atualizado para uma versão com suporte."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Você fez alterações neste compromisso, mas ainda não as salvou."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Você fez alterações nesta tarefa, mas ainda não as salvou."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Você fez alterações neste memorando mas ainda não as salvou."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Suas agendas não estarão disponíveis até que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Seus memorandos não estarão disponíveis até que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Suas tarefas não estarão disponíveis até que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descartar alterações"
 
-#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Salvar alterações"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../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 "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_Enviar notificação"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../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 "Dividir eventos de vários dias:"
 
-#: ../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 "Não foi possível iniciar o 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 "Não foi possível ler os dados do aplicativo de agenda do PDA"
 
-#: ../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 "Não foi possível ler os dados do aplicativo de memorandos do PDA"
 
-#: ../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 "Não foi possível gravar os dados do aplicativo de memorandos do PDA"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Prioridade padrão:"
 
-#: ../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 "Não foi possível ler os dados do aplicativo de tarefas do PDA"
 
-#: ../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 "Não foi possível gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2427
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
 #: ../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:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Agendas"
 
@@ -4651,21 +4713,20 @@ msgid "Memo_s"
 msgstr "Memorando_s"
 
 #: ../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:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Memorandos"
 
 #: ../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/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:737
+#: ../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
@@ -4678,8 +4739,9 @@ msgstr "Tarefas"
 msgid "_Calendars"
 msgstr "_Agendas"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
@@ -4687,26 +4749,27 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de notificação de alarme da agenda do 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] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Hora de início"
 
@@ -4717,10 +4780,10 @@ msgstr "Compromissos"
 
 #. 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
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Local:"
 
@@ -4729,52 +4792,56 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1336
+msgid "_Dismiss"
+msgstr "_Descartar"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "_Adiar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../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 "Sem resumo disponível."
 
-#: ../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 "Sem descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Sem informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Você tem %d alarmes"
 
-#: ../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 "Alerta"
 
-#: ../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"
@@ -4786,7 +4853,7 @@ msgstr ""
 "com notificações por e-mail. Em lugar disso, o Evolution\n"
 "exibirá uma caixa de diálogo de lembrete normal."
 
-#: ../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 "
@@ -4803,7 +4870,7 @@ msgstr ""
 "\n"
 "Você tem certeza de que deseja executar este programa?"
 
-#: ../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 "Não me pergunte sobre este programa novamente."
 
@@ -4857,158 +4924,184 @@ msgid "Alarm programs"
 msgstr "Programas de alarme"
 
 #: ../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 "Tempo em segundos que o erro deve ser mostrado na barra de status."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Pedir confirmação ao excluir itens"
 
-#: ../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 "Cor de fundo das tarefas com prazo para hoje, no formato \"#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 "Cor de fundo das tarefas atrasadas, no formato \"#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 "Agendas que devem ter alarmes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor utilizada para desenhar a linha Marcus Bains na barra de Tempo (vazia "
 "por padrão)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor utilizada para desenhar a linha Marcus Bains na exibição de dia."
 
-#: ../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 "Comprimir finais de semana na exibição de mês"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: ../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 ""
 "Dias nos quais o início e fim das horas de trabalho devem ser indicados."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Lembrete de compromisso padrão"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Unidades de lembrete padrão"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Valor de lembrete padrão"
 
-#: ../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 "Diretório para salvar os arquivos de áudio do alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Gradiente do evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Transparência do evento"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URLs do servidor de disponibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Modelo de URL de disponibilidade"
 
-#: ../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 "Gradiente dos eventos na exibição de calendário."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Ocultar tarefas concluídas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Unidades para ocultar tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Valor para ocultar tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Posição do painel horizontal"
 
-#: ../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 "Hora em que o dia de trabalho termina, em formato de 24 horas, 0 a 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 "Hora em que o dia de trabalho começa, em formato de 24 horas, 0 a 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 "Intervalos mostrados nas exibições de dia e semana útil, em minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Hora do último alarme"
 
-#: ../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 "Nível além de que a mensagem dever ser registrada."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr "Lista dos fuso horários usados recentemente na Visão de Dia."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs de servidores para a publicação de disponibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Linha Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da linha Marcus Bains - exibição de dia"
 
-#: ../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 "Cor da linha Marcus Bains - barra de tempo"
 
-#: ../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 ""
+"Número máximo de fusos horários a serem lembrados na lista \"day_second_zones"
+"\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Número máximo de fusos horários usados recentemente a serem lembrados."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto em que termina o dia de trabalho, 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto em que começa o dia de trabalho, 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Posição do painel horizontal na exibição de mês"
 
-#: ../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 "Posição do painel vertical na exibição de mês"
 
-#: ../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 "Número de unidades para determinar o lembrete padrão."
 
-#: ../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 "Número de unidades para determinar quando ocultar tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Cor para tarefas atrasadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5016,7 +5109,7 @@ msgstr ""
 "Posição do painel horizontal, entre a agenda de navegação de datas e a lista "
 "de tarefas quando não estiver em modo de exibição por mês, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5024,7 +5117,7 @@ msgstr ""
 "Posição do painel horizontal, entre a exibição e a agenda de navegação de "
 "datas e a lista de tarefas em modo de exibição de mês, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5032,7 +5125,7 @@ msgstr ""
 "Posição da divisão vertical, entre a lista de agenda e agenda de navegação "
 "de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5040,7 +5133,7 @@ msgstr ""
 "Posição do painel vertical, entre a lista de tarefas e o painel de "
 "visualização da tarefa, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5048,7 +5141,7 @@ msgstr ""
 "Posição do painel vertical, entre a exibição e a agenda de navegação de "
 "datas e a lista de tarefas no modo de exibição de mês, em pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5057,69 +5150,85 @@ msgstr ""
 "datas e a lista de tarefas quando não estiver em modo de exibição de mês, em "
 "pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que podem ser executados como parte de alarmes."
 
-#: ../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 "Fusos horários secundários recentemente usados na Visão de Dia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Salvar diretório para o áudio do alarme"
 
-#: ../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 "Mostrar o campo RSVP no editor de eventos, tarefas e encontros"
 
-#: ../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 "Mostrar o campo papel no editor de eventos, tarefas e encontros"
 
-#: ../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 "Mostrar hora de término de compromissos nas exibições de semana e mês"
 
-#: ../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 "Mostrar campo categorias no editor de eventos, tarefas e encontros"
 
-#: ../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 "Mostrar alarmes na área de notificação"
 
-#: ../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 "Mostrar campo status no editor de eventos, tarefas e encontros"
 
-#: ../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 "Mostrar o painel de \"Visualização\""
 
-#: ../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 "Mostrar o painel de \"Visualização\"."
 
-#: ../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 "Mostrar o campo fuso horário no editor de eventos e encontros"
 
-#: ../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 "Mostrar campo tipo no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Mostrar o números da semana nas visões de Dia e de Semana Útil"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar os números da semana no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Mostra o fuso horário secundário na Visão de Dia. Seu valor é similar ao "
+"usado na chave \"timezone\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Cor para tarefas com prazo para hoje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Posição do painel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5129,7 +5238,7 @@ msgstr ""
 "substituído pela parte referente ao usuário do endereço de e-mail e %d é "
 "substituído pelo domínio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5138,20 +5247,32 @@ msgstr ""
 "fuso horário não traduzido do banco de dados Olsen de fusos como, por "
 "exemplo, \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "O fuso horário secundário para a Visão de Dia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Isso admite três valores possíveis: \"0\" para erros, \"1\" para avisos. \"2"
+"\" para mensagens de depuração."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Frações de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "A última vez que o alarme disparou, em time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5159,42 +5280,44 @@ msgstr ""
 "Transparência dos eventos na exibição de agenda, um valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "Formato de hora em vinte e quatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unidades para um lembrete padrão, \"minutos\", \"horas\" ou \"dias\"."
+msgstr ""
+"Unidades para um lembrete padrão, \"minutes\" (minutos), \"hours\" (horas) "
+"ou \"days\" (dias)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Unidades para determinar quando ocultar as tarefas, \"minutos\", \"horas\" "
-"ou \"dias\"."
+"Unidades para determinar quando ocultar as tarefas, \"minutes\" (minutos), "
+"\"hours\" (horas) ou \"days\" (dias)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Semana começa na"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dia em que a semana começa, de Domingo (0) a Sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Usar a área de notificação para exibir alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Pedir confirmação ao excluir compromissos e tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Pedir confirmação ao excluir compromissos e tarefas permanentemente."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5202,83 +5325,88 @@ msgstr ""
 "Comprimir os finais de semana na exibição de mês, colocando Sábado e Domingo "
 "no espaço de um dia."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Exibir a hora de término de compromissos nas exibições de semana e mês."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Desenhar a linha Marcus Bains (linha que marca o tempo atual) na agenda."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Ocultar tarefas concluídas na exibição de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Definir um lembrete padrão para compromissos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Mostrar o campo categorias no editor de eventos e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Mostrar o campo papel no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo status no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Mostrar as horas no formato 24h em vez de usar AM ou PM."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo fuso horário no editor de eventos e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Mostrar o campo tipo no editor de eventos, tarefas e encontros"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr ""
+"Se deve mostrar ou não o número da semana nas Visões de Dia de Semana Útil."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Mostrar o número da semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Usar horário de verão ao exibir os eventos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Dias úteis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Hora em que termina o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minuto em que termina o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Hora em que começa o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minuto em que começa o dia de trabalho"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "horário de verão"
 
@@ -5302,11 +5430,6 @@ msgstr "Comentário contém"
 msgid "Location contains"
 msgstr "Local contém"
 
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "Não combinadas"
-
 #: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos 7 dias"
@@ -5335,13 +5458,13 @@ msgstr "Compromissos ativos"
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos próximos 7 dias"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5351,117 +5474,137 @@ msgstr ""
 "quantidade selecionada. Se você continuar, você não será capaz de recuperar "
 "estes eventos."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Excluir permanentemente eventos com tempo superior a"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-contacts-source.c:368
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dias"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the 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/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversários e bodas"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Clima"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Nova agenda"
 
-#: ../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:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "Tornar _disponível para uso desconectado"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "_Não tornar disponível para uso desconectado"
+
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Falha ao atualizar agendas."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Não é possível abrir a agenda \"%s\" para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não há agenda disponível para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Seletor de fonte de agenda"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Cria um novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunião"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Cria um novo pedido de reunião"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Compromisso de _dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Cria um novo compromisso de dia inteiro"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Nova agenda"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Age_nda"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Cria uma nova agenda"
 
@@ -5481,217 +5624,114 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: ../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 "Qualquer campo"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
-#: ../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 "Participante"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Comercial"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Categoria"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Classificação"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Competição"
-
-#: ../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:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Descrição"
 
-#: ../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 "A descrição contém"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Não existe"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Existe"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Favoritos"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Doações"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Metas e objetivos"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Feriado"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Cartões comemorativos"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Contatos preferidos"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Pensamentos"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Internacional"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Personalizador de teclas"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Próximos 7 dias"
-
-#: ../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 "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Ligações para telefone"
-
-#: ../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:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Particular"
 
-#: ../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:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
-#: ../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 "Recorrência"
 
-#: ../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:86 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Estratégias"
-
-#: ../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 "Resumo"
 
-#: ../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 "O resumo contém"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Fornecedores"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Tempo e gastos"
-
-#: ../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 "Esperando"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "contém"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "não contém"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "é"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "não é"
 
@@ -5707,7 +5747,7 @@ msgstr "Método sem suporte ao abrir a agenda"
 msgid "Permission denied to open the calendar"
 msgstr "Permissão negada para abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -5831,25 +5871,52 @@ msgid "A_dd"
 msgstr "A_dicionar"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir exibição automática do anexo"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Nenhum"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Agendas que devem ter alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(Mostrado na Visão de Dia)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5863,59 +5930,59 @@ msgstr ""
 "10 minutos\n"
 "05 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>"
 msgstr ""
 "<i>%u e %d serão trocados pelo usuário e domínio do endereço de 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\">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 padrão de disponibilidade</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\">Geral</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 tarefas</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\">Tempo</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 de trabalho</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 ao horário de _verão"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "O _dia termina às:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Exibição"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5925,13 +5992,13 @@ msgstr ""
 "Horas\n"
 "Dias"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5949,247 +6016,263 @@ msgstr ""
 "Sábado\n"
 "Domingo"
 
-#: ../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 "Escolha uma cor"
 
 #. 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/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 "Sábado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "Fuso se_cundário:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Selecione as agendas para notificação por alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "Mostrar um _lembrete"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "Mostrar _um lembrete"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar _números da semana no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Mostrar o número da semana nas Visões de Dia e de Semana Útil"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "T_arefas com prazo para hoje:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "F_uso horário:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Formato de hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "A sema_na começa na:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Dias úteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ação ao excluir itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na exibição de mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_O dia começa às:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluídas após"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "Mostrar _hora de término de compromissos nas exibições de semana e mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "_Frações de tempo:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Ter"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr "antes de cada aniversário"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_iar localmente o conteúdo da agenda para operações desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente o conteúdo da lista de tarefas para operações "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_iar conteúdo da lista de memorandos localmente para operações "
 "desconectadas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Propriedades da agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Nova agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Propriedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Propriedades da lista de memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Nova Lista de memorandos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Este evento foi excluído."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi excluída."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Este memorando foi excluído."
 
-#: ../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  Você fez alterações. Esquecer estas alterações e fechar o editor?"
 
-#: ../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  Você não fez alterações, fechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Este memorando foi alterado."
 
-#: ../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  Você fez alterações. Esquecer estas alterações e atualizar o editor?"
 
-#: ../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  Você não fez alterações, atualizar o editor?"
@@ -6199,294 +6282,299 @@ msgstr "%s  Você não fez alterações, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validação: %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:2365
 msgid " to "
 msgstr " para "
 
-#: ../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:2369
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: ../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:2371
 msgid "Completed "
 msgstr "Concluída "
 
-#: ../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:2376
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../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:2378
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:241
-#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
-#: ../composer/e-msg-composer.c:1985
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
-#: ../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 "Cancelar _arraste"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:846
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:941
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Memorandos - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr "Manter o item original?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Clicar aqui para fechar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar texto selecionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Recortar texto selecionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Clicar aqui para ver a ajuda disponível"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Colar texto da área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Clicar aqui para salvar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Selecionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "C_lassificação"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1364
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1381
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1383
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Clicar aqui para anexar um arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1391
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1393
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Alterna a exibição do campo de categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1399
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "F_uso horário"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a exibição do campo de fuso horário"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Classificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Particular"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1424
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1434
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "Campo _papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a exibição do campo papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a exibição do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1450
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1452
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a exibição do campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a exibição do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1770
-#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1789
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1884
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1916
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1919
-#: ../calendar/gui/dialogs/comp-editor.c:2227
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2038
-#: ../calendar/gui/dialogs/event-page.c:1875
-#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2041
-#: ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Adicionar anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2250
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Pressione a tecla de espaço para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alterações feitas a este item poderão ser descartadas se houver uma "
 "atualização"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Não foi possível usar a versão atual!"
 
@@ -6507,51 +6595,51 @@ msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Excluir esse item nas caixas de correio de todos os outros destinatários?"
 
-#: ../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 "O evento não pôde ser excluído devido a um erro do 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 "A tarefa não pôde ser excluída devido a um erro do 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 "O memorando não pôde ser excluído devido a um erro do 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 "O item não pôde ser excluído devido a um erro do 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 "O evento não pôde ser excluído porque a permissão foi negada"
 
-#: ../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 "A tarefa não pôde ser excluída porque a permissão foi negada"
 
-#: ../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 "O memorando não pôde ser excluído porque a permissão foi negada"
 
-#: ../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 "O item não pôde ser excluído porque a permissão foi negada"
 
-#: ../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 "O evento não pôde ser excluído devido a um erro"
 
-#: ../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 "A tarefa não pôde ser excluída devido a um erro"
 
-#: ../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 "O memorando não pôde ser excluído devido a um erro"
 
-#: ../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 "O item não pôde ser excluído devido a um erro"
 
@@ -6568,186 +6656,168 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Informar representante"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Clicar aqui para ativar ou desativar alarmes para este evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "_Recorrência"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Tornar este evento recorrente"
 
-#: ../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:213
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opções de envio"
 
-#: ../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 "Insira opções avançadas de envio"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Evento de _dia inteiro"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna a exibição do campo evento de dia inteiro"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Exi_bir hora como ocupado"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Alterna a exibição do tempo como ocupado"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "Disponibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Pedir informação de disponibilidade para os representantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
 # Consistência com outras traduções "This even has..."
-#: ../calendar/gui/dialogs/event-page.c:735
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2725
 msgid "This event has alarms"
 msgstr "Este evento tem alarmes."
 
-#: ../calendar/gui/dialogs/event-page.c:798
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:844
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "_Representantes"
 
-#: ../calendar/gui/dialogs/event-page.c:846
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Evento sem data de término"
 
-#: ../calendar/gui/dialogs/event-page.c:1202
-#: ../calendar/gui/dialogs/memo-page.c:640
-#: ../calendar/gui/dialogs/task-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1212
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1235
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1405
-#: ../calendar/gui/dialogs/memo-page.c:681
-#: ../calendar/gui/dialogs/task-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionado não possui mais uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1411
-#: ../calendar/gui/dialogs/memo-page.c:687
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1436
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2594
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2638
-#: ../calendar/gui/dialogs/memo-page.c:890
-#: ../calendar/gui/dialogs/task-page.c:1797
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Você esta atuando em nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2918
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia para o compromisso"
 msgstr[1] "%d dias para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora para o compromisso"
 msgstr[1] "%d horas para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto para o compromisso"
 msgstr[1] "%d minutos para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Personalizar"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2948
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2088
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1513
-#: ../widgets/misc/e-dateedit.c:1727
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Nenhum"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dia para o compromisso"
@@ -6823,19 +6893,19 @@ msgstr "Co_ntatos..."
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/gui/dialogs/memo-page.c:851
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Não é possível abrir memorandos em \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Para"
 
@@ -6849,47 +6919,47 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:364
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../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 ""
 "Você está modificando um evento recorrente. O que você deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Você está delegando um evento recorrente. O que você deseja delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Você está modificando uma tarefa recorrente. O que você deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Você está modificando um evento recorrente. O que você deseja modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Apenas esta instância"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Esta instância e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Esta instância e as próximas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
@@ -6901,9 +6971,13 @@ msgstr "Este compromisso possui recorrências que o Evolution não pode editar."
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrência é inválida"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr "O período final da recorrência acontece antes do início do evento"
+
 #. 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 "no"
 
@@ -6911,7 +6985,7 @@ msgstr "no"
 #. * (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 "primeiro"
 
@@ -6920,7 +6994,7 @@ msgstr "primeiro"
 #. * (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"
 
@@ -6928,7 +7002,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 "terceiro"
 
@@ -6936,7 +7010,7 @@ msgstr "terceiro"
 #. * (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 "quarto"
 
@@ -6944,13 +7018,13 @@ msgstr "quarto"
 #. * (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 "Outra data"
 
@@ -6958,7 +7032,7 @@ msgstr "Outra 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:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1º ao 10º"
 
@@ -6966,7 +7040,7 @@ msgstr "1º ao 10º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11º ao 20º"
 
@@ -6974,45 +7048,45 @@ msgstr "11º ao 20º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1061
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21º ao 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 "dia"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Adicionar exceção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "não foi possível selecionar para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Modificar exceção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Não foi possível obter seleção para exclusão."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -7063,6 +7137,10 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "Enviar meus alarmes com este evento"
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -7083,55 +7161,55 @@ msgstr "<span weight=\"bold\">Status</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:2561 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Concluída"
 
 #: ../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 "Alta"
 
 #: ../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:2558
 msgid "In Progress"
 msgstr "Em progresso"
 
 #: ../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 "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c: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:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Não iniciada"
 
@@ -7144,7 +7222,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../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 "Indefinida"
 
@@ -7170,28 +7248,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "Clique para alterar ou ver os detalhes de status da tarefa"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Opções de _envio"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalhes da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:372
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:785
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1754
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em \"%s\"."
@@ -7288,56 +7366,56 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: ../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 "Clique para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Sem título"
 
-#: ../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 de início:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Página da Web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Data de conclusão:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Prioridade:"
 
@@ -7351,13 +7429,13 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #: ../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 "Livre"
 
 #: ../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 "Ocupado"
 
@@ -7371,67 +7449,67 @@ 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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c: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
+#: ../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:2113
+#: ../plugins/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Atribuído"
 
-#: ../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 "Salvar como..."
 
-#: ../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 "Selecione a pasta para salvar os anexos selecionados..."
 
-#: ../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 "imagem_sem_titulo.%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:1589
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
-#: ../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 "Usar como Imagem de _Fundo"
 
@@ -7439,7 +7517,7 @@ msgstr "Usar como Imagem de _Fundo"
 msgid "_Save Selected"
 msgstr "_Salvar selecionado"
 
-#: ../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 "Abrir com %s..."
@@ -7450,7 +7528,7 @@ msgstr "* Sem resumo *"
 
 #. 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:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -7458,7 +7536,7 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2218
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
@@ -7471,125 +7549,125 @@ msgstr "Início: "
 msgid "Due: "
 msgstr "Prazo: "
 
-#: ../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:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../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:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../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:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1570
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "Abrir página _Web"
 
-#: ../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:1590
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1580
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
 #: ../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 "Recor_tar"
 
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../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 "C_olar"
 
-#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Encaminhar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluída"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar Tarefas Selecionadas como Concluídas"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como Incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcas tarefas selecionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1833
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -7612,7 +7690,7 @@ msgid "Due date"
 msgstr "Prazo de conclusão"
 
 #: ../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 "Prioridade"
@@ -7621,108 +7699,153 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de início"
 
-#: ../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:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Movendo os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1341
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Copiando os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1650
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Nova _reunião"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Visão atual"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Selecionar _hoje"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Selecionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "I_mprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para a agenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../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:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta ocorrência móvel"
 
-#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir todas as ocorrências"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Aceito"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Recusado"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Preliminar"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Representado"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "Precisa de ação"
+
 #. 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:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7735,53 +7858,63 @@ 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 frações de minuto"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Mostrar o fuso horário secundário"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "Semana %d"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência complexa)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todo dia"
 msgstr[1] "A cada %d dias"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toda semana"
 msgstr[1] "A cada %d semanas"
 
-#: ../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 "
@@ -7789,83 +7922,83 @@ msgstr[0] "Toda semana em "
 msgstr[1] "A cada %d semanas em "
 
 #. 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 " e "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todo mês"
 msgstr[1] "a cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todo ano"
 msgstr[1] "A cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
 #. 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 ", terminando em "
 
 #. 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 "Começa"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Prazo"
 
-#: ../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 "Informação do iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "Erro do iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7873,28 +8006,12 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informação e então selecione uma ação a "
 "partir do menu abaixo."
 
-#: ../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:2101
-msgid "Accepted"
-msgstr "Aceito"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: ../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:2107
-msgid "Declined"
-msgstr "Recusado"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7902,268 +8019,274 @@ msgstr ""
 "A reunião foi cancelada, no entanto ela não pôde ser localizada nas suas "
 "agendas"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, no entanto ela não pôde ser localizada nas suas "
 "listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informações sobre a reunião."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Informações de reunião"
 
-#: ../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> solicita a presença de %s em uma reunião."
 
-#: ../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> solicita a sua presença em uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
 #. 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> deseja ser adicionado a uma reunião existente."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: ../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> deseja receber a informação de reunião mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Pedido de atualização de reunião"
 
-#: ../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> respondeu a um pedido de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Resposta à reunião"
 
-#: ../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> cancelou uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de reunião"
 
-#: ../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> enviou uma mensagem incompreensível."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Mensagem inválida de reunião"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Informações de tarefa"
 
-#: ../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> solicita que %s execute uma tarefa."
 
-#: ../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> solicita que você execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. 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> deseja ser adicionado a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: ../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> deseja receber a informação de tarefa mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: ../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> respondeu a uma atribuição de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Resposta à tarefa"
 
-#: ../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> cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Cancelamento de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Mensagem inválida de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informações de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Informação de disponibilidade"
 
-#: ../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> está solicitando sua informação de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Pedido de disponibilidade"
 
-#: ../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> respondeu a um pedido de disponibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Resposta de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem inválida de disponibilidade"
 
-#: ../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 "A mensagem não aparenta estar formada corretamente"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos sem suporte."
 
-#: ../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 "O anexo não contém uma mensagem de agenda válida"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de agenda visualizáveis"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Atualização concluída\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 "Objeto é inválido e não pode ser atualizado\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 ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Não foi possível atualizar o status do participante por causa de um status "
 "inválido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Status do participante atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1301
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Não foi possível atualizar o status do participante porque o item não existe "
 "mais"
 
-#: ../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 "Item enviado!\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 "O item não pôde ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: ../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 "Atualizar"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de disponibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Atualizar status do respondente"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -8191,112 +8314,93 @@ msgstr "Carregando agenda..."
 msgid "Server Message:"
 msgstr "Mensagem do servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Participantes necessários"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../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 "Indivíduo"
 
-#: ../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 "Grupo"
 
-#: ../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 "Recurso"
 
-#: ../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 "Sala"
 
-#: ../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 "Moderador"
 
-#: ../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 "Participante necessário"
 
-#: ../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 "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c: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 "Não participante"
 
-#: ../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 "Necessita de ação"
 
-#: ../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 "Preliminar"
-
-#: ../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:2110
-msgid "Delegated"
-msgstr "Representado"
-
 #. 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 "Participante                      "
 
-#. 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 "Em andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2120
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -8305,7 +8409,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:2151
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8315,67 +8419,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Fora do escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Sem informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Mostrar apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Mostrar com _menos ampliação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Atualizar disponibilidade"
 
-#: ../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_seleção"
 
-#: ../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 as _pessoas e 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 as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Hora de início:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
@@ -8403,16 +8507,15 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Excluir memorandos selecionadas"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Clique para adicionar um memorando"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8421,16 +8524,16 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Carregando memorandos"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo memorandos em %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
@@ -8438,63 +8541,63 @@ msgstr "Excluindo objetos selecionados..."
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Selecionar um fuso horário"
 
 #. 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:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "_Visão personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Salvar visão personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Definir visões..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Carregando memorandos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
@@ -8554,144 +8657,199 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Selecionar hoje"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "É necessário configurar um organizador."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Informação do memorando"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Informação de disponibilidade"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Aceito"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Aceito preliminarmente"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Recusado"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Representado"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de disponibilidade (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "Informação do iCalendar"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memorando"
 msgstr[1] "%d memorandos"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selecionada"
 msgstr[1] ", %d selecionadas"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Falha ao atualizar memorandos."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Não é possível abrir a lista de memorandos \"%s\" para criar eventos e "
 "reuniões"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Não existe agenda disponível para a criação de memorandos"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Seletor de fonte de memorando"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Novo memorando"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_orando"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Cria um novo memorando"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Novo memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Cria um novo memorando compartilhado"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de memorandos"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Cria uma nova lista de memorandos"
 
-#: ../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 "Imprimir memorandos"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Próximos 7 dias"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8742,274 +8900,274 @@ msgstr "Não é possível migrar tarefas \"%s\""
 msgid "Notes"
 msgstr "Notas"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1º de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4 de"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9 de"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14 de"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19 de"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20 de"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21 de"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22 de"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23 de"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24 de"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25 de"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26 de"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27 de"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28 de"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29 de"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30 de"
 
-#: ../calendar/gui/print.c:523
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31 de"
 
 #. 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 "D"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "S"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "S"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "S"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentagem concluída: %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Falha ao atualizar tarefas."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Não é possível abrir a lista de tarefas \"%s\" para criar eventos e reuniões"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Seletor de fonte de tarefa"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Cria uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa _atribuída"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Cria uma nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de _tarefas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Cria uma nova lista de tarefas"
 
-#: ../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"
@@ -9022,11 +9180,11 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: ../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 "Não me pergunte novamente."
 
-#: ../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 "Imprimir tarefas"
 
@@ -9035,19 +9193,19 @@ msgstr "Imprimir tarefas"
 msgid "% Completed"
 msgstr "% concluído"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Em progresso"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "é maior que"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "é menor que"
 
@@ -9056,8 +9214,8 @@ msgid "Appointments and Meetings"
 msgstr "Compromissos e reuniões"
 
 #: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:616
-#: ../plugins/itip-formatter/itip-formatter.c:1635
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Abrindo agenda"
 
@@ -9069,23 +9227,23 @@ msgstr "Arquivos iCalendar (.ics)"
 msgid "Evolution iCalendar importer"
 msgstr "Importador iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:517
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Lembrete!"
 
-#: ../calendar/importers/icalendar-importer.c:569
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "Arquivos vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:570
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Importador vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:732
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: ../calendar/importers/icalendar-importer.c:769
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente da agenda do Evolution"
 
@@ -10638,214 +10796,218 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Não foi possível abrir o arquivo de salvamento automático"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível obter mensagem do editor"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Inserir anexo"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "Ane_xar"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Mensagem sem título"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: ../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 "_Fechar"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Fecha o arquivo atual"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Visualizar impressão"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Salvar _rascunho"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
+msgstr "Salvar como _rascunho"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Salvar como rascunho"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Inserir opções de envio"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Nova _mensagem"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Abrir nova janela de mensagem"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Codificação de caract_eres"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Segurança"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "Criptografar com PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Criptografar esta mensagem com PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "Assinar com PGP"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensagem"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Mudar a prioridade da mensagem para alta"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar recibo de leitura"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Receber notificação de entrega quando sua mensagem for lida"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "Criptografar com 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 ""
 "Criptografar esta mensagem usando o seu Certificado de Criptografia S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "Assinar 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 "Assinar esta mensagem com o seu certificado de assinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "Campo CCO"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a exibição do campo CCO"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "Campo _CC"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Exibe/oculta o campo CC"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Exibe/oculta o campo De"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "Campo _Publicar em"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Exibe/oculta o campo Publicar em"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Exibe/oculta o campo Responder a"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Campo a_ssunto"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Exibe/oculta o campo Assunto"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "Campo _Para"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Exibe/oculta o campo Para"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Salvar rascunho"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatários da mensagem"
 
-#: ../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 "Digite os endereços que receberão uma cópia da mensagem"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10853,35 +11015,35 @@ msgstr ""
 "Digite os endereços que receberão uma cópia da mensagem sem aparecer na "
 "lista de destinatários da mensagem"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Publicar em:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
@@ -10901,18 +11063,18 @@ msgstr "Escolha as pastas onde publicar a mensagem."
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Mostrar barra de _anexos"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Não foi possível assinar a mensagem a ser enviada: Não existe certificado de "
 "assinatura configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10920,23 +11082,23 @@ msgstr ""
 "Não foi possível criptografar a mensagem a ser enviada: Não existe "
 "certificado de criptografia configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../composer/e-msg-composer.c:1551
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar barra de _anexos"
 
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Redigir mensagem"
 
-#: ../composer/e-msg-composer.c:4050
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11035,7 +11197,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Opções de envio só estão disponíveis para contas do Novell GroupWise e do "
@@ -11144,7 +11306,7 @@ msgid "Evolution Query"
 msgstr "Consulta do 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 "Erro interno, foi pedido erro desconhecido \"%s\""
@@ -11157,8 +11319,65 @@ msgstr "Componente"
 msgid "Name of the component being logged"
 msgstr "Nome do componente logado"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
-#: ../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 "Logs de depuração"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Mostrar _erros na barra de status para"
+
+#. 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 "segundo(s)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Mensagens do log:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Nível do log"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Hora:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Mensagens"
+
+#: ../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 "Fecha esta janela"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Erro"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Erros"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Avisos e erros"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Depurar"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Mensagens de erro, aviso e depuração"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
@@ -11210,51 +11429,55 @@ msgstr "Sobrescrever arquivo?"
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
-#: ../e-util/e-util.c:96
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Não foi possível abrir o link."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Não foi possível exibir a ajuda do Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Trabalho"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Pessoal"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "A fa_zer"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "Mais _tarde"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_Nome:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Editar rótulo"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Adicionar rótulo"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "O rótulo não pode ser vazio."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11262,12 +11485,12 @@ msgstr ""
 "Já existe um rótulo com a mesma etiqueta no servidor. Por favor renomeie o "
 "seu rótulo."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Todos os demais erros mostrados apenas no terminal."
 
@@ -11401,19 +11624,19 @@ msgid "R_ule name:"
 msgstr "_Nome da regra:"
 
 #: ../filter/filter-rule.c:881
-msgid "Find items that meet the following criteria"
+msgid "Find items that meet the following conditions"
 msgstr "Localizar itens que atendam aos seguintes critérios"
 
 #: ../filter/filter-rule.c:915
-msgid "A_dd Filter Criteria"
-msgstr "_Adicionar critérios ao filtro"
+msgid "A_dd Condition"
+msgstr "A_dicionar critério"
 
 #: ../filter/filter-rule.c:921
-msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "Se todos os critérios forem atendidos"
 
 #: ../filter/filter-rule.c:921
-msgid "If any criteria are met"
+msgid "If any conditions are met"
 msgstr "Se algum critério for atendido"
 
 #: ../filter/filter-rule.c:923
@@ -11441,11 +11664,11 @@ msgid "I_nclude threads"
 msgstr "I_ncluir discussões"
 
 #: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Enviadas"
 
@@ -11545,7 +11768,7 @@ msgstr "no futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "segundos"
 
@@ -11557,10 +11780,11 @@ msgstr "o instante atual"
 msgid "the time you specify"
 msgstr "um instante especificado por você"
 
-#: ../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:655
+#: ../plugins/google-account-setup/google-contacts-source.c:369
 msgid "weeks"
 msgstr "semanas"
 
@@ -11568,15 +11792,15 @@ msgstr "semanas"
 msgid "years"
 msgstr "anos"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -11633,10 +11857,10 @@ msgstr "Controle de preferências do Correio do Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Controle de configuração de rede do Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:762
+#: ../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 "Correio"
@@ -11647,7 +11871,7 @@ msgid "Mail Accounts"
 msgstr "Contas de correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
@@ -11656,6 +11880,7 @@ msgid "Network Preferences"
 msgstr "Preferências de rede"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "_Correio"
 
@@ -11677,13 +11902,13 @@ msgstr ""
 "licença para %s exibido\n"
 "abaixo e marque a caixa para aceitá-lo\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 "Selecionar pasta"
 
 #: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Gerado automaticamente"
 
@@ -11691,11 +11916,11 @@ msgstr "Gerado automaticamente"
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../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 "Identidade"
 
-#: ../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 "Recebendo e-mail"
 
@@ -11707,7 +11932,7 @@ msgstr "Verificar _novas mensagens a cada"
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Enviando e-mail"
 
@@ -11716,8 +11941,8 @@ msgid "Defaults"
 msgstr "Padrões"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Segurança"
 
@@ -11734,7 +11959,7 @@ msgstr "Verificando novas mensagens"
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../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 "Assistente de contas do Evolution"
 
@@ -11752,19 +11977,19 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Adicionar script de assinatura"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
@@ -11772,14 +11997,27 @@ msgstr "Assinatura(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"Nenhum e-mail de destino foi fornecido, o encaminhamento da mensagem foi "
+"cancelado."
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+"Não foi encontrada nenhuma conta válida para uso, o encaminhamento da "
+"mensagem foi cancelado."
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11787,7 +12025,7 @@ msgstr ""
 "Em ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} às ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-------- Mensagem original --------"
 
@@ -11795,64 +12033,48 @@ msgstr "-------- Mensagem original --------"
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
-#.
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
-#. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
-#. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
-#. *
-#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
-#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Ajustar pontuação"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Atribuir cor"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Atribuir pontuação"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Bip"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Concluída em"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Data de recepção"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
@@ -11860,210 +12082,213 @@ msgstr "Data de envio"
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Excluída"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "não termina com"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "não existe"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "não retorna"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "não se parece como"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "não começa com"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Rascunho"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "termina com"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Expressão"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Lembrete"
 
-#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "é após"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "é antes"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "está Marcada"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:38
 msgid "is not set"
 msgstr "não está definido"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:39
 msgid "is set"
 msgstr "está definido"
 
-#: ../mail/em-filter-i18n.h:56 ../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 "Spam"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Teste de spam"
 
-#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Rótulo"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Lista de discussão"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Coincidir com tudo"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Cabeçalho da mensagem"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Mensagem é spam"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Mensagem não é spam"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Mover para a pasta"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Enviar (pipe) para um programa"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Reproduzir som"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Lida"
 
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Coincidir expr. regular"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Executar um programa"
 
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Pontuação"
 
-#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Rementente ou destinatários"
+
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Definir rótulo"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Definir status"
 
-#: ../mail/em-filter-i18n.h:81
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: ../mail/em-filter-i18n.h:82
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "se parece como"
 
-#: ../mail/em-filter-i18n.h:83
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: ../mail/em-filter-i18n.h:84
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: ../mail/em-filter-i18n.h:85
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "começa com"
 
-#: ../mail/em-filter-i18n.h:87
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../mail/em-filter-i18n.h:89
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Reverter status"
 
@@ -12150,15 +12375,15 @@ msgid "Quota usage"
 msgstr "Uso da cota"
 
 #. 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
+#: ../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 "Entrada"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriedades da pasta"
@@ -12177,7 +12402,7 @@ msgstr "_Nome da pasta:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Pastas de pesquisa"
 
@@ -12186,19 +12411,24 @@ msgstr "Pastas de pesquisa"
 msgid "UNMATCHED"
 msgstr "SEM OCORRÊNCIA"
 
-#: ../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 "Rascunhos"
 
-#: ../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 "Modelos"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Saída"
 
-#: ../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 "Enviadas"
 
-#: ../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 "Carregando..."
 
@@ -12237,12 +12467,12 @@ msgstr "Movendo pasta %s"
 msgid "Copying folder %s"
 msgstr "Copiando pasta %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 "Movendo mensagens para pasta %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 "Copiando mensagens para pasta %s"
@@ -12264,47 +12494,48 @@ msgstr "_Mover para pasta"
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Abrir em uma _nova janela"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Renomear..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Atuali_zar"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Limpar cai_xa de saída"
 
-#: ../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 "Es_vaziar lixeira"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "Pasta de pesquisa de itens não lidos"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando \"%s\" para \"%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
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -12326,205 +12557,205 @@ msgstr "Criar pasta"
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../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 "Exclusão de E-mail falhou"
 
-#: ../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 "Você não possui permissão para excluir esse e-mail."
 
-#: ../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 "Responder ao _remetente"
 
-#: ../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 "E_ncaminhar"
 
 #. 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 "_Editar como nova mensagem..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Des_fazer Exclusão"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Marcar como sem _importância"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _não spam"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar como _lembrete..."
 
 # Qualquer tecla de acesso vai colidir com outro item de menu
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_Rótulo"
 
 #. 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:480
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Nenhum"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_novo Rótulo"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Marcar Como Concl_uída"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
 #. 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 "Pasta de pesquisa baseada no _assunto"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Pasta de pesquisa baseada no _remetente"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Pasta de Pesquisa baseada no _destinatários"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Pasta de pesquisa baseada na _lista de discussão"
 
 #. 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 "Filtro baseado no ass_unto"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Filtro baseado no r_emetente"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Filtro baseado nos des_tinatários"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Filtro baseado na l_ista de discussão"
 
 #. 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
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:510
+#: ../plugins/google-account-setup/google-source.c:708
 msgid "Default"
 msgstr "Padrão"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Não foi possível obter a mensagem"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Recuperando mensagem..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "Ch_amar..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Criar pasta de _pesquisa"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Deste endereço"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_Para este Endereço"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Clique para chamar %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Clique para ocultar/mostrar endereços"
 
 #. 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 "Ocorrências: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Locali_zar:"
 
 #. 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 "Anterio_r"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "Próxi_ma"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "C_oincidentes"
 
-#: ../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 "Não assinada"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12532,11 +12763,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: ../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 "Assinatura válida"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12544,11 +12775,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: ../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 "Assinatura inválida"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12556,11 +12787,11 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito."
 
-#: ../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 "Assinatura válida, mas não é possível verificar o remetente"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12568,11 +12799,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: ../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 "A assinatura existe, mas precisa de uma chave pública"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12580,11 +12811,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura, mas não há chave pública "
 "correspondente."
 
-#: ../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 "Não criptografada"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12592,11 +12823,11 @@ msgstr ""
 "Esta mensagem não está criptografada. O seu conteúdo pode ser visto em "
 "trânsito através da 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 "Criptografada, fraca"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12606,11 +12837,11 @@ msgstr ""
 "fraco. Seria difícil, mas não impossível, que um estranho conseguisse ver o "
 "conteúdo desta mensagem em uma quantidade de tempo razoável."
 
-#: ../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 "Criptografada"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12618,11 +12849,11 @@ msgstr ""
 "Esta mensagem está criptografada. Seria difícil que um estranho conseguisse "
 "ver o conteúdo desta mensagem."
 
-#: ../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 "Criptografada, forte"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12632,87 +12863,87 @@ msgstr ""
 "Seria muito difícil para um estranho conseguir ver o conteúdo desta mensagem "
 "em uma quantidade de tempo razoável."
 
-#: ../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 "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Concluída em %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "A_justar para Largura"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Mostrar o tamanho _original"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Salvar anexo como"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Selecionar a pasta para salvar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Salvar selecionado..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ane_xo"
 msgstr[1] "%d ane_xos"
 
-#: ../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 "_Salvar"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Salvar _tudo"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Sem anexo"
 
-#: ../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 "Ver não _formatadas"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Ocultar não _formatadas"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "A_brir com"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12802,14 +13033,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "De"
 
@@ -12819,8 +13050,8 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:327
-#: ../widgets/misc/e-dateedit.c:349
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Data"
 
@@ -12870,11 +13101,11 @@ msgstr "Erro ao verificar assinatura"
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Não foi possível analisar a mensagem PGP"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Não foi possível analisar a mensagem PGP: Erro desconhecido"
 
@@ -12997,24 +13228,24 @@ msgstr "Não foi possível copiar dados manter-no-servidor POP3 \"%s\": %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falha ao criar repositório local de correio \"%s\": %s"
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 "O formato de resumo das pastas da caixa de correio do Evolution foi movido "
-"para sqlite desde o Evolution 2.24.\n"
+"para SQLite desde o Evolution 2.24.\n"
 "\n"
 "Por favor seja paciente enquanto o Evolution migra suas pastas..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Não foi possível criar pastas locais de correio em \"%s\": %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13022,65 +13253,65 @@ msgstr ""
 "Não foi possível ler configurações de uma instalação anterior do Evolution, "
 "\"evolution/config.xmldb\" não existe ou está corrompido."
 
-#: ../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 "_Responder ao remetente"
 
-#: ../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 "Responder à _lista"
 
 #. 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 "_Adicionar ao catálogo de endereços"
 
-#: ../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 "Este repositório não suporta inscrições ou elas estão desabilitadas."
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Pasta"
 
 #. 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 "Por favor, selecione um servidor."
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
+#: ../mail/em-utils.c:121
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Não mostrar esta mensagem novamente."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtros de mensagens"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Salvar mensagem..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Adicionar endereço"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -13106,17 +13337,13 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da janela \"Enviar e receber correio\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Permite que o Evolution exiba uma parte do texto de tamanho limitado"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Sempre solicitar um recibo de leitura"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Tempo em segundos que o erro deve ser mostrado na barra de status."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Reconhecimento automático de carinhas"
@@ -13179,7 +13406,7 @@ msgid ""
 "in the format \"headername=value\"."
 msgstr ""
 "Cabeçalhos personalizados para uso ao verificar spam. Os elementos da lista "
-"são expressões no formato \"headername=valor\"."
+"são expressões no formato \"nome_do_cabeçalho=valor\"."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13286,8 +13513,8 @@ msgid "Directory for saving mail component files."
 msgstr "Diretório para salvar arquivos de e-mail."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Desabilita ou habilita omissão de nomes de pasta na árvore de pastas"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Desabilita ou habilita abreviação dos nomes das pastas"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13358,19 +13585,34 @@ msgstr "Habilitar para renderizar parte de texto com limitação de tamanho."
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/Desabilitar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Codificar nomes de arquivos da mesma forma que o Outlook/GMail"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+"Codifica os nomes dos arquivos - nos cabeçalhos dos e-mails - da mesma forma "
+"que o Outlook ou GMail, permitindo-os assim entender os nomes localizados "
+"enviados pelo Evolution, simplesmente porque eles não seguem a RFC 2231, e "
+"sim a incorreta RFC 2047."
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a visualização por pasta e remove a seleção"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13378,26 +13620,26 @@ msgstr ""
 "Se um usuário tentar abrir 10 ou mais mensagens ao mesmo tempo, perguntar ao "
 "usuário se ele realmente deseja fazê-lo."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
-"Se o painel \"Visualização\" estiver ligado, mostrar lado-a-lado ao invés de "
+"Se o painel \"Visualização\" estiver ativo, mostrar lado-a-lado ao invés de "
 "verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
 "Se não existir um visualizador embutido no Evolution para um certo tipo "
 "MIME, quaisquer tipos MIME que apareçam nesta lista e que mapeiam para um "
-"componente visualizador bonobo no banco de dados de tipos MIME do GNOME "
-"podem ser usados para exibir conteúdo."
+"componente visualizador Bonobo no banco de dados de tipos MIME do GNOME "
+"podem ser usados para exibir o conteúdo."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13405,7 +13647,7 @@ msgstr ""
 "Altura inicial da janela \"Enviar e receber correio\". O valor atualiza à "
 "medida que o usuário redimensiona a janela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13419,7 +13661,7 @@ msgstr ""
 "\"Enviar e receber correio\" não possa ser maximizada. Esta chave existe "
 "apenas como um detalhes de implementação."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13427,11 +13669,11 @@ msgstr ""
 "Largura inicial da janela \"Enviar e receber correio\". O valor atualiza à "
 "medida que o usuário redimensiona a janela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Desabilita/habilita o aviso enquanto marca mensagens múltiplas."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13439,7 +13681,7 @@ msgstr ""
 "Habilita/Desabilita o recurso onde lembretes repetem para perguntar se a "
 "sincronização desconectada é exigida após entrar no modo off-line."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13449,31 +13691,32 @@ msgstr ""
 "mensagens da pasta de pesquisa apaga-as permanentemente e nao simplesmente "
 "as remove do resultado da procura."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "A última vez que o spam foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "A última vez que a lixeira foi esvaziada"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Nível além de que a mensagem dever ser registrada."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Lista de rótulos e suas respectivas cores"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Lista de tipos MIME onde procurar os componentes de visualização Bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Lista de licenças aceitas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13482,17 +13725,17 @@ msgstr ""
 "contém strings com nomes de subdiretórios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeçalhos personalizados e se eles estão habilitados."
 
-#: ../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 dos códigos de idiomas de dicionários usados para verificação "
 "ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13501,133 +13744,127 @@ msgstr ""
 "contém strings contendo nome:cor, onde cor usa a codificação hexadecimal "
 "HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Lista de tipos MIME onde procurar os componentes de visualização bonobo"
-
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos para os quais a licença foi aceita."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "Carregar imagens em mensagens HTML usando HTTP"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
+msgstr "Carregar imagens de mensagens HTML usando HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Carregar imagens em mensagens HTML usando http(s). Os valores possíveis são: "
-"\"0\" Nunca carrega imagens da rede; \"1\" Carrega imagens nas mensagens dos "
-"contatos. \"2\" Sempre carrega imagens da rede."
+"Carrega imagens de mensagens HTML usando HTTP(S). Os valores possíveis são: "
+"\"0\" - Nunca carrega imagens da rede; \"1\" - Carrega imagens nos e-mails "
+"de algum contato seu. \"2\" - Sempre carrega imagens da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Registrar ações dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar ações dos filtros no arquivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Arquivo de registro onde registrar ações dos filtros"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Arquivo de registro onde registrar ações dos filtros."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como lida após o tempo limite especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como lida após o tempo limite especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citações na \"Visualização\" da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citações na \"Visualização\" da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Altura padrão da janela de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Largura padrão da janela de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Estilo de exibição de mensagem (\"normal\", \"todos os cabeçalhos\", \"fonte"
-"\")"
+"Estilo de exibição de mensagem (\"normal\", \"full headers\" (todos os "
+"cabeçalhos), \"source\" (fonte))"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Número mínimo de dias para esvaziar o spam ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo em dias para esvaziar a lixeira ao sair"
 
-#: ../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 "Tempo mínimo em dias para esvaziar o spam ao sair."
 
-#: ../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 "Tempo mínimo em dias para esvaziar a lixeira ao sair."
 
-#: ../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 "Número de endereços a serem exibidos nos campos PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Perguntar em caso de assunto vazio"
 
-#: ../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 ""
 "Perguntar ao usuário quando ele tenta excluir permanentemente uma pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Perguntar ao usuário quando ele tenta enviar uma mensagem com assunto vazio."
 
-#: ../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 ""
-"Perguntar para conferir se o usuário deseja ficar desconectado imediatamente"
+msgstr "Perguntar se o usuário deseja ficar desconectado imediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Perguntar ao excluir mensagens na pasta de pesquisa"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Perguntar quando o usuário exclui permanentemente"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Perguntar quando o usuário preenche apenas o CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Perguntar quando o usuário tentar abrir 10 ou mais mensagens de uma vez"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13635,138 +13872,136 @@ msgstr ""
 "Perguntar quando o usuário tenta enviar mensagem HTML para contatos que não "
 "as desejam."
 
-#: ../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 ""
 "Perguntar quando o usuário tenta enviar uma mensagem sem destinatários Para "
 "ou 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 "Perguntar quando o usuário tenta enviar HTML indesejado"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar enquanto marcar mensagens múltiplas"
 
-#: ../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 "Reconhecer carinhas no texto e substituí-las por imagens."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer links no texto e substituí-los."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Executar teste de spam nas recebidas."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Salvar diretório"
 
-#: ../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 "Pesquisar pela foto do remetente no catálogo de endereços local"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Enviar correio HTML por padrão"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Enviar correio HTML por padrão."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Sender email-address column in the message list"
 msgstr "Mostrar coluna do e-mail do remetente na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Intervalo da sincronização do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Mostrar animações"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Mostrar imagens animadas como animações."
 
-#: ../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 "Mostrar mensagens excluídas (riscadas) na lista de mensagens."
+msgstr "Mostrar mensagens excluídas (com um risco) na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensagens excluídas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Mostrar foto do remetente"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostra o e-mail do remetente em uma coluna separada na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show the photo of the sender in the message reading pane."
-msgstr ""
-"Mostra o e-mail do remetente na coluna de composição de mensagens na lista "
-"de mensagens."
+msgstr "Mostra a foto do remetente no painél de leitura da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Verificar ortografia durante a digitação"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Cor da verificação ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Idiomas da verificação ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Altura padrão do diálogo de inscrição"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Largura padrão do diálogo de inscrição"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Fonte de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Limite do tamanho da mensagem de texto"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "O plug-in padrão associado ao Spam"
 
-#: ../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 "A última vez que o spam foi esvaziada, em dias desde a época."
 
-#: ../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 "A última vez que a lixeira foi esvaziada, em dias desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "A fonte de terminal para exibição de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "A fonte de largura variável para exibição de correio."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13774,15 +14009,15 @@ msgstr ""
 "Isso admite três valores possíveis: \"0\" para erros, \"1\" para avisos. \"2"
 "\" para mensagens de depuração."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Isto decide o tamanho máximo da parte do texto que pode ser formatada sob o "
 "Evolution. O padrão é 4MB / 4096KB e é especificado em KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13792,7 +14027,7 @@ msgstr ""
 "habilitados. Se a lista de plug-ins padrão estiver desabilitado, então "
 "retorne para outros plug-ins disponíveis."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13800,7 +14035,7 @@ msgstr ""
 "Esta chave é lida apenas uma vez e restaurada para \"false\" depois de lida. "
 "Isto desmarca o e-mail na lista e remove a visualização para aquela pasta."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13812,7 +14047,7 @@ msgstr ""
 "&lt;header enabled&gt; - defina \"enabled\" se o cabeçalho deve ser exibido "
 "junto com a mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13822,11 +14057,11 @@ msgstr ""
 "excluídos do filtro de spam. Essa opção está relacionada à chave "
 "lookup_addressbook."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opção ajuda a melhorar a velocidade de obtenção."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13834,7 +14069,7 @@ msgstr ""
 "Esta opção define o número de endereços mostrados na visualização em lista "
 "de mensagens, além desse número será mostrado \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13842,7 +14077,7 @@ msgstr ""
 "Este ajuste especifica se as discussões ficarão expandidas ou contraídas por "
 "padrão. Evolution requer reinicialização."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13852,116 +14087,116 @@ msgstr ""
 "mensagem em cada conversação ao invés da data da mensagem. O Evolution "
 "necessita ser reiniciado."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Encadear a lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Encadear a lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Encadear a lista de mensagens baseado no assunto"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Tempo limite para marcar a mensagem como lida"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Tempo limite para marcar a mensagem como lida."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "String UID da conta padrão."
 
-#: ../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 ""
 "Cor de sublinhado para palavras incorretas ao usar o corretor embutido."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e cliente do SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usa o daemon e cliente do SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Usa fontes personalizadas para exibir as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Usar apenas testes de SPAM locais."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Usar disposição lado-a-lado ou ampla"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Fonte de largura variável"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Item de menu Ver/CCO está selecionado"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Item de menu Ver/CCO está selecionado."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Item de menu Ver/Cc está selecionado"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Item de menu Ver/Cc está selecionado."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Item de menu Ver/De está selecionado"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Item de menu Ver/De está selecionado."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Item de menu Ver/Publicar Em está selecionado"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Item de menu Ver/Publicar Em está selecionado."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Item de menu Ver/Responder A está selecionado"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Item de menu Ver/Responder A está selecionado."
 
-#: ../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 "Envia um pedido de recibo de leitura a cada mensagem por padrão."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Desabilita o recurso de omissão de nomes de pasta na árvore de pastas."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "Se deve ou não abreviar o nome das pastas na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13969,15 +14204,15 @@ msgstr ""
 "Se o encadeamento por assunto deve ser revertido quando as mensagens não "
 "contém cabeçalhos In-Reply-To ou References."
 
-#: ../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 "Ordenar as conversações com base na sua última mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Largura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Largura do painel de lista de mensagens."
 
@@ -13994,10 +14229,12 @@ msgid "Import mail from Elm."
 msgstr "Importar caixa de correio do Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "Pasta destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "Selecionar pasta para onde importar"
 
@@ -14013,7 +14250,10 @@ msgstr "Importador de pastas no formato Berkeley Mailbox"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando \"%s\""
@@ -14035,178 +14275,116 @@ msgstr "Importador Pine do Evolution"
 msgid "Import mail from Pine."
 msgstr "Importar caixa de correio do Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Correio para %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 "Correio de %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto é %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discussão %s"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: ../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 "Modelos"
-
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selecionada, "
 msgstr[1] "%d selecionadas, "
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d excluída"
 msgstr[1] "%d excluídas"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spams"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d não enviada"
 msgstr[1] "%d não enviadas"
 
-#: ../mail/mail-component.c:569
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d não lida, "
 msgstr[1] "%d não lidas, "
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Redige uma nova mensagem de correio"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Nova pasta de correio"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Cria uma nova pasta de correio"
 
-#: ../mail/mail-component.c:1079
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao atualizar configurações ou pastas de correio."
 
-#: ../mail/mail-component.c:1595
-msgid "Error"
-msgstr "Erro"
-
-#: ../mail/mail-component.c:1595
-msgid "Errors"
-msgstr "Erros"
-
-#: ../mail/mail-component.c:1596
-msgid "Warnings and Errors"
-msgstr "Avisos e erros"
-
-#: ../mail/mail-component.c:1597
-msgid "Debug"
-msgstr "Depurar"
-
-#: ../mail/mail-component.c:1597
-msgid "Error, Warnings and Debug messages"
-msgstr "Mensagens de erro, aviso e depuração"
-
-#: ../mail/mail-component.c:1724
-msgid "Debug Logs"
-msgstr "Logs de depuração"
-
-#: ../mail/mail-component.c:1738
-msgid "Show _errors in the status bar for"
-msgstr "Mostrar _erros na barra de status para"
-
-#. 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 "segundo(s)."
-
-#: ../mail/mail-component.c:1760
-msgid "Log Messages:"
-msgstr "Mensagens do log:"
-
-#: ../mail/mail-component.c:1801
-msgid "Log Level"
-msgstr "Nível do log"
-
-#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:391
-msgid "Time"
-msgstr "Hora:"
-
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Mensagens"
-
-#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Fecha esta janela"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " V_erificar Tipos com Suporte "
@@ -14487,105 +14665,105 @@ msgid "Empty trash folders on e_xit"
 msgstr "_Esvaziar lixeiras ao sair"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
-msgstr "Habilitar Barra de E_spaço Mágica"
+msgid "Enable Magic S_pacebar"
+msgstr "Habilitar barra de e_spaço mágica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Habilitar pastas de pesquisa"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "Ce_rtificado de criptografia:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "Criptografar _mensagens enviadas (por padrão)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Font_e de largura fixa:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "Nome _completo:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "Mensagens HTML"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Embutido"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Embutido (estilo 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 "Rótulo"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Tabela de idiomas"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Tabela de cabeçalhos de correio"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "Nenhum _proxy para:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Nota: O sublinhado no nome do rótulo indica que ele é usado como "
 "identificador mnemônico no menu."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14593,25 +14771,25 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "A opção é ignorada se uma ocorrência para cabeçalhos de spam personalizados "
 "for localizada."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "Sen_ha:"
 
-#: ../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."
@@ -14619,7 +14797,7 @@ msgstr ""
 "Por favor, digite um nome descritivo para esta conta no espaço abaixo.\n"
 "Este nome será usado apenas com o propósito de exibição."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14628,7 +14806,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14639,124 +14817,124 @@ msgstr ""
 "menos que você queira estas informações incluídas em toda mensagem de "
 "correio enviada."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários CC_O"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "_Responder a:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "Máquina 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 ""
 "P_esquisar pela foto do remetente apenas em catálogos de endereços locais"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "S_elecionar..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "Enviar destinatário_s da mensagem:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "Fonte _padrão:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select Drafts Folder"
 msgstr "Selecionar pasta de rascunhos"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Select Sent Folder"
 msgstr "Selecionar pasta de enviadas"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Enviando correio"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Tipo do servidor: "
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "_Assinatura:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Tabelas de assinaturas"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Verificação ortográfica"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "Iniciar digi_tando embaixo ao responder"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "Ti_po: "
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14764,7 +14942,7 @@ msgstr ""
 "A lista de idiomas aqui reflete apenas os idiomas para os quais você tem um "
 "dicionário instalado."
 
-#: ../mail/mail-config.glade.h:151
+#: ../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"
@@ -14774,7 +14952,7 @@ msgstr ""
 "assinatura. O nome que você especificar será\n"
 "usado apenas com o propósito de exibição. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../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\""
@@ -14782,26 +14960,26 @@ msgstr ""
 "Digite o nome pelo qual você deseja chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Nom_e de usuário:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticação"
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:615
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
 msgid "User_name:"
 msgstr "_Nome do usuário:"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14811,124 +14989,124 @@ msgstr ""
 "\n"
 "Pressione \"Avançar\" para iniciar. "
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "_Sempre carregar imagens da Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL da configuração de proxy _automática:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "Plug-in pa_drão de spam"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "Conexão _direta à internet"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter assinatura sobre a mensagem original ao responder"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Carregar imagens nas mensagens a partir dos contatos"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "P_rocurar apenas em catálogos de endereços locais"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "Configuração de proxy _manual:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_Nunca carregar imagens da Internet"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Perguntar ao enviar e-mails em HTML para contatos que não os desejam"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "_Selecionar..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "Mostrar animaçõe_s"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Mo_strar a foto do remetente na visualização do e-mail"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Encurtar o_s cabeçalhos Para / Cc / CCO para "
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexão segura:"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "_Usar padrões do sistema"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "endereços"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "descrição"
 
@@ -14976,7 +15154,7 @@ msgstr "Local_izar:"
 msgid "Find in Message"
 msgstr "Localizar na mensagem"
 
-#: ../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 "Marcar como lembrete"
 
@@ -15028,7 +15206,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque aqui para acei_tar o acordo de licença"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Chamando %s"
@@ -15075,11 +15253,11 @@ msgstr "Enviando mensagem %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Cancelada."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Concluída."
 
@@ -15230,39 +15408,39 @@ msgstr "Enviar e receber correio"
 msgid "Cancel _All"
 msgstr "Cancelar _tudo"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: ../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 "Esperando..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Digite a frase secreta para %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Digite a frase secreta"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Digite a senha para %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
@@ -15307,21 +15485,21 @@ msgstr "Pasta inválida: \"%s\""
 msgid "Setting up Search Folder: %s"
 msgstr "Preparando pasta de pesquisa: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Atualizando pastas de pesquisa para \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Atualizando pastas de pesquisa para \"%s\""
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Editar pasta de pesquisa"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Nova pasta de pesquisa"
 
@@ -15953,79 +16131,79 @@ msgstr "_Excluir permanentemente"
 msgid "_Open Messages"
 msgstr "A_brir mensagens"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Não lida"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Encaminhado"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não lidas"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Mínima"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Menor"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Maior"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Máxima"
 
-#: ../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:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoje %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 "Ontem %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 "Gerando lista de mensagens"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16033,7 +16211,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz o seu critério de pesquisa. Limpe a pesquisa com o "
 "item de menu Pesquisar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Não há mensagens nesta pasta."
 
@@ -16066,39 +16244,43 @@ msgstr "Mensagens enviadas"
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Assunto - cortado"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Ligar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Não encaminhar"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Lembrete"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Para seu conhecimento"
 
-#: ../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 "Encaminhar"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Não é necessário responder"
 
-#: ../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 "Responder"
 
-#: ../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 "Responder a todos"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Revisar"
 
@@ -16155,7 +16337,7 @@ msgstr ""
 "mensagem."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:392
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Palavras-chave"
 
@@ -16190,36 +16372,36 @@ msgstr "_Editar mensagem"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
-"Um plug-in de formatação que exibe anexos de áudio embutidos e permite que "
-"você os execute diretamente a partir do Evolution."
+"Um plug-in que exibe anexos de áudio embutidos e permite que você os "
+"reproduza diretamente no Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "Plug-in de áudio embutido"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Selecione o nome do arquivo de backup do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution após o backup"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Selecione o nome do arquivo de backup do Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution após a restauração"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Restaurar a partir do backup"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -16230,118 +16412,118 @@ msgstr ""
 "Também serão restauradas suas configurações pessoais, filtros de e-mail e "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution a partir do arquivo de backup"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Selecione o arquivo de backup do Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Escolher um arquivo para restaurar"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Diretório de backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Restaurar diretório do Evolution"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Verificar o backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Com a interface gráfica"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Desligando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Fazendo backup das contas e configurações do Evolution"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Fazendo backup dos dados do Evolution (Mensagens, Contatos, Agenda, Tarefas, "
 "Memorandos)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Backup concluído"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Fazer backup dos dados atuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Extraindo arquivos a partir do backup"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Carregando configurações do Evolution"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Removendo arquivos temporários de backup"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Assegurando fontes locais"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Fazendo Backup da pasta %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando a partir da pasta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Backup do Evolution"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Restaurador do Evolution"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Fazendo backup dos dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Por favor aguarde enquanto o Evolution faz o backup dos seus dados."
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Recuperando dados do Evolution"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Por favor aguarde enquanto o Evolution restaura os seus dados."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto pode levar algum tempo dependendo da quantidade de dados na sua conta."
@@ -16473,27 +16655,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocorreu um erro ao criar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Processo filho de Bogofilter não responde, matando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espera pelo processo filho de Bogofilter interrompida, terminando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "O pipe para Bogofilter falhou, código de erro: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Converter mensagem de texto para _Unicode"
 
@@ -16521,21 +16703,31 @@ msgstr "Plug-in de spam Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra mensagens SPAM usando Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:608
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "Use _SSL"
 msgstr "Usar _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:632
+#: ../plugins/google-account-setup/google-contacts-source.c:358
+msgid "Re_fresh:"
+msgstr "Atuali_zar:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "Fontes da agenda CalDAV"
@@ -16552,13 +16744,6 @@ msgstr "Agendas locais"
 msgid "Provides core functionality for local calendars."
 msgstr "Provê funcionalidades básicas para agendas locais."
 
-#: ../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 "Atuali_zar:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Conexão _segura"
@@ -16575,48 +16760,55 @@ msgstr "Agendas HTTP"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Provê funcionalidades básicas para agendas webcal e http."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Clima: nublado"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Clima: neblina"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Clima: parcialmente nublado"
+msgid "Weather: Cloudy"
+msgstr "Clima: nublado"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Clima: chuva"
+msgid "Weather: Cloudy Night"
+msgstr "Clima: noite nublada"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "Clima: muito escuro"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Clima: pancadas de chuva"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Clima: neve"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Clima: ensolarado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Clima: noite clara"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Clima: trovoadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Selecionar um local"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Métrico (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, polegadas, etc)"
 
@@ -16633,8 +16825,8 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"Um plug-in de teste que demonstra um módulo de menu que permite que você "
-"copie coisas para a área de transferência."
+"Um plug-in de teste que mostra um menu popup que permite que você copie "
+"coisas para a área de transferência."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16665,7 +16857,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Você deseja tornar o Evolution seu cliente padrão de e-mail?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16705,7 +16897,7 @@ msgid "Key"
 msgstr "Chave"
 
 #: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Valores"
 
@@ -16747,6 +16939,13 @@ msgstr ""
 "valor de cabeçalho é: Nome do cabeçalho personalizado seguido por \"=\" e os "
 "valores separados por \";\""
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Abrir a pasta outro usuário"
@@ -16789,12 +16988,12 @@ msgstr ""
 "Esta opção conectará ao servidor Exchange usando a autenticação padrão de "
 "senha em texto aberto."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Fora do escritório"
 
 # Ajuste para caber
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16802,81 +17001,85 @@ msgstr ""
 "A mensagem especificada abaixo será enviada automaticamente\n"
 "para quem enviar correio para você enquanto você estiver fora."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:282
-#: ../plugins/exchange-operations/exchange-account-setup.c:287
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Eu estou fora do escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/exchange-operations/exchange-account-setup.c:286
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Eu estou no escritório"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Alterar senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:341
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerencia as definições do representante para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Assistente de representação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Diversos"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:365
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Tamanho das pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configurações do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:696
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:722
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "_Autenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:743
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "Es_pecifique o nome da caixa de correio"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "Cai_xa de correio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:944
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "_Tipo de autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar por tipos com suporte"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
@@ -17344,18 +17547,24 @@ msgid "Exchange Operations"
 msgstr "Operações do Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+"Não é possível acessar a aba \"Configurações do Exchange\" no modo "
+"desconectado."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Não foi possível alterar a senha devido a problemas de configuração."
 
-#: ../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 "Não foi possível exibir as pastas."
 
-#: ../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 "Não pode executar a operação."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17363,15 +17572,15 @@ msgstr ""
 "Mudanças na configuração da conta \"{0}\" do Exchange somente terão efeito "
 "após você reiniciar o Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Não foi possível autenticar-se ao servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Não foi possível alterar a senha."
 
-#: ../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"
@@ -17381,62 +17590,62 @@ msgstr ""
 "um erro desconhecido ocorreu. Verifique o URL, \n"
 "o nome do usuário, a senha e tente novamente."
 
-#: ../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 "Não foi possível conectar-se ao servidor Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Não foi possível conectar-se ao servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr ""
 "Não foi possível determinar as permissões de pasta para representantes."
 
-#: ../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 "Não foi possível localizar o Sistema de Armazenamento na Web."
 
-#: ../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 "Não foi possível localizar o servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Não foi possível tornar {0} um representante"
 
-#: ../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 "Não foi possível ler as permissões da pasta"
 
-#: ../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 "Não foi possível ler as permissões da pasta."
 
-#: ../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 "Não foi possível ler o estado fora-do-escritório"
 
-#: ../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 "Não foi possível atualizar as permissões de pasta."
 
-#: ../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 "Não foi possível atualizar o estado fora-do-escritório"
 
-#: ../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 ""
 "O Evolution requer uma reinicialização para carregar a caixa de correio do "
 "usuário inscrita"
 
-#: ../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 "A conta do Exchange está desconectada."
 
-#: ../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"
@@ -17464,32 +17673,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Falha ao atualizar representantes:"
 
-#: ../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 "A pasta já existe"
 
-#: ../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 "A pasta não existe"
 
-#: ../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 "Pasta desconectada"
 
-#: ../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 "Erro genérico"
 
-#: ../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 "Servidor de catálogo global não esta acessível"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17497,78 +17706,78 @@ msgstr ""
 "Se o OWA está sendo executado em um caminho diferente, você deve especificar "
 "isto no diálogo de configuração da conta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "A Caixa de correio para {0} não está no servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Tenha certeza de que o URL está correto e tente novamente."
 
-#: ../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 ""
 "Tenha certeza de que o nome do servidor está digitado corretamente e tente "
 "novamente."
 
-#: ../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 ""
 "Tenha certeza de que o nome do usuário e a senha estão corretos e tente "
 "novamente."
 
-#: ../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 "Nenhum servidor global de catálogos configurado para esta conta."
 
-#: ../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 "Nenhuma caixa de correio para o usuário {0} em {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 "Não existe tal usuário {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 "A senha foi alterada com sucesso."
 
-#: ../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 ""
 "Por favor, digite o ID do representante ou desmarque a opção Enviar como "
 "representante."
 
-#: ../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 ""
 "Por favor, verifique se o nome do Servidor de Catalogo Global está correto."
 
-#: ../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 "Por favor, reinicie o Evolution para que as alterações tenham efeito"
 
-#: ../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 "Por favor, selecione um usuário."
 
-#: ../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 "O servidor rejeitou a senha porque ela é muito fraca."
 
-#: ../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 "A conta do Exchange será desabilitada quando você sair do 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 "A conta do Exchange será removida quando você sair do 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 "O servidor do Exchange não é compatível com o Conector do Exchange."
 
-#: ../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."
@@ -17576,7 +17785,7 @@ msgstr ""
 "O servidor está executando o Exchange 5.5. O Conector do \n"
 "Exchange suporta somente o Microsoft Exchange 2000 ou 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"
@@ -17591,42 +17800,42 @@ msgstr ""
 "\n"
 "Ou você apenas deve ter digitado errado a sua senha."
 
-#: ../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 "Tente novamente com uma senha diferente."
 
-#: ../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 "Não é possível adicionar o usuário para acesso a lista de controle:"
 
-#: ../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 "Não foi possível editar representantes."
 
-#: ../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 "Erro desconhecido ao procurar {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:521
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: ../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 "Tipo desconhecido"
 
-#: ../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 "Operação sem suporte"
 
-#: ../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 ""
 "Você está atingindo a cota disponível para armazenamento de mensagens neste "
 "servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
@@ -17634,19 +17843,19 @@ msgstr ""
 "Você tem permissão para enviar uma mensagem em nome de apenas um "
 "representado de cada vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Você não pode se tornar representante de si próprio"
 
-#: ../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 "Você excedeu a cota de armazenamento de mensagens neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Você pode configurar apenas uma conta do Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17654,7 +17863,7 @@ msgstr ""
 "Atualmente, você está usando: {0} KB. Tente obter mais espaço excluindo "
 "algumas mensagens."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17662,7 +17871,7 @@ msgstr ""
 "Atualmente, você está usando: {0} KB. Você não poderá enviar ou receber "
 "mensagens agora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17670,19 +17879,19 @@ msgstr ""
 "Atualmente, você está usando: {0} KB. Você não poderá enviar mensagens "
 "enquanto você não obter mais espaço excluindo algumas mensagens."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "A sua senha venceu."
 
-#: ../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} não pode ser adicionado a uma lista de controle de acesso"
 
-#: ../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} já é um representante"
 
-#: ../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} já está na lista"
 
@@ -17747,11 +17956,11 @@ msgstr "Compor em um editor _externo"
 msgid "Compose messages using an external editor"
 msgstr "Compor mensagens usando um editor externo"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando a ser executado para lançar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17788,10 +17997,10 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Cancelando a inscrição da pasta \"%s\""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr ""
 "Permitir o cancelamento de inscrição de pastas de mensagens no menu de "
-"contexto da árvore de pastas."
+"contexto da barra lateral."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17801,25 +18010,13 @@ msgstr "Cancelar a inscrição em pastas"
 msgid "_Unsubscribe"
 msgstr "_Cancelar a inscrição"
 
-#: ../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
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Por favor, digite primeiro o nome de usuário."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:421
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Digite a senha do usuário %s para acessar a lista de agendas assinadas."
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:521
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17828,22 +18025,27 @@ msgstr ""
 "Não foi possível ler dados do servidor Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:683
 msgid "Cal_endar:"
 msgstr "Agen_da:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "Retrieve _list"
 msgstr "Recuperar _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
 msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
-msgstr "Um plug-in para configurar o calendário e os contatos do Google."
+msgid "A plugin to setup Google Calendar and Contacts."
+msgstr "Um plug-in para configurar a agenda e os contatos do Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17854,12 +18056,12 @@ msgid "Checklist"
 msgstr "Lista de tarefas"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "Um plug-in que configura fontes de agendas e de contatos do GroupWise."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "Um plug-in que configura agenda e contatos do GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Configurações de conta GroupWise"
+msgid "GroupWise Account Setup"
+msgstr "Configuração da conta GroupWise"
 
 #: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
@@ -17949,16 +18151,16 @@ msgid "Retract Mail"
 msgstr "Cancelar envio"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Adicionar Opções de Envio para mensagens GroupWise"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Adicionar opções de envio para mensagens GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Um plug-in para os recursos das contas GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "Ferramentas do GroupWise"
+msgid "GroupWise Features"
+msgstr "Recursos do GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -18019,21 +18221,22 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Este é um evento recorrente"
 
-#: ../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 "Você gostaria de aceitá-la?"
 
-#: ../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 "Você gostaria de recusá-la?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr ""
-"Você não pode compartilhar pasta com o usuário especificado &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Você não pode compartilhar pasta com o usuário &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
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Você tem que especificar um nome de usuário que quer adicionar à lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -18122,7 +18325,8 @@ msgstr "_Escrever"
 msgid "permission to read|_Read"
 msgstr "_Lida"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Representante"
 
@@ -18130,7 +18334,8 @@ msgstr "Representante"
 msgid "<b>Account Name</b>"
 msgstr "<b>Nome da conta</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Login de representante"
 
@@ -18163,7 +18368,7 @@ msgstr ""
 "A aba Representante estará disponível somente quando a conta estiver "
 "habilitada."
 
-#: ../plugins/groupwise-features/send-options.c:215
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Opções avançadas de envio"
 
@@ -18196,56 +18401,56 @@ msgstr "Adicionar   "
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:107
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Status da mensagem"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:121
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../plugins/groupwise-features/status-track.c:135
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:150
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Data de criação:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Entregue: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Aberto: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Aceito: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Excluída: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Recusado: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Completada: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Não entregue: "
 
-#: ../plugins/groupwise-features/status-track.c:251
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Rastrear status da mensagem..."
 
@@ -18406,137 +18611,137 @@ msgstr "Não é possível abrir a agenda \"%s\""
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso na agenda \"%s\" está em conflito com esta reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizado o compromisso na agenda \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:738
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Não é possível localizar nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:745
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Não é possível encontrar esta reunião em nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:749
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Não é possível localizar esta tarefa em nenhuma lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 "Não foi possível localizar este memorando em nenhuma lista de memorandos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:824
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Pesquisando por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Não foi possível analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1051
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Não foi possível enviar item para a agenda \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1063
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda \"%s\" como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1067
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda \"%s\" como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1072
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda \"%s\" como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1077
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda \"%s\" como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1171
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1178
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar uma notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1180
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "Não foi possível enviar a notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Não foi possível atualizar o status do participante porque o status é "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Não é possível atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Status do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1323
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Informação de reunião enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Informação de tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1329
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Informação do memorando enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1338
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Não pode enviar a informação de reunião, essa reunião não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Não foi possível enviar esta tarefa, a tarefa não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1344
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Não foi possível enviar a informação do memorando, esse memorando não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1424
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada não é válida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda não é um iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1465
-#: ../plugins/itip-formatter/itip-formatter.c:1493
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda não é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1466
-#: ../plugins/itip-formatter/itip-formatter.c:1494
-#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18544,11 +18749,11 @@ msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
 "informação de disponibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18556,227 +18761,227 @@ msgstr ""
 "Para processar todos estes itens, o arquivo deve ser salvo e a agenda "
 "importada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2215
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Esta reunião se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2218
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Esta tarefa se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Este memorando se repete"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "E_xcluir mensagem depois da ação"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2462
-#: ../plugins/itip-formatter/itip-formatter.c:2494
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Pesquisa de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2477
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para pesquisar por conflitos de reunião"
 
 #. 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:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Hoje"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoje %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hoje %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoje %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Amanhã"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Amanhã %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Amanhã %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Amanhã %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Amanhã %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %d de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %d de %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %d de %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %d de %B, %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %d de %B, %l:%M"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %d de %B de %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %d de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %d de %B de %Y, %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %d de %B de %Y, %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Por favor responda em nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recebido em nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte informação de reunião através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte informação de reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegou a seguinte reunião para você:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita a sua presença na seguinte reunião através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita a sua presença na seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18785,89 +18990,89 @@ msgstr ""
 "<b>%s</b> deseja receber a informação mais recente sobre a seguinte reunião "
 "através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> deseja receber a informação mais recente sobre a seguinte reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> enviou a seguinte resposta de reunião através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> enviou a seguinte resposta de reunião:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> cancelou a seguinte reunião através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a seguinte reunião."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> propôs as seguintes mudanças na reunião através de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propôs as seguintes mudanças na reunião."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> recusou as seguintes mudanças na reunião através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> recusou as seguintes mudanças na reunião."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita a atribuição de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> lhe atribuiu a tarefa através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> lhe atribuiu a tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18876,7 +19081,7 @@ msgstr ""
 "<b>%s</b> deseja receber a informação mais recente sobre a tarefa atribuída "
 "através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18884,29 +19089,29 @@ msgid ""
 msgstr ""
 "<b>%s</b> deseja receber a informação mais recente sobre a tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> através de %s enviou a seguinte resposta para tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> enviou a seguinte resposta para tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa atribuída através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18914,142 +19119,150 @@ msgstr ""
 "<b>%s</b> propôs as seguintes mudanças de atribuições de tarefas através de %"
 "s:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propôs as seguintes mudanças de atribuições de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> recusou a seguinte tarefa atribuída através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> recusou a seguinte tarefa atribuída:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> publicou o seguinte memorando através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou o seguinte memorando:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> deseja adicionar a um memorando existente através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> deseja adicionar a um memorando existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou o seguinte memorando compartilhado através de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa compartilhada"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Abrir agenda"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Recusar"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Recusar"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "A_ceitar"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Tudo _preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Preliminar"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Aceitar tudo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Enviar informação"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Atualizar status do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Atualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Hora de início:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Hora de término:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Responder ao remetente"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Enviar atuali_zações aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instâncias"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Exi_bir hora como livre"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "_Preservar meu lembrete"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+msgid "_Inherit reminder"
+msgstr "_Herdar lembretes"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Tarefas :"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Memorandos :"
 
@@ -19163,20 +19376,20 @@ msgstr "O ícone deve piscar."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Para notificar novas mensagens apenas na caixa de entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Gerar uma mensagem _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Notificação de e-mail do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Propriedades da notificação de e-mail"
 
 #. 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"
@@ -19191,55 +19404,55 @@ msgstr[1] ""
 "Você recebeu %d novas mensagens\n"
 "em %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."
 msgstr[0] "Você recebeu %d nova mensagem."
 msgstr[1] "Você recebeu %d novas mensagens."
 
-#: ../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 "Novo e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Mostrar ícone na área de _notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "_Piscar ícone na área de notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "_Mensagem flutuante junto com o ícone"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "Tocar um arquivo de som quando uma nova mensa_gem chegar"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Tocar arquivo de _som"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Selecionar um arquivo de som"
 
-#: ../plugins/mail-notification/mail-notification.c:750
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Toc_ar"
 
-#: ../plugins/mail-notification/mail-notification.c:807
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Mensagem de notificação apenas na Ca_ixa de Entrada"
 
@@ -19391,8 +19604,8 @@ msgstr "Enviar mensagem para lista?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19506,22 +19719,6 @@ msgstr "M_arcar mensagens como lidas"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Usado para marcar todas as mensagens na pasta como lidas"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Marca agenda desconectada"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Marcar a agenda selecionada para visualização desconectada."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Não tornar disponível para uso desconectado"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "Tornar _disponível para uso desconectado"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Um plug-in que implementa plug-ins mono."
@@ -19591,19 +19788,19 @@ msgstr "Modo de texto simples"
 msgid "Prefer plain-text"
 msgstr "Preferir texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Preferir texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Só mostrar texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19615,6 +19812,37 @@ msgstr "Controlador de perfil do Evolution"
 msgid "Writes a log of profiling data events."
 msgstr "Escreve um log do perfil de eventos de dados."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importar mensagens do Outlook a partir de um arquivo PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Importador de arquivos PST do Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Pasta pessoal do Outlook (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+msgid "_Address Book"
+msgstr "_Catálogo de endereços"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+msgid "A_ppointments"
+msgstr "C_ompromissos"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+msgid "_Journal entries"
+msgstr "_Diário"
+
+#: ../plugins/pst-import/pst-importer.c:352
+msgid "Importing Outlook data"
+msgstr "Importando dados do Outlook"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Permite que agendas sejam publicadas na web"
@@ -19632,12 +19860,12 @@ msgid "_Publish Calendar Information"
 msgstr "_Publicar informação de agenda"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "Are you sure you want to remove this URL?"
-msgstr "Você tem certeza de que deseja excluir esta URL?"
+msgid "Are you sure you want to remove this location?"
+msgstr "Você tem certeza de que deseja excluir esta localização?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Local</span>"
+msgstr "<span weight=\"bold\">Localização</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
@@ -19671,7 +19899,7 @@ msgstr "_Freqüência de publicação:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19679,13 +19907,13 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"FTP seguro (SSH)\n"
 "FTP público\n"
 "FTP (com login)\n"
 "Compartilhamento Windows\n"
 "WebDAV (HTTP)\n"
 "WebDAV seguro (HTTPS)\n"
-"Local especificado"
+"Localização personalizada"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
@@ -19719,6 +19947,14 @@ msgstr ""
 "iCal\n"
 "Disponibilidade"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "Nova localização"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Editar localização"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Olá Python"
@@ -19736,8 +19972,8 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Plug-in de teste para carregador Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
-msgstr "Um plug-in que carrega outros plug-ins escritos usando python."
+msgid "A plugin which loads other plugins written using Python."
+msgstr "Um plug-in que carrega outros plug-ins escritos em Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
@@ -19770,8 +20006,9 @@ msgstr "O processo filho de SpamAssassin não responde, matando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "Espera pelo processo filho de Spamassassin interrompida, terminando..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
+"A espera pelo processo filho de Spamassassin foi interrompida, terminando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
@@ -19800,12 +20037,12 @@ msgstr ""
 "instalado."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Plug-in SpamAssassin"
+msgid "SpamAssassin Options"
+msgstr "Opções do SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opções do SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Plug-in 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."
@@ -20046,15 +20283,15 @@ msgstr ""
 "Lista de pares teclado/valores para o plug-in de modelo para substituir no "
 "corpo de uma mensagem."
 
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Sem título"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Salvar como _modelo"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Salva como modelo"
 
@@ -20063,8 +20300,8 @@ msgid "Drafts based template plugin"
 msgstr "Plug-in de modelo baseado em rascunho"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "Um plug-in simples que usa ytnef para decodificar anexos tnef."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "Um plug-in simples que usa yTNEF para decodificar anexos TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -20078,18 +20315,17 @@ msgstr "Um plug-in para configurar contatos do WebDAV."
 msgid "WebDAV contacts"
 msgstr "Contatos do WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necessário no apache <2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20233,7 +20469,7 @@ msgstr "A barra lateral está visível"
 msgid "Skip development warning dialog"
 msgstr "Pular diálogo de alerta de desenvolvimento"
 
-#: ../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 "Iniciar no modo desconectado"
 
@@ -20311,10 +20547,9 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"O estilo de botões de janela. Podem ser \"texto\", \"ícones\", \"ambos\", "
-"\"barra de ferramentas\". Se definido como \"barra de ferramentas\", o "
-"estilo dos botões é determinado pela configuração da barra de ferramentas do "
-"GNOME."
+"O estilo de botões de janela. Pode ser \"text\" (texto), \"icons\" (ícones), "
+"\"both\" (ambos), \"toolbar\". Se definido como \"toolbar\", o estilo dos "
+"botões é determinado pela configuração da barra de ferramentas do GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
@@ -20448,7 +20683,7 @@ msgstr "Preferências do 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"
@@ -20483,29 +20718,26 @@ msgstr ""
 "Guilherme de S. Pastore <gpastore@gnome.org>\n"
 "Raul Pereira <contato@raulpereira.com>\n"
 "Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
-"Vladimir Melo <vladimirmelo.psi@gmail.com>"
+"Vladimir Melo <vladimirmelo.psi@gmail.com>\n"
+"Jonh Wendell <wendell@bani.com.br>"
 
 #: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "WebSite do Evolution"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Erro ao abrir a página de FAQ."
-
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: ../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 "_Trabalhar desconectado"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: ../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."
@@ -20513,11 +20745,11 @@ msgstr ""
 "O Evolution está atualmente conectado.\n"
 "Clique neste botão para trabalhar desconectado."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está em processo de desconexão."
 
-#: ../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."
@@ -20525,33 +20757,33 @@ msgstr ""
 "O Evolution está atualmente desconectado.\n"
 " Clique neste botão para trabalhar conectado."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Alterna para %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../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 "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o Banco de Dados de configuração"
 
@@ -20596,8 +20828,8 @@ msgid "Importer Type"
 msgstr "Importar tipo"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Selecionar importadores"
+msgid "Select Information to Import"
+msgstr "Escolha qual informação importar"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20615,7 +20847,7 @@ msgstr ""
 
 # ajustei para ter o mesmo tamanho
 #. 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"
@@ -20650,7 +20882,7 @@ msgstr ""
 "Nós esperamos que você aprecie os resultados do nosso trabalho\n"
 "duro, e estamos esperando ansiosamente as suas contribuições!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20658,44 +20890,44 @@ msgstr ""
 "Obrigado\n"
 "A Equipe do Evolution\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Não me diga novamente"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia o Evolution ativando o componente especificado"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Inicia no modo conectado"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Desliga à força todos os componentes do Evolution"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Executa novamente a migração do Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia a saída de depuração de todos os componentes para um arquivo."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Desabilita o carregamento de qualquer plug-ins."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desabilita o painel de visualização do Correio, Contatos e Tarefas."
 
 # Descrição obtida com "evolution --help"
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de e-mail e gerenciador de informações pessoais (PIM)"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20764,7 +20996,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -21363,10 +21595,9 @@ msgstr "_Visualização dos contatos"
 msgid "Copy"
 msgstr "Copiar"
 
-# O original não deveria ter reticências
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copiar o(s) contato(s) selecionado(s) para outra pasta..."
+msgid "Copy selected contacts to another folder"
+msgstr "Copiar o(s) contato(s) selecionado(s) para outra pasta"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -21414,8 +21645,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver Todos os contatos para..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Mover o(s) contato(s) selecionado(s) para outra pasta..."
+msgid "Move selected contacts to another folder"
+msgstr "Mover o(s) contato(s) selecionado(s) para outra pasta"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -21454,16 +21685,15 @@ msgstr "S_alvar catálogo de endereços Como vCard"
 msgid "Save as VCard..."
 msgstr "Salvar como vCard..."
 
-# O original tem ponto, mas não deveria.
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
 msgstr "Salva os contatos selecionados como um vCard"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Salva os contatos da pasta selecionada como 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 "Selecionar tudo"
 
@@ -21475,19 +21705,17 @@ msgstr "Selecionar _tudo"
 msgid "Select all contacts"
 msgstr "Seleciona todos os contatos"
 
-# O original não deveria ter ponto final
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "Envia uma mensagem aos contatos selecionados."
+msgid "Send a message to the selected contacts"
+msgstr "Envia uma mensagem aos contatos selecionados"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Envia mensagem ao contato"
 
-# O original não deveria ter ponto final.
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "Envia os contatos selecionados a outra pessoa"
+msgid "Send selected contacts to another person"
+msgstr "Envia os contatos selecionados para outra pessoa"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -21509,7 +21737,7 @@ msgstr "Parar o carregamento"
 msgid "View the current contact"
 msgstr "Ver o contato atual"
 
-#: ../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 "Açõe_s"
@@ -21664,15 +21892,23 @@ msgstr "Mostrar a semana útil"
 msgid "View the current appointment"
 msgstr "Ver o compromisso atual"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Vê o console de depuração para as mensagens de log"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Semana"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Semana útil"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "_Logs de depuração"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Abrir compromisso"
 
@@ -21741,10 +21977,6 @@ msgstr "Mostra a janela de visualização de mensagem"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Inscreve em ou cancela a inscrição de pastas em servidores remotos"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Vê o console de depuração para as mensagens de log"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "Visão _clássica"
@@ -21753,10 +21985,6 @@ msgstr "Visão _clássica"
 msgid "_Copy Folder To..."
 msgstr "_Copiar a pasta para..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Logs de depuração"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "Baixar mensagens para uso _desconectado"
@@ -21777,12 +22005,11 @@ msgstr "_Nova..."
 msgid "_Preview"
 msgstr "_Visualização"
 
-# Abre um diálogo, então precisa de reticências
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "In_scrições..."
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21863,11 +22090,6 @@ msgstr "Remove permanentemente todas as mensagens excluídas nesta pasta"
 msgid "Permanently remove this folder"
 msgstr "Remove permanentemente esta pasta"
 
-# Não gera um novo diálogo, então não precisa de reticências.
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "Atuali_zar"
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Atualiza a pasta"
@@ -22822,42 +23044,42 @@ msgid "_Replace existing view"
 msgstr "Substitui_r a visão existente"
 
 #. 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 "Visão personalizada"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Salvar visão personalizada"
 
-#: ../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 "Definir visões..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Visão a_tual"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleciona a visão %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Visão atual é personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Salvar visão personalizada..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Salvar visão atual personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Cria ou edita visões"
 
@@ -22881,7 +23103,7 @@ msgstr "Tipo de visão"
 msgid "Type of view:"
 msgstr "Tipo de visão:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
@@ -22922,23 +23144,23 @@ msgid "Month Calendar"
 msgstr "Agenda mensal"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Cor de preenchimento"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../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:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c: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 "Cor de preenchimento GDK"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Preencher pontilhado"
 
@@ -22981,16 +23203,16 @@ msgstr "Largura mínima"
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Agora"
 
-#: ../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 "A hora deve estar no formato: %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 "O valor percentual deve estar entre 0 e 100, inclusive"
 
@@ -23089,35 +23311,35 @@ msgstr "Outro..."
 msgid "Ch_aracter Encoding"
 msgstr "C_odificação de caracteres"
 
-#: ../widgets/misc/e-dateedit.c:305
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:326
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:348
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botão para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:390
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Caixa desdobrável de seleção para selecionar o horário"
 
-#: ../widgets/misc/e-dateedit.c:466
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "Agora"
 
-#: ../widgets/misc/e-dateedit.c:472
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "Hoje"
 
-#: ../widgets/misc/e-dateedit.c:1637
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Data inválida"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Hora inválida"
 
@@ -23175,7 +23397,7 @@ msgstr "Espaçamento ao redor da seta do expansor"
 
 #. 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:750
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "Pesquisa avançada"
 
@@ -23295,8 +23517,8 @@ msgstr "Lim_par"
 msgid "Item ID"
 msgstr "ID do item"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Texto"
 
@@ -23470,19 +23692,19 @@ msgid "_When opened:"
 msgstr "_Quando aberto:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% concluído)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Clicar aqui para ir para URL"
 
@@ -23522,23 +23744,23 @@ msgstr "Coluna com foco"
 msgid "Unselected Column"
 msgstr "Coluna não selecionada"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Coluna riscada"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Coluna sublinhada"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Coluna em negrito"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Coluna colorida"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Coluna da cor de fundo"
 
@@ -23877,111 +24099,221 @@ msgstr "Visual retrô"
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Processador de eventos"
 
-#: ../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 "Negrito"
 
-#: ../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 "Riscado"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Âncora"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Alinhamento"
 
-#: ../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 "Largura do clip"
 
-#: ../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 "Altura do clip"
 
-#: ../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 "Clip"
 
-#: ../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 "Preencher retângulo do clip"
 
-#: ../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 "Deslocamento 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 "Deslocamento 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 "Largura do texto"
 
-#: ../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 "Altura do texto"
 
-#: ../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 "Usar omissão de palavra óbvia"
 
-#: ../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 "Omissão de palavras"
 
-#: ../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 "Quebra de linha"
 
-#: ../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 "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Máximo de linhas"
 
-#: ../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 "Desenhar bordas"
 
-#: ../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 "Permitir quebras de linha"
 
-#: ../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 "Desenhar fundo"
 
-#: ../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 "Desenhar base"
 
-#: ../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 "Posição do cursor"
 
 # IM = Input Method
-#: ../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 "Contexto do ME"
 
-#: ../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 "Alça do popup"
 
+#~ 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 ""
+#~ "Não foi possível abrir este catálogo de endereços. Isto significa que "
+#~ "você digitou um URI incorreto ou que o servidor LDAP está fora do ar."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Teste de editor de estilo de impressão de contato"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright © 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr ""
+#~ "Isto deveria testar o editor de estilo de componente de impressão de "
+#~ "contato"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Teste de impressão de contato"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Isto deveria testar o código de impressão de contato"
+
+#~ msgid "Business"
+#~ msgstr "Comercial"
+
+#~ msgid "Competition"
+#~ msgstr "Competição"
+
+#~ msgid "Favourites"
+#~ msgstr "Favoritos"
+
+#~ msgid "Gifts"
+#~ msgstr "Doações"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Metas e objetivos"
+
+#~ msgid "Holiday"
+#~ msgstr "Feriado"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Cartões comemorativos"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Contatos preferidos"
+
+#~ msgid "Ideas"
+#~ msgstr "Pensamentos"
+
+#~ msgid "International"
+#~ msgstr "Internacional"
+
+#~ msgid "Key Customer"
+#~ msgstr "Personalizador de teclas"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversos"
+
+#~ msgid "Next 7 days"
+#~ msgstr "Próximos 7 dias"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Ligações para telefone"
+
+#~ msgid "Strategies"
+#~ msgstr "Estratégias"
+
+#~ msgid "Suppliers"
+#~ msgstr "Fornecedores"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Tempo e gastos"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Esperando"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Próximos 7 dias"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "_Adicionar critérios ao filtro"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Clima: parcialmente nublado"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Por favor, digite primeiro o nome de usuário."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Marca agenda desconectada"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Marcar a agenda selecionada para visualização desconectada."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Erro ao abrir a página de FAQ."
+
+#~ msgid "Select Importers"
+#~ msgstr "Selecionar importadores"
+
+# Não gera um novo diálogo, então não precisa de reticências.
+#~ msgid "Re_fresh..."
+#~ msgstr "Atuali_zar"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Permissão negada."
 
diff --git a/po/sr.po b/po/sr.po
index c2ac4218cc..6dd85d0e9b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,18 +6,20 @@
 # Maintainer: Игор Несторовић <jung@one.ekof.bg.ac.yu>
 # Reviewed on 2005-08-22 by Игор Несторовић <igor@prevod.org>
 #
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:13+0000\n"
+"POT-Creation-Date: 2009-01-28 22:19+0100\n"
 "PO-Revision-Date: 2008-09-19 21:31+0100\n"
 "Last-Translator: Игор Несторовић <igor@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # note(slobo): message thread, низ --> бољи превод је расправа
 # note(slobo): понегде сам за summary користио --> „у кратким цртама“
@@ -29,21 +31,21 @@ msgstr ""
 # note(slobo): spam , Ђубре --> Нежељена пошта
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "еволуцијин адресар"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Нови контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -123,8 +125,7 @@ msgstr "табела за приказ и избор текућег времен
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c: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."
@@ -134,8 +135,7 @@ msgstr[2] "Има %d догађаја."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../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 "Нема догађаја."
 
@@ -164,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "преглед календара за један или више дана"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -180,9 +180,8 @@ msgstr "%A, %d. %b %Y."
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -190,9 +189,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:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -200,10 +199,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:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -217,16 +216,15 @@ msgstr "%d. %b %Y."
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%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 "Гномов календар"
 
@@ -273,11 +271,11 @@ msgstr "искачуће"
 msgid "popup a child"
 msgstr "искачуће изведено"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "уређивање"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "почиње уређивањем ове ћелије"
 
@@ -290,19 +288,19 @@ msgstr "бирање"
 msgid "toggle the cell"
 msgstr "бирање ћелије"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "разгранава"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "разгранава ред у ETree где се ћелија налази"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "скупља"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "скупља ред у ETree где се ћелија налази"
 
@@ -360,12 +358,20 @@ msgstr "активирати"
 
 #. 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}“ је само за читањеје и није подложан изменама. Изаберите други адресар са бочне траке у погледу Контакти."
+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}“ је само за читањеје и није подложан изменама. Изаберите други "
+"адресар са бочне траке у погледу Контакти."
 
 #: ../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 "Контакт са овом адресом већ постоји. Желите ли ипак да додате нову карту са истом адресом?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Контакт са овом адресом већ постоји. Желите ли ипак да додате нову карту са "
+"истом адресом?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -384,8 +390,14 @@ msgid "Category editor not available."
 msgstr "Уређивач категорија није доступан."
 
 #: ../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 "Проверите да је лозинка исправно унета и да користите подржани начин пријаве. Не заборавите да је величина слова битна у лозинкама; можда су велика слова укључена."
+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 ""
+"Проверите да је лозинка исправно унета и да користите подржани начин "
+"пријаве. Не заборавите да је величина слова битна у лозинкама; можда су "
+"велика слова укључена."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -396,8 +408,14 @@ msgid "Could not remove address book."
 msgstr "Није могуће уклонити адресар."
 
 #: ../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 "Тренутно из Еволуције можете приступити само системском адресару GroupWise. Користите неки други GroupWise програм за електронску пошту како би могли добити 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 ""
+"Тренутно из Еволуције можете приступити само системском адресару GroupWise. "
+"Користите неки други GroupWise програм за електронску пошту како би могли "
+"добити GroupWise честе контакте и фасцикле са личним контактима."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -417,7 +435,7 @@ msgstr "Неуспела аутентификација на LDAP сервер."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Неуспело брисање контакта"
 
@@ -430,6 +448,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP сервер није одговорио исправном шемом података."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Верзија сервера"
 
@@ -442,12 +461,21 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Еволуцијин адресар је неочекивано престао да ради."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Слика коју сте изабрали је превелика. Да ли желите да јој промените величину и сачувате?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Слика коју сте изабрали је превелика. Да ли желите да јој промените величину "
+"и сачувате?"
 
 #: ../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 "Овај LDAP сервер можда користи старију верзију LDAP-а која не подржава ову могућност, или је лоше подешен. Питајте администратора за подржане основе за претрагу."
+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 ""
+"Овај LDAP сервер можда користи старију верзију LDAP-а која не подржава ову "
+"могућност, или је лоше подешен. Питајте администратора за подржане основе за "
+"претрагу."
 
 # мало аориста ;-)
 #: ../addressbook/addressbook.error.xml.h:24
@@ -459,8 +487,12 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "Сервер овог адресара не садржи предложене основе за претрагу."
 
 #: ../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 "Сервер овог адресара је или недоступан или је његово име погрешно унето или је мрежа недоступна."
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Сервер овог адресара је или недоступан или је његово име погрешно унето или "
+"је мрежа недоступна."
 
 # мало аориста ;-)
 #: ../addressbook/addressbook.error.xml.h:27
@@ -488,27 +520,39 @@ msgid "Would you like to save your changes?"
 msgstr "Желите ли да сачувате промене?"
 
 #: ../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 "Покушавате да преместите контакт из једног адресара у други али се он не може уклонити из извора. Желите ли да сачувате умножак уместо тога?"
+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 ""
+"Покушавате да преместите контакт из једног адресара у други али се он не "
+"може уклонити из извора. Желите ли да сачувате умножак уместо тога?"
 
 #: ../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 "Повезујете се на неподржан GroupWise сервер што може да доведе до проблема у раду Еволуције. Најбоље је да сервер буде надограђен на подржану верзију"
+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 ""
+"Повезујете се на неподржан GroupWise сервер што може да доведе до проблема у "
+"раду Еволуције. Најбоље је да сервер буде надограђен на подржану верзију"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Немате довољна овлашћења да бришете контакте из овог адресара."
 
 #: ../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 "Изменили сте овај контакт. Желите ли да сачувате ове промене?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Ваши контакти за {0} неће бити доступни док се Еволуција поново не покрене."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Ваши контакти за {0} неће бити доступни док се Еволуција поново не покрене."
 
-#: ../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
@@ -533,9 +577,8 @@ msgstr "_Користи тако како је"
 
 # bug: we don't want this translated
 #. 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}"
 
@@ -545,21 +588,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за усклађивање:"
 
-#: ../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 "Није могуће учитати адресар"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Није могуће читање програмског блока адреса пилота"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Самодопуњавање"
 
@@ -575,12 +619,13 @@ msgstr "Сертификати"
 msgid "Configure autocomplete here"
 msgstr "Подесите самодопуњавање овде"
 
+#. ensure the group name is in current locale, not read from configuration
 #. 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:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Контакти"
@@ -618,184 +663,193 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Управљајте S/MIME сертификатима овде"
 
 # On This Computer is always first and VFolders is always last
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199
-#: ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195
-#: ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202
-#: ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312
-#: ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 "На овом рачунару"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208
-#: ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35
-#: ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Лично"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "На LDAP серверима"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Направи нови контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Контакт ли_ста"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Направи нову контакт листу"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:253
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Нови именик"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Адресар"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Направи нови именик"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Неуспела надоградња подешавања именика или његових фасцикли."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "База"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Умножи садржај _књиге локално за рад ван мреже"
 
-#: ../addressbook/gui/component/addressbook-config.c: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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Опште"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Именик"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Подаци сервера"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Аутентификација"
 
-#: ../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 "Детаљи"
 
-#: ../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 "Претраживање"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Преузимање"
 
-#: ../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 "Подешавања именика"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1207
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Преношење..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1247
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Преношење „%s“:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Подешавања самодопуњавања"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"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 ""
-"Путања и хијерархија фасцикли за контакте у Еволуцији је измењена од Еволуције 1.x.\n"
+"Путања и хијерархија фасцикли за контакте у Еволуцији је измењена од "
+"Еволуције 1.x.\n"
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -805,7 +859,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -815,7 +869,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -825,61 +879,60 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси податке са 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 "Преименуј фасциклу „%s“ у:"
 
-#: ../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 "Преименуј фасциклу"
 
-#: ../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 "Имена фасцикли не могу да садрже ’/‘"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Нови именик"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Чува као вКарту..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Преименуј..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693
-#: ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468
-#: ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046
-#: ../mail/em-folder-tree.c:2120
-#: ../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:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "О_собине"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Бирач извора за контакте"
 
@@ -900,8 +953,8 @@ msgstr "Унесите лозинку за %s (корисник %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Унесите лозинку"
@@ -919,34 +972,61 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML за листу адреса за допуњавање."
 
 #: ../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 "Положај усправне површи, између карте и листе прегледа и панела за преглед, у пикселима."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"Положај усправне површи, између карте и листе прегледа и панела за преглед, "
+"у пикселима."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show preview pane"
-msgstr "Прикажи површ за преглед"
+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 "Број знакова који се морају укуцати пре него што Еволуција покуша да самодопуни."
+msgid "Show preview pane"
+msgstr "Прикажи површ за преглед"
 
 #: ../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 ""
+"Број знакова који се морају укуцати пре него што Еволуција покуша да "
+"самодопуни."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Адреса за последњу коришћену фасциклу у прозорчету за избор имена"
 
-#: ../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 "Адреса за последњу коришћену фасциклу у прозорчету за избор имена."
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "Положај усправне површи"
 
-#: ../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 "Да ли се приказује површ за преглед."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+#, fuzzy
+msgid "Look up in address books"
+msgstr "_Потражи само у локалном адресару"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -988,7 +1068,7 @@ msgid "Add Address Book"
 msgstr "Додај именик"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Увек"
 
@@ -1014,8 +1094,10 @@ msgid "Email address"
 msgstr "Електронска адреса"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Еволуција ће користити ову електронску адресу да Вас аутентификује на сервер."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Еволуција ће користити ову електронску адресу да Вас аутентификује на сервер."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1026,14 +1108,14 @@ msgid "Lo_gin:"
 msgstr "При_јава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Никада"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Не користи се шифровање"
 
@@ -1045,7 +1127,7 @@ msgstr "Један"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL шифровање"
 
@@ -1066,20 +1148,39 @@ msgid "Search filter"
 msgstr "Пропусник претраге"
 
 #: ../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 "Пропусник претраге је врста објекта који се претражује. Ако се ово не измени подразумевана претрага ће бити обављена на класи објекта „особа“."
+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 ""
+"Пропусник претраге је врста објекта који се претражује. Ако се ово не измени "
+"подразумевана претрага ће бити обављена на класи објекта „особа“."
 
 #: ../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 "Одабир ове могућности значи да ће се Еволуција повезати на LDAP сервер само ако он подржава SSL шифровање."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Одабир ове могућности значи да ће се Еволуција повезати на LDAP сервер само "
+"ако он подржава 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 "Одабир ове могућности значи да ће се Еволуција повезати на LDAP сервер само ако он подржава TLS шифровање."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Одабир ове могућности значи да ће се Еволуција повезати на LDAP сервер само "
+"ако он подржава 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 "Одабир ове могућности значи да сервер не подржава ни SSL ни TLS шифровање. То значи да Ваша веза неће бити сигурна, и да ћете бити рањиви на сигурносне нападе. "
+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 ""
+"Одабир ове могућности значи да сервер не подржава ни SSL ни TLS шифровање. "
+"То значи да Ваша веза неће бити сигурна, и да ћете бити рањиви на сигурносне "
+"нападе. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1093,37 +1194,75 @@ msgstr "Подржане базе за претрагу"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS шифровање"
 
 #: ../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 "База за претрагу је посебно име (DN) уноса одакле ће Ваша претрага почети. Ако ово оставите празно, претрага ће почети из корена стабла директоријума."
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"База за претрагу је посебно име (DN) уноса одакле ће Ваша претрага почети. "
+"Ако ово оставите празно, претрага ће почети из корена стабла директоријума."
 
 #: ../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 "Обим претраге дефинише дубину којом желите да претрага обухвати стабло директоријума. Обим претраге „под“ ће укључити све уносе испод базе за претрагу. Обим претраге „један“ ће укључити само уносе један ниво испод Ваше базе."
+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 ""
+"Обим претраге дефинише дубину којом желите да претрага обухвати стабло "
+"директоријума. Обим претраге „под“ ће укључити све уносе испод базе за "
+"претрагу. Обим претраге „један“ ће укључити само уносе један ниво испод Ваше "
+"базе."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
-msgstr "Ово је пуно име Вашег ldap сервера. На пример, „ldap.mojеpreduzece.com “."
+#, fuzzy
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Ово је пуно име Вашег ldap сервера. На пример, „ldap.mojеpreduzece.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 "Ово је највећи број уноса за преузимање. Ако унесете сувише велики број успорићете именик."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Ово је највећи број уноса за преузимање. Ако унесете сувише велики број "
+"успорићете именик."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-msgstr "Ово је метод који ће Еволуција користити да Вас пријави.  Приметите да његово укључивање на „Електронска адреса“ захтева анонимни приступ на ldap сервер."
+#, fuzzy
+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 ""
+"Ово је метод који ће Еволуција користити да Вас пријави.  Приметите да "
+"његово укључивање на „Електронска адреса“ захтева анонимни приступ на 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 "Ово је име сервера које ће се појавити у листи фасцикли Еволуције. То је само за потребе приказивања. "
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Ово је име сервера које ће се појавити у листи фасцикли Еволуције. То је "
+"само за потребе приказивања. "
 
 #: ../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 "Ово је порт LDAP сервера на који ће Еволуција покушати да се повеже. Понуђена је листа стандардних портова. Питајте свог администратора система који порт да наведете."
+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 ""
+"Ово је порт LDAP сервера на који ће Еволуција покушати да се повеже. "
+"Понуђена је листа стандардних портова. Питајте свог администратора система "
+"који порт да наведете."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1155,7 +1294,7 @@ msgstr "Метод _пријаве:"
 
 #: ../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:"
@@ -1170,7 +1309,7 @@ msgid "_Search scope:"
 msgstr "Обим п_ретраге:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "С_ервер:"
@@ -1189,14 +1328,14 @@ msgstr "карте"
 
 # bug: plural-forms
 #: ../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 "минута"
 
@@ -1237,8 +1376,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Посао</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1249,16 +1388,16 @@ msgid "Ca_tegories..."
 msgstr "Ка_тегорије..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-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 "Контакт"
 
 #: ../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 "Уређивач за контакте"
 
@@ -1267,11 +1406,12 @@ msgid "Full _Name..."
 msgstr "Пуно _име..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Слика"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN гласник"
 
@@ -1284,1254 +1424,1265 @@ msgid "Nic_kname:"
 msgstr "На_димак:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#, fuzzy
+msgid "Novell GroupWise"
+msgstr "Novell Groupwise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Лични подаци"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Телефон"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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 "Посао"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Годишњица:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Помоћник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Рођендан:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Град:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "Пр_едузеће:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Држава:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Одељење:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Смести _под:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "С_лободно/заузето:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Лична страна:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Управник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Белешке:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Канцеларија:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Поштански број:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Занимање:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "С_упружник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Република/покрајина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Титула:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Видео разговор:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Жели да прима HTML пошту"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Веб лог:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Где:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Пош_тански број:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Адреса"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836
-#: ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Изменљиво"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Сједињене Државе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Авганистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Албанија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Алжир"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Америчка Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Андора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Ангола"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Ангила"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Антарктик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Антига и Барбуда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Јерменија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Аруба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Аустралија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Аустрија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Азербејџан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Бахами"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Бахреин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Белорусија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Белизе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Бенин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Бермуда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Боливија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Босна и Херцеговина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Боцвана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Буве Острво"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Британска Територија Индијског Океана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Брунеј Дарусалам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Бугарска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Буркина Фасо"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Камбоџа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Канада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Зеленортска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Кајманска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Централноафричка Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Чад"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Чиле"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Кина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Божићно Острво"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокос (Килинг) Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Колумбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Комори"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Конго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Конго, Демократска Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Кук Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Обала Слоноваче"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Хрватска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Куба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Кипар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Чешка Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Данска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Џибути"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Доминика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Доминиканска Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Египат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "Ел Салвадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Екваторијална Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Еритреја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Естонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Етиопија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Фокландска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Фарска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Фиџи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Финска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Француска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Француска Гијана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Француска Полинезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Француске Јужне Територије"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Габон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Гамбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Грузија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Немачка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Грчка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Гренланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Гвадалуп"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Гуам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Гвирнзи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Гвинеја-Бисао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Гвајана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Хаити"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Херд и Мекдоналд Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Света Столица"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Хондурас"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Хонг Конг"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Мађарска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Исланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Индија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Индонезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Иран"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Ирска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Човеково Острво"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Израел"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Италија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Јамајка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Јапан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Џерси"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Јордан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Кенија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Кореја, Демократска Народна Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Кореја, Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Кувајт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Киргистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Лаос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Латвија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Либан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Либерија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Либија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Лихтенштајн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Литванија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Луксембург"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Макао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Македонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Малави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Малезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Малдиви"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Мали"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Малта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Маршалова Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Мартиник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Мауританија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Маурицијус"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Мејот"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Мексико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Микронезија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Молдавија, Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Монако"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Монголија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Монсерат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Мароко"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Мианмар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Намибија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Науру"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Непал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Холандски Антили"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Нова Каледонија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Нови Зеланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Никарагва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Нигер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Нигерија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Ниу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Норфолк Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Острва Северна Мариана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Норвешка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Оман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Палау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Палестинска Територија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Панама"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Папуа Нова Гвинеја"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Парагвај"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Перу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Филипини"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Питкерн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Пољска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Португал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Порторико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Катар"
 
 # За ову државу нисам чуо ни у сну, тако да сам оставио у оригиналу. -- Па када си необразован. :)
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Реунион"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Румунија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Руска Федерација"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Свети Китс и Невис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Света Луција"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Свети Винсент и Гренадини"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Сао Томе и Принципе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Саудијска Арабија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Србија и Црна Гора"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Сејшели"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Сијера Леоне"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Словачка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Словенија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Соломонска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Сомалија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Јужна Африка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Јужна Џорџија и Јужна Сендвич Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Св. Јелена"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Св. Пјер и Микелон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Судан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Суринам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Свалбард и Јан Мајен Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Шведска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Швајцарска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Сирија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Таџикистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Танзанија, Уједињена Република"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Тајланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Тимор-Лест"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Того"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Тонга"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Тринидад и Тобаго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Турска"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Туркс и Кокос Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Уганда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Украјина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Уједињени Арапски Емирати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Велика Британија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Рубна Острва САД"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Уругвај"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Вијетнам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Британска Девичанска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Америчка Девичанска Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Волис и Футуна Острва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Јемен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Замбија"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Име"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL брзи гласник"
 
-#: ../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 "Џабер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo гласник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu'Gadu гласник"
 
-#: ../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
+#, fuzzy
+msgid "Skype"
+msgstr "Тип"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Сервис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Место"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Корисничко име"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Кућа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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:2259
 msgid "Other"
 msgstr "Друго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Изворна књига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Одредишна књига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Обавезна поља"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Промењено"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уређивач за контакте - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Изаберите слику за овај контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Без слике"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2539,47 +2690,47 @@ msgstr ""
 "Подаци о контакту нису исправни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ има неважећи формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ има неважећи формат"
 
-#: ../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“ је празан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Име и презиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "Е-_пошта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Изабери именик"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2588,7 +2739,7 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете контакт листу (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2596,7 +2747,7 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете ове контакт листе?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2605,7 +2756,7 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете контакт (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2712,9 +2863,9 @@ msgstr "Услуга _брзог гласника:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c: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 "_Место:"
 
@@ -2728,6 +2879,9 @@ msgid "Contact List Editor"
 msgstr "Уређивач контакт листе"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Изабери..."
 
@@ -2753,9 +2907,9 @@ msgid "_Members"
 msgstr "_Чланови"
 
 #: ../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"
@@ -2779,8 +2933,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Откривен дупли контакт"
 
 #: ../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?"
-msgstr "Име или електронска адреса овог контакта већ постоји у овој фасцикли.  Желите ли ипак да га додате?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"Име или електронска адреса овог контакта већ постоји у овој фасцикли.  "
+"Желите ли ипак да га додате?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2809,26 +2967,23 @@ msgstr "Припоји контакт"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415
-#: ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Е-пошта"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
@@ -2836,11 +2991,11 @@ msgstr "Е-пошта почиње са"
 msgid "Name contains"
 msgstr "Име садржи"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Нема контакта"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2848,25 +3003,24 @@ msgstr[0] "%d контакт"
 msgstr[1] "%d контакта"
 msgstr[2] "%d контаката"
 
-#: ../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 "Упит"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Грешка при учитавању прегледа књиге"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Модел"
 
@@ -2874,32 +3028,31 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Извор"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Тип"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Чува као вКарту..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671
-#: ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвори"
@@ -2953,18 +3106,13 @@ msgid "Cu_t"
 msgstr "_Исеци"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678
-#: ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39
-#: ../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:1595
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../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 "_Умножи"
@@ -2974,15 +3122,20 @@ msgid "P_aste"
 msgstr "_Убаци"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625
-#: ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Било која категорија"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Не одговара"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Помоћник"
 
@@ -3012,7 +3165,7 @@ msgstr "Телефон у колима"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3020,7 +3173,7 @@ msgid "Categories"
 msgstr "Категорије"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Предузеће"
 
@@ -3069,22 +3222,22 @@ msgid "Journal"
 msgstr "Дневник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Управник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Надимак"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Напомена"
 
@@ -3113,14 +3266,14 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Улога"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Супружник"
 
@@ -3150,63 +3303,55 @@ msgstr "Јединица"
 msgid "Web Site"
 msgstr "Веб страна"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c: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-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729
-#: ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Ширина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../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-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087
-#: ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Висина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Има фокус"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Поље"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Име поља"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Модел текста"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Највећа дужина имена поља"
 
@@ -3276,85 +3421,83 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Послобна е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Кућна е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Друга е-пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Изабрано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Има курсор"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у читачу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Пошаљи поруку за..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Умножи електронску _адресу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(мапа)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "мапа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Чланови листе"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "_Одељење:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "_Занимање:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Положај"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "_Видео разговор:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c: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:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3365,81 +3508,75 @@ msgstr "_Видео разговор:"
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Слободно/заузето"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "_Лична страна:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "_Веб лог:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "_Рођендан:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "_Годишњица:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Титула на послу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Лична страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Успех"
 
 # E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Основни процес је заузет"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Архива ван мреже"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Именик не постоји"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Лични контакт није дефинисан"
 
@@ -3448,112 +3585,131 @@ msgstr "Лични контакт није дефинисан"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Забрањен приступ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Контакт није пронађен"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "ИБ контакта већ постоји"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Отказано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Није могуће одустати"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Неуспела аутентификација"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Аутентификација обавезна"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS није доступан"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Нема таквог извора"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Није доступно у режиму ван мреже"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Друга грешка"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Неисправна верзија сервера"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Метод аутентификације није подржан"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
-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 "Отварање овог адресара није могуће. То значи да он или није означен за коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте овај адресар када се повежете ради преузимања његовог садржаја"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
-#, 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 "Отварање овог адресара није могуће.  Проверите да путања %s постоји и да имате права приступа."
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+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 ""
+"Отварање овог адресара није могуће. То значи да он или није означен за "
+"коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте овај "
+"адресар када се повежете ради преузимања његовог садржаја"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-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 "Отварање овог адресара није могуће.  То значи да сте или унели погрешну адресу, или је LDAP сервер недоступан."
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, fuzzy, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Отварање овог адресара није могуће.  Проверите да путања %s постоји и да "
+"имате права приступа."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
-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 "Ова верзија Еволуције нема у себи подршку за LDAP.  Уколико желите да користите LDAP у Еволуцији, морате да инсталирате пакет Еволуције са подршком за LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+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 ""
+"Ова верзија Еволуције нема у себи подршку за LDAP.  Уколико желите да "
+"користите LDAP у Еволуцији, морате да инсталирате пакет Еволуције са "
+"подршком за LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "Отварање овог адресара није могуће.  То значи да сте или унели погрешну адресу, или је сервер недоступан."
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Отварање овог адресара није могуће.  То значи да сте или унели погрешну "
+"адресу, или је сервер недоступан."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, fuzzy
+msgid "Detailed error message:"
 msgstr "Детаљи грешке:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3565,10 +3721,11 @@ msgstr ""
 "Прецизније обликујте упит или повећајте ограничење\n"
 "броја резултата у поставкама адресара за сервер директоријума."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
 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 ""
@@ -3577,45 +3734,45 @@ msgstr ""
 "упит или повећајте временско ограничење у поставкама адресара\n"
 "за сервер директоријума."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Основни процес овог адресара није могао да обради упит."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr "Основни процес овог адресара је одбио да обави овај упит."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Овај упит није успешно завршен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Грешка при додавању листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Грешка при додавању контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Грешка при измени листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Грешка при уклањању листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Грешка при уклањању контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3633,16 +3790,16 @@ msgstr[2] ""
 "Отварање %d контакта ће отворити и %d нових прозора.\n"
 "Да ли заиста желите да прикажете ове контакте?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Не приказуј"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Прикажи _све контакте"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3651,15 +3808,15 @@ msgstr ""
 "%s већ постоји\n"
 "Желите ли да препишете?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Препиши"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3667,50 +3824,50 @@ msgstr[1] "контакти"
 msgstr[2] "контакта"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Изабери именик"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "листа"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Премести контакт у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Умножи контакт у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Премести контакте у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Умножи контакте у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Вишеструке вКарте"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "вКарта за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Контакт подаци за %s"
@@ -3719,7 +3876,7 @@ msgstr "Контакт подаци за %s"
 msgid "Querying Address Book..."
 msgstr "Слање упита именику..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3727,16 +3884,16 @@ msgstr[0] "Постоји још %d контакт."
 msgstr[1] "Постоји још %d контакта."
 msgstr[2] "Постоји још %d контакта."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Прикажи пуну вКарту"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Прикажи сажету вКарту"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Сачувај у адресар"
 
@@ -3745,11 +3902,10 @@ msgid "Card View"
 msgstr "Преглед карте"
 
 #: ../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 "Увожење..."
 
@@ -3777,19 +3933,19 @@ msgstr "Evolution CSV или Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Еволуцијин CSV и Tab увозник"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP облик размене података (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Еволуција LDIF увозник"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "вКарта (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Еволуцијин увозник вКарти"
 
@@ -3834,12 +3990,11 @@ msgid "Format"
 msgstr "Формат"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432
-#: ../widgets/table/e-table-click-to-add.c: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:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Заглавље"
@@ -3942,9 +4097,9 @@ msgstr "Сенчење"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c: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 "Величина:"
 
@@ -3973,29 +4128,8 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "_Словни лик..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Проба уређивача стила за штампање контакта"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Ауторско право (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Ово испробава елемент уређивача стила за штампање контакта"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Проба штампе контакта"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Ово испробава код за штампу контакта"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c: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 "Датотека не може бити отворена"
@@ -4008,75 +4142,98 @@ msgstr "Листа адресара није доступна"
 msgid "failed to open book"
 msgstr "неуспело отварање књиге"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "ИЗЛАЗНА-ДАТОТЕКА"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Листа фасцикли локалног адресара"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Прикажи карте као вкарту или csv датотеку"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Извези у неусклађеном режиму"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
-msgstr "Број карти у једној излазној датотеци у неусклађеном режиму, подразумевана величина 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:62
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Број карти у једној излазној датотеци у неусклађеном режиму, подразумевана "
+"величина 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "БРОЈ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "Грешка у аргументима команде, користите опцију --help да видите како се користи."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Грешка у аргументима команде, користите опцију --help да видите како се "
+"користи."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Подржава само csv или vcard облик."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "У неусклађеном режиму, излаз мора бити датотека."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "У нормалном режиму, нема потребе за подешавањем величине."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
 #. 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}“ је само за читање и није подложан изменама. Изаберите други календар са бочне траке у погледу Календара."
+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}“ је само за читање и није подложан изменама. Изаберите други "
+"календар са бочне траке у погледу Календара."
 
 #. 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}“ је само за читање и није га могуће мењати. Изаберите други календар који прихвата заказивање."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"Календар „{0}“ је само за читање и није га могуће мењати. Изаберите други "
+"календар који прихвата заказивање."
 
 #: ../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 "Додавањем смисленог кратког описа Вашем састанку даћете примаоцима до знања у вези чега заказујете састанак."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Додавањем смисленог кратког описа Вашем састанку даћете примаоцима до знања "
+"у вези чега заказујете састанак."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "Додавањем смисленог кратког описа Вашем задужењу даћете примаоцима до знања шта је задужење."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+"Додавањем смисленог кратког описа Вашем задужењу даћете примаоцима до знања "
+"шта је задужење."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4087,8 +4244,12 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Сви подаци у овој белешци биће обрисани и неће се моћи повратити."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
-msgstr "Сви подаци о овим заказаним састанцима биће обрисани и неће се моћи повратити."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Сви подаци о овим заказаним састанцима биће обрисани и неће се моћи "
+"повратити."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4096,11 +4257,15 @@ msgstr "Сви подаци о овим задужењима биће уклоњ
 
 # calendar:prompt-delete-appointment secondary
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Сви подаци о овом заказаном састанку ће бити обрисани и неће се моћи повратити."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"Сви подаци о овом заказаном састанку ће бити обрисани и неће се моћи "
+"повратити."
 
 #: ../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 "Сви подаци о овом састанку ће бити уклоњени и неће се моћи повратити."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4144,19 +4309,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурно желите да обришете овај заказани састанак?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурно желите да обришете овај састанак?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Сигурно желите да обришете овау белешку?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете ово задужење?"
@@ -4174,274 +4339,349 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Сигурно желите да пошаљете задужење без сачињеног прегледа?"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Calendar repository is offline."
+msgstr "Архива ван мреже"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Не могу направити један нови догађај"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Не могу сачувати догађај"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Обрисати календар ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Обрисати списак белешки „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Обрисати списак задужења ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Не шаљ_и"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Преузимање у току. Желите ли да сачувате заказани састанак?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Преузимање у току. Желите ли да сачувате задужење?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Уређивач није могао бити учитан."
 
-#: ../calendar/calendar.error.xml.h:37
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "Позивнице е-поштом биће послате свим учесницима да би могли да прихвате ово задужење."
-
-# bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Позивнице ће бити послате е-поштом свим учесницима и омогућиће им да одговоре."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Позивнице е-поштом биће послате свим учесницима да би могли да прихвате ово "
+"задужење."
 
+# bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Позивнице ће бити послате е-поштом свим учесницима и омогућиће им да "
+"одговоре."
+
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Грешка при учитавању календара"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Грешка при учитавању списка белешки"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Грешка при учитавању списка задужења"
 
-#: ../calendar/calendar.error.xml.h:42
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће знати да је састанак отказан."
-
-#: ../calendar/calendar.error.xml.h:43
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
-msgstr "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће знати да је белешка обрисана."
-
+#. 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 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће знати да је задужење обрисано."
+#, fuzzy
+msgid "Error on '{0}'"
+msgstr "Грешка приликом {0}."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Слање освежених података омогућава осталим учесницима да њихов календар буде у току."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
+"знати да је састанак отказан."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Слање освежених података омогућава осталим учесницима да њихов списак задужења буде у току."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
+"знати да је белешка обрисана."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "Преузима се неколико прилога. Уколико сада сачувате заказани састанак ови прилози неће бити сачувани са њим."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
+"знати да је задужење обрисано."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "Преузимање неколико прилога је у току. Уколико сада сачувате задужење ови прилози неће бити сачувани са њим."
+msgid "No response from the server."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "Сачувај заказани састанак"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "Сачува белешку"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "Сачувај задужење"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Слање освежених података омогућава осталим учесницима да њихов календар буде "
+"у току."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Слање освежених података омогућава осталим учесницима да њихов списак "
+"задужења буде у току."
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Преузима се неколико прилога. Уколико сада сачувате заказани састанак ови "
+"прилози неће бити сачувани са њим."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Преузимање неколико прилога је у току. Уколико сада сачувате задужење ови "
+"прилози неће бити сачувани са њим."
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "На текућој верзији сервера неке могућности можда неће исправно радити"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календар Еволуције је неочекивано завршио."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Календар Еволуције је неочекивано завршио."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Календар Еволуције је неочекивано завршио."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Еволуција задужења су неочекивано завршила."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Овај календар није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Списак белешки није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Списак задужења није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Овај календар ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Овај списак белешки ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Овај списак задужења ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Није могуће отварање календара „%s“"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Желите ли да сачувате промене на заказаном састанку?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Желите ли да сачувате промене у овим белешкама?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Желите ли да сачувате промене на задужењу?"
 
-#: ../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 "Желите ли да пошаљете обавештење о отказивању за овау белешку?"
 
 # calendar:prompt-cancel-task primary
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Желите ли да пошаљете свим учесницима обавештење о отказивању?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Желите ли да пошаљете позиве на састанак учесницима?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Желите ли да пошаљете ово задужење учесницима?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о састанку учесницима?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о задужењу учесницима?"
 
-#: ../calendar/calendar.error.xml.h:68
-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 "Повезујете се на неподржан GroupWise сервер што може да доведе до проблема у раду Еволуције. Најбоље је да сервер буде надограђен на подржану верзију."
+#: ../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 ""
+"Повезујете се на неподржан GroupWise сервер што може да доведе до проблема у "
+"раду Еволуције. Најбоље је да сервер буде надограђен на подржану верзију."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Променили сте овај заказани састанак, али промене још нисте сачували."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Променили сте ово задужење, али промене још нисте сачували."
 
-#: ../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 "Променили сте ову белешку, али промене још нисте сачували."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Календари неће бити доступни док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Белешка неће бити доступна док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Задужења неће бити доступна док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Занемари промене"
 
-#: ../calendar/calendar.error.xml.h:76
-#: ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "Сачувај про_мене"
 
-#: ../calendar/calendar.error.xml.h:78
-#: ../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 "_Пошаљи"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "Пошаљи по_дсетник"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Подели вишедневне догађаје:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "Неуспело покретање еволуција-сервера-података"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Неуспело читање програмског блока пилотовог Календара"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Неуспело читање пилотовог блока белешки"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Неуспео упис пилотовог блока белешки"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Подразумевана важност:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неуспело читање пилотовог ToDo програмског блока"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "Неуспео упис у пилотов блок „урадити“"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Календар и задужења"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4482,28 +4722,21 @@ msgid "Memo_s"
 msgstr "Бе_лешке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280
-#: ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774
-#: ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101
-#: ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Белешке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642
-#: ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4525,29 +4758,29 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Сервис за упозорења Еволуција календара"
 
 # bug: plural-forms
-#: ../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] "минут"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: ../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] "сат"
 msgstr[1] "сата"
 msgstr[2] "сати"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Време почетка"
 
@@ -4558,10 +4791,10 @@ msgstr "Заказани састанци"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Место:"
 
@@ -4570,57 +4803,57 @@ msgid "Snooze _time:"
 msgstr "Време _дремања:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h: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 "_Уређивање"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "Дре_мање"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "заказано место састанка"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Нема доступног прегледа."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "Нема доступног описа."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Нема доступног податка о месту."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Број постављених аларма: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4632,31 +4865,35 @@ msgstr ""
 "подсетник подешен да пошаље поруку. Еволуција ће\n"
 "уместо тога приказати нормално прозорче."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is 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 ""
-"Подсетник Еволуција календара ће бити покренут. Овај подсетник је подешен да покрене следећи програм:\n"
+"Подсетник Еволуција календара ће бити покренут. Овај подсетник је подешен да "
+"покрене следећи програм:\n"
 "\n"
 "        %s\n"
 "\n"
 "Сигурно желите да покренете овај програм?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Није могуће покренути Бонобо"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Није могуће покренути сервис за упозорења, можда је већ активан..."
 
 #: ../calendar/gui/alarm-notify/util.c:44
@@ -4664,8 +4901,7 @@ msgid "invalid time"
 msgstr "неисправно време"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4675,8 +4911,7 @@ msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 
 #. 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"
@@ -4688,8 +4923,7 @@ msgstr[2] "%d минута"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4703,560 +4937,681 @@ msgid "Alarm programs"
 msgstr "Програми за аларм"
 
 #: ../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 "Време у секундама за које се приказује грешка у статусној линији."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Тражи потврду за брисање предмета"
 
-#: ../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 "Боја позадине задужења за данас, у облику „#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 "Боја позадине неиспуњених задужења, у облику „#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 "Календари за које се покреће аларм"
 
-#: ../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 "Боја за исцртавање Маркус Бејнс линије у линији времена (подразумевано је празно)."
-
 #: ../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 ""
+"Боја за исцртавање Маркус Бејнс линије у линији времена (подразумевано је "
+"празно)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Боја за исцртавање Маркус Бејнс линије у дневном прегледу."
 
-#: ../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 "Сажми викенде у месечни преглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Потврди пражњење"
 
-#: ../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 "Потребно је означити дане којима почињу и завршавају се радни часови."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Подразумевани подсетник за састанак"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Подразумеване јединице подсетника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Подразумевана вредност подсетника"
 
-#: ../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 "Директоријум за чување звучних датотека аларма"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Степен догађаја"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Провидност догађаја"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Адресе сервера за слободно/заузето време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Модел адреса за слободно/заузето време"
 
-#: ../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 "Степен догађаја у прегледу календара."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Сакриј завршена задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Сакриј јединице задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Сакриј вредност задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Позиција положене површи"
 
-#: ../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 "Сат којим се завршава радна недеља, у двадесетчетворочасовном облику, од 0 до 23."
+msgstr ""
+"Сат којим се завршава радна недеља, у двадесетчетворочасовном облику, од 0 "
+"до 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 "Сат којим почиње радна недеља, у двадесетчетворочасовном облику, од 0 до 23."
+msgstr ""
+"Сат којим почиње радна недеља, у двадесетчетворочасовном облику, од 0 до 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 "Интервали приказани у дневним и недељним прегледима, у минутима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Последње време за аларм"
 
-#: ../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 "Ниво након којег се порука заводи у дневник."
+
+#: ../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 "Списак адреса сервера за објављивање слободног/заузетог времена."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Маркус Бејнс линија"
 
-#: ../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 "Боја Маркус Бејнс линије - дневни преглед"
 
-#: ../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 "Боја Маркус Бејнс линије - линија времена"
 
-#: ../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 "Минут којим се завршава радни дан, од 0 до 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 "Минут којим почиње радни дан, од 0 до 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 "Позиција положене површи месечног прегледа"
 
-#: ../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 "Позиција усправне површи месечног прегледа"
 
-#: ../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 "Број јединица за одређивање подразумеваног подсетника."
 
-#: ../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 "Број јединица за одређивање када сакрити задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Боја прекорачених задужења"
 
-#: ../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 "Позиција положене површи, између дела календара за датум и листе задужења када није постављен месечни преглед, у пикселима."
+#: ../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 ""
+"Позиција положене површи, између дела календара за датум и листе задужења "
+"када није постављен месечни преглед, у пикселима."
 
-#: ../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 "Позиција положене површи, између прегледа и дела календара за датум и листе задужења у месечном прегледу, у пикселима."
+#: ../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 ""
+"Позиција положене површи, између прегледа и дела календара за датум и листе "
+"задужења у месечном прегледу, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "Положај усправне површи, између листе календара и навигације календара по датуму."
+#: ../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 ""
+"Положај усправне површи, између листе календара и навигације календара по "
+"датуму."
 
-#: ../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 "Позиција усправне површи, између листе задужења и панела за преглед задужења, у пикселима."
+#: ../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 ""
+"Позиција усправне површи, између листе задужења и панела за преглед "
+"задужења, у пикселима."
 
-#: ../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 "Позиција усправне површи, између прегледа и дела календа за датум и листе задужења у месечном прегледу, у пикселима."
+#: ../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 ""
+"Позиција усправне површи, између прегледа и дела календа за датум и листе "
+"задужења у месечном прегледу, у пикселима."
 
-#: ../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 "Позиција усправне површи, између прегледа и дела календара за датум и листе задужења када није постављен месечни преглед, у пикселима."
+#: ../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 ""
+"Позиција усправне површи, између прегледа и дела календара за датум и листе "
+"задужења када није постављен месечни преглед, у пикселима."
 
-#: ../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 "Програми који могу бити покренути алармима."
 
-#: ../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 "Директоријум за чување звучних аларма"
 
-#: ../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 "Прикажи RSVP поље у уређивачу догађаја/задужења/сусрета"
 
-#: ../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 "Прикажи поље улоге у уређивачу догађаја/задужења/сусрета"
 
-#: ../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 "Приказује времена завршетка састанака у недељним и месечним прегледима"
 
-#: ../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 "Прикажи поље категорије у уређивачу догађаја/сусрета/задужења"
 
-#: ../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 "Приказује аларме у обавештајној зони"
 
-#: ../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 "Прикажи поље „Стање“ у уређивачу догађаја/задужења/сусрета"
 
-#: ../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 "Прикажи површ „Преглед“"
 
-#: ../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 "Приказује површ „Преглед“."
 
-#: ../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 "Прикажи поље временске зоне у уређивачу догађаја (сусрета)"
 
-#: ../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 "Прикажи поље „Врста“ у уређивачу догађаја/задужења/сусрета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Приказује бројеве недеља у делу за датум"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Приказује бројеве недеља у делу за датум"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Боја задужења за данас"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Позиција усправне површи задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "Модел адресе за коришћење у повраћају времена слободно/заузето, %u се замењује корисничким делом електронске адресе, а %d доменом."
+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 ""
+"Модел адресе за коришћење у повраћају времена слободно/заузето, %u се "
+"замењује корисничким делом електронске адресе, а %d доменом."
 
-#: ../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\"."
-msgstr "Подразумевана временска зона коју календар користи за датум и време, као непреведено место базе временске зоне Олсен, као „Америка/Њујорк“."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Подразумевана временска зона коју календар користи за датум и време, као "
+"непреведено место базе временске зоне Олсен, као „Америка/Њујорк“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Може имати три могуће вредности. „0“ за грешке. „1“ за упозорења. „2“ за "
+"поруке о дијагнози квара."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Подела _времена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Време последњег покретања аларма, у time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../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 "Провидност докађаја у прегледу календара, вредност између 0 (провидно) и 1 (непровидно)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Провидност докађаја у прегледу календара, вредност између 0 (провидно) и 1 "
+"(непровидно)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24-часовни облик времена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Јединице за подразумевани подсетник, „минути“, „сати“ или „дани“."
+msgstr ""
+"Јединице за подразумевани подсетник, „minutes“ (минути), „hours“ (сати) или "
+"„days“ (дани)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Јединице за одређивање када сакрити задужења, „минути“, „сати“, или „дани“."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Јединице за одређивање када сакрити задужења, „minutes“ (минути), "
+"„hours“ (сати) или „days“ (дани)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Почетак недеље"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Дан којим почиње недеља, од недеље (0) до суботе (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Да ли да користи обавештајну зону за приказивање аларма."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Да ли да тражи потврду за брисање састанка или задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Да ли да тражи потврду при избацивању састанка и задужења."
 
-#: ../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 "Да ли да сажме викенде у месечном прегледу, који суботу и недељу ставља у простор радне недеље."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Да ли да сажме викенде у месечном прегледу, који суботу и недељу ставља у "
+"простор радне недеље."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Да ли да прикаже времена завршетка догађаја у недељним и месечним прегледима."
+msgstr ""
+"Да ли да прикаже времена завршетка догађаја у недељним и месечним прегледима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Да ли да у календару исцрта Маркус Бејнс линију (на тренутно време)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Да ли да сакрије завршена задужења у прегледу задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Да ли да постави подразумевани подсетник за заказане састанке."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Да ли да прикаже RSVP поље у уређивачу догађаја/задужења/састанака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Да ли да прикаже поље категорије у уређивачу догађаја (састанака)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље са улогом у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље са стањем у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Да ли да прикаже време у двадесеточасовном облику уместо am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Да ли да прикаже поље временске зоне у уређивачу догађаја (састанака)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље врсту у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Да ли да прикаже бројеве недеља у делу за датум."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Да ли да прикаже бројеве недеља у делу за датум."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Дали да се користи летње рачунање времена када се приказују догађаји."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Радни дани"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Час којим се завршава радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Минут којим се завршава радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Час којим почиње радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Минут којим почиње радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "Летње рачунање времена"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Преглед садржи"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Категорија је"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Место садржи"
 
-#: ../calendar/gui/cal-search-bar.c:629
-#: ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Не одговара"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Задужења за следећу недељу"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Активна задужења"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Прекорачена задужења"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Завршена задужења"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Задужења са прилозима"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Активни састанци"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Састанци у следећих 7 дана"
 
-#: ../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 "Штампај"
 
-#: ../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 "Ова радња ће трајно обрисати све догађаје пре изабраног рока. Уколико наставите, нећете моћи да повратите ове догађаје."
+#: ../calendar/gui/calendar-commands.c:315
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Ова радња ће трајно обрисати све догађаје пре изабраног рока. Уколико "
+"наставите, нећете моћи да повратите ове догађаје."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/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 "дана"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the 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/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "На вебу"
 
-#: ../calendar/gui/calendar-component.c:310
-#: ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Рођендани и годишњице"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Време"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465
-#: ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "_Омогући за рад ван мреже"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "_Онемогући да ово буде доступно ван мреже"
+
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Неуспела допуна календара."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Није могуће отворити календар ’%s‘ за прављење догађаја и састанака"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Бирач извора календара"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Нови заказани састанак"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Заказано"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Заказује нови састанак"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Прави нови захтев за састанком"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Нови целодневни састанак"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Целодневно за_казивање"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Прави нови целодневни састанак"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
@@ -5276,284 +5631,130 @@ msgstr "Недељни преглед"
 msgid "Month View"
 msgstr "Месечни преглед"
 
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Било које поље"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Прилози"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "_Учесник"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Пословно"
-
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Категорија"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Разврставање"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Такмичење"
-
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:337
-#: ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Поверљиво"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Описи"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Постоји"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Омиљено"
-
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Поклони"
-
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Циљеви/задаци"
-
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Празник"
-
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Честитке"
-
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Важни контакти"
-
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Идеје"
-
-#: ../calendar/gui/caltypes.xml.h:23
-#: ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Међународно"
-
-#: ../calendar/gui/caltypes.xml.h:24
-#: ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Важан клијент"
-
-#: ../calendar/gui/caltypes.xml.h:26
-#: ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Разно"
-
-#: ../calendar/gui/caltypes.xml.h:27
-#: ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Следећих 7 дана"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26
-#: ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Организатор"
 
-#: ../calendar/gui/caltypes.xml.h:30
-#: ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Телефонски позиви"
-
-#: ../calendar/gui/caltypes.xml.h:31
-#: ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:335
-#: ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Лично"
 
-#: ../calendar/gui/caltypes.xml.h:32
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545
-#: ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Јавно"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Учесталост"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31
-#: ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Статус"
-
-#: ../calendar/gui/caltypes.xml.h:35
-#: ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Стратегије"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Преглед"
 
-#: ../calendar/gui/caltypes.xml.h:37
-#: ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Прегледи"
 
-#: ../calendar/gui/caltypes.xml.h:38
-#: ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Снабдевачи"
-
-#: ../calendar/gui/caltypes.xml.h:39
-#: ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Праћење у времену; издаци"
-
-#: ../calendar/gui/caltypes.xml.h:40
-#: ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "ВИП"
-
-#: ../calendar/gui/caltypes.xml.h:41
-#: ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "Чекам"
-
-#: ../calendar/gui/caltypes.xml.h:42
-#: ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "садржи"
 
-#: ../calendar/gui/caltypes.xml.h:43
-#: ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "не садржи"
 
-#: ../calendar/gui/caltypes.xml.h:44
-#: ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49
-#: ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "је"
 
-#: ../calendar/gui/caltypes.xml.h:45
-#: ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "није"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Грешка при отварању календара"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Метод није подржан при отварању календара"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Забрањен приступ календару"
 
-#: ../calendar/gui/comp-editor-factory.c:429
-#: ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -5590,17 +5791,17 @@ msgid "Mes_sage:"
 msgstr "По_рука:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Пушта звук"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Искачуће упозорење"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Покреће програм"
 
@@ -5613,7 +5814,7 @@ msgid "Send To:"
 msgstr "Пошаљи:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Шаље електронску поруку"
 
@@ -5678,25 +5879,58 @@ msgid "A_dd"
 msgstr "_Додај"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Аларми"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи аутоматски приказ прилога"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Прилаже датотеку(е)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ништа"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за које звони сат"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Прикажи _поље у прегледу"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5710,57 +5944,60 @@ msgstr ""
 "10 минута\n"
 "5 минута"
 
-#: ../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 и %d ће бити замењени корисником и доменом из електронске адресе.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u и %d ће бити замењени корисником и доменом из електронске адресе.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Упозорења</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Подразумевани сервер слободног/заузетог времена</span>"
+msgstr ""
+"<span weight=\"bold\">Подразумевани сервер слободног/заузетог времена</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Опште</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Списак задужења</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Време</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Радна седмица</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Подеси за _летње рачунање времена"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Крај _дана:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Приказ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Петак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5770,13 +6007,13 @@ msgstr ""
 "Сати\n"
 "Дана"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Понедељак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5794,242 +6031,261 @@ msgstr ""
 "Субота\n"
 "Недеља"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Бира боју"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "Н_ед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Пошаљи:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Изабери календаре за звучно обавештење"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "При_кажи подсетник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "При_кажи подсетник"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Прикажи _бројеве недеља у делу за датум"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Приказује бројеве недеља у делу за датум"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Недеља"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "З_адужења за данас:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "У_то"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Модел:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Временска _зона:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Облик времена:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Среда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Почетак н_едеље:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Радни дани:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - часовни (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 - часовни"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Тражи потврду за брисање предмета"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Сажми недеље у месечни преглед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "Почетак _дана:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Пет"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Сакриј завршена задужења после"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Пон"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "_Неиспуњена задужења:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_Суб"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "_Прикажи времена завршетка састанака у недељним и месечним прегледима"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "Поделе _времена:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Уто"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_Сре"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "пре сваког састанка"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Умножава садржај календара локално за рад ван мреже"
 
-#: ../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 "_Умножава садржај листе задужења локално за рад ван мреже"
 
-#: ../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 "_Умножава садржај списка белешки локално за рад ван мреже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "Бој_а:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Списак задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Списак белешки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Особине листе задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Но_ви списак задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Особине листе задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Нови списак белешки"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Ово задужење је обрисано."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Ова белешка је обрисана."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Начинили сте промене. Занемарити их и затворити уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Нисте начинили промене, затворити уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Овај догађај је промењен."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ово задужење је промењено."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Ова белешка је промењена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Начинили сте промене. Занемарити их и освежити уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили промене, освежити уређивач?"
@@ -6039,41 +6295,35 @@ msgstr "%s  Нисте начинили промене, освежити уре�
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
 msgid " to "
 msgstr " за "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
 msgid "Completed "
 msgstr "Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
 msgid " (Due "
 msgstr " (До "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
 msgid "Due "
 msgstr "До "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Приложена порука - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410
-#: ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6081,223 +6331,216 @@ msgstr[0] "%d приложена порука"
 msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481
-#: ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-utils.c: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 "Пре_мести"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483
-#: ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Откажи _превлачење"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249
-#: ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "прилог"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Није могуће освежити објекат"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Уреди заказани састанак"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказани састанак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Додељено задужење - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Задужење - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Белешка - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Без прегледа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Притисните овде да затворите текући прозор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Умножи изабрани текст у списак исечака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Сече изабрани текст у списак исечака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Притисните овде за доступну помоћ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Убаци текст из листе исечака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Притисните овде да сачувате текући прозор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Изабери сав текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "Озна_ка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "Дато_тека"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Могућности"
 
-#: ../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:1417 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Притисните овде да приложите неки документ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "Ка_тегорије"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Бира да ли да прикаже категорије"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Бира да ли да прикаже временску зону"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "_Јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Означи као јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Означи као лично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Означи као поверљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "_Улога поље"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Бира да ли је поље Улога приказано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Бира да ли је поље RSVP приказано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Стање поље"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Бира да ли да прикаже поље са стањем"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Врста поље"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Бира да ли је приказана врста присутних"
 
-#: ../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:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Скорашњи _документи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6305,111 +6548,111 @@ msgstr[0] "<b>%d</b> прилог"
 msgstr[1] "<b>%d</b> прилога"
 msgstr[2] "<b>%d</b> прилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Сакриј линију при_лога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Прикажи линију п_рилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193
-#: ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Додај прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Прикажи п_рилоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Притисните размак за приказ(сакривање) линије прилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Промене начињене на овом предмету могу бити занемарене ако буде освежен"
+msgstr ""
+"Промене начињене на овом предмету могу бити занемарене ако буде освежен"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Није могуће коришћење текуће верзије!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Није могуће отварање извора"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Није могуће отварање одредишта"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Одредиште је само за читање"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ибриши ову ставку из свих осталих поштанских сандучића примаоца?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Догађај није могао бити обрисан због corba грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задужење није могло бити избрисано због corba грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Белешка није могло бити обрисана због corba грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Предмет није могао бити обрисан због corba грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Догађај није могао бити обрисан јер приступ није дозвољен"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задужење није могло бити обрисано јер приступ није дозвољен"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Белешка није могла бити обрисана јер приступ није дозвољен"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Предмет није могао бити обрисан јер приступ није дозвољен"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Догађај није могао бити обрисан услед грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Задужење није могло бити обрисано услед грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Белешка није могла бити обрисана услед грешке"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Предмет није могао бити обрисан услед грешке"
 
@@ -6426,142 +6669,143 @@ msgstr "Делегирај:"
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "Ала_рми"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Притисните овде да навијете или искључите сат за овај догађај"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "Учеста_лост"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Нека ова појава буде покретна"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Опције слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Уметни напредне могућности слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Целодневни догађа_ј"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Бира да ли дозволити целодневне догађаје"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Прикажи време као _заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Бира да ли да прикаже време као заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "С_лободно/заузето:"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Затражи податак за слободно/заузето време за ове учеснике"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Зака_зани састанак"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2725
 msgid "This event has alarms"
 msgstr "За овај догађај је навијен сат"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "Делегат_и"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Уч_есници"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Најмање један учесник је потребан."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Додај "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Није могуће отварање календара ’%s‘."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Делујете у име %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6569,7 +6813,7 @@ msgstr[0] "%d дан пре заказаног састанка"
 msgstr[1] "%d дана пре заказаног састанка"
 msgstr[2] "%d дана пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6577,7 +6821,7 @@ msgstr[0] "%d сат пре заказаног састанка"
 msgstr[1] "%d сата пре заказаног састанка"
 msgstr[2] "%d сати пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6585,37 +6829,10 @@ msgstr[0] "%d минут пре заказаног састанка"
 msgstr[1] "%d минута пре заказаног састанка"
 msgstr[2] "%d минута пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Прилагоди"
 
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158
-#: ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685
-#: ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306
-#: ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Ништа"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 дан пре заказаног састанка"
@@ -6692,24 +6909,19 @@ msgstr "Конта_кти..."
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Није могуће отварање белешки у „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002
-#: ../mail/em-format-html.c:1562
-#: ../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 "Прима"
 
@@ -6723,58 +6935,63 @@ msgid "T_o:"
 msgstr "_Прима:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Мењате повратни догађај, шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Делегирате повратни догађај, шта желите да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Мењате повратно задужење, шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Мењате повратну белешку. Шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Само овај унос"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Овај и претходне уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Овај и будуће уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Све уносе"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Овај заказани састанак садржи понављања која Еволуција не може да уреди."
+msgstr ""
+"Овај заказани састанак садржи понављања која Еволуција не може да уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Датум понављања није исправан"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "на"
 
@@ -6782,7 +6999,7 @@ msgstr "на"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "првој"
 
@@ -6791,7 +7008,7 @@ msgstr "првој"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "другој"
 
@@ -6799,7 +7016,7 @@ msgstr "другој"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "трећој"
 
@@ -6807,7 +7024,7 @@ msgstr "трећој"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "четвртој"
 
@@ -6815,13 +7032,13 @@ msgstr "четвртој"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "последњој"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Други датум"
 
@@ -6829,7 +7046,7 @@ msgstr "Други датум"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "од првог до десетог"
 
@@ -6837,7 +7054,7 @@ msgstr "од првог до десетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "од једанаестог до двадесетог"
 
@@ -6845,45 +7062,45 @@ msgstr "од једанаестог до двадесетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "од двадесет првог до тридесет првог"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "дан"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "појаве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Не може да нађе избор ради мењања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Измени изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Не може да нађе избор ради брисања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -6934,6 +7151,10 @@ msgstr "недеља(е)"
 msgid "year(s)"
 msgstr "година(е)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6955,64 +7176,55 @@ msgstr "<span weight=\"bold\">Статус</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642
-#: ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Завршено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Висока"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "У току"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Мала"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974
-#: ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Обична"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640
-#: ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Није започето"
 
@@ -7025,8 +7237,7 @@ msgid "Stat_us:"
 msgstr "_Стање:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570
-#: ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Неодређена"
 
@@ -7052,28 +7263,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "Кликни за промену или детаљан преглед стања задужења"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Мог_ућности код слања"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Задужење"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Детаљи задужења"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Није могуће отварање задужења у ’%s‘."
@@ -7095,7 +7306,7 @@ msgid "Time zone:"
 msgstr "Временска зона:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7104,7 +7315,7 @@ msgstr[1] "%d дана"
 msgstr[2] "%d дана"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -7112,119 +7323,116 @@ msgstr[0] "%d недеља"
 msgstr[1] "%d недеље"
 msgstr[2] "%d недеља"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната радња"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пре почетка састанка"
 
 #. 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 након почетка састанка"
 
 #. 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 на почетку састанка"
 
 #. 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 пре краја састанка"
 
 #. 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 након завршетка састанка"
 
 #. 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 на крају састанка"
 
 #. 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 на %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 за непознат тип покретача"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73
-#: ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Притисните да отворите %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177
-#: ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
-#: ../calendar/gui/e-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 "Опис:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Преглед:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Датум за завршетак:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Важност:"
 
@@ -7238,17 +7446,17 @@ msgid "Start Date"
 msgstr "Датум почетка"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Слободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Заузето"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7258,256 +7466,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339
-#: ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203
-#: ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111
-#: ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002
-#: ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Поновно"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-popup.c:183
-#: ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: ../calendar/gui/e-cal-popup.c:199
-#: ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Изаберите фасциклу за чување изабраних прилога..."
 
-#: ../calendar/gui/e-cal-popup.c:231
-#: ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неименована_слика.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
-#: ../calendar/gui/e-cal-popup.c:286
-#: ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Сачувај изабрано"
 
-#: ../calendar/gui/e-cal-popup.c:428
-#: ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Без прегледа *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Почетак:"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "До: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665
-#: ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Брисање изабраних објеката"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795
-#: ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Освежавање објеката"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221
-#: ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Ново зад_ужење"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657
-#: ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "Ш_тампај..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677
-#: ../calendar/gui/e-memo-table.c:931
-#: ../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:1594
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Исеци"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679
-#: ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "У_баци"
 
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Додели задужење"
 
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Проследи као иКалендар"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "_Обележи као завршено"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Обележи изабрана задужења као завршена"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "_Обележи као незавршено"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Обележи изабрана задужења као незавршена"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "_Обриши изабрана задужења"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Кликните за ново задужење"
@@ -7530,8 +7707,8 @@ msgid "Due date"
 msgstr "Датум за завршетак"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Важност"
 
@@ -7539,97 +7716,139 @@ msgstr "Важност"
 msgid "Start date"
 msgstr "Датум почетка"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Статус"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Премештање предмета"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Умножавање предмета"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Нови _састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Нови _састанак"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Тренутни преглед"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Изабери _данашњи дан"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Изабери датум..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "Штам_пај..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "О_дговори"
 
-#: ../calendar/gui/e-calendar-view.c:1689
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566
-#: ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Прихваћено"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Одбијено"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Са резервом"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Делегирано"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+#, fuzzy
+msgid "Needs action"
+msgstr "Потребна радња"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7639,7 +7858,7 @@ msgstr "Време: %s %s"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. 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 %m/%d/%Y %H:%M:%S"
 
@@ -7648,11 +7867,11 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. 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 %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7665,11 +7884,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 "%02i минутни размаци"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Прикажи површ „Преглед“"
+
 # %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
@@ -7681,32 +7905,34 @@ msgstr "%02i минутни размаци"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791
-#: ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794
-#: ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Недеља"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложено понављање)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7714,7 +7940,7 @@ msgstr[0] "Сваки %d дан"
 msgstr[1] "Свака %d дана"
 msgstr[2] "Сваких %d дана"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7722,7 +7948,7 @@ msgstr[0] "Сваке %d недеље"
 msgstr[1] "Сваке %d недеље"
 msgstr[2] "Сваких %d недеља"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7731,22 +7957,22 @@ msgstr[1] "Сваке %d недеље у "
 msgstr[2] "Сваких %d недеља у "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s дан од "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s од "
 
 # слично као за недеље
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7755,7 +7981,7 @@ msgstr[1] "свака %d месеца"
 msgstr[2] "сваких %d месеци"
 
 # слично као за месеце и недеље
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7763,349 +7989,335 @@ msgstr[0] "Сваке %d године"
 msgstr[1] "Сваке %d године"
 msgstr[2] "Сваких %d година"
 
-#: ../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] "укупно %d пут"
 msgstr[1] "укупно %d пута"
 msgstr[2] "укупно %d пута"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", завршавајући се "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Почиње"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Завршава се"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Рок"
 
-#: ../calendar/gui/e-itip-control.c:1003
-#: ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "иКалендар подаци"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "иКалендар грешка"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Непозната особа"
 
 #. 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> Проверите следећи податак, и потом изаберите радњу из доњег менија."
-
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "Прихваћено"
+#: ../calendar/gui/e-itip-control.c:1138
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Проверите следећи податак, и потом изаберите радњу из доњег менија."
 
-#: ../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:2195
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "Одбијено"
-
-#: ../calendar/gui/e-itip-control.c:1283
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1278
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "Састанак је отказан, међутим није га могуће наћи у Вашим календарима"
 
-#: ../calendar/gui/e-itip-control.c:1285
-msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "Задужење је отказано, међутим није га могуће наћи у Вашим списковима задужења"
+#: ../calendar/gui/e-itip-control.c:1280
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"Задужење је отказано, међутим није га могуће наћи у Вашим списковима задужења"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> објави податак о састанку."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Податак о састанку"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> захтева присуство %s на састанку."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> захтева Ваше присуство на састанку."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Предлог за састанак"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> жели да буде део постојећег састанка."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Освежавање састанка"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добије најновија обавештења о састанку."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Захтев за освежавањем састанка"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> одговори на захтев за састанак."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Одговор за састанак"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> отказа састанак."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Отказивање састанка"
 
-#: ../calendar/gui/e-itip-control.c:1411
-#: ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> посла неразумљиву поруку."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Лоша порука о састанку"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> објави податак о задужењу."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Податак о задужењу"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> тражи %s за извршавање задужења."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> тражи да Ви извршите задужење."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Предлог за задужење"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b жели да буде део постојећег задужења."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Освежавање задужења"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жели да прима најновија обавештења о задужењу."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Захтев за освежавањем задужења"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> одговори на додељено задужење."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Одговор на задужење"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> отказа задужење."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Отказивање задужења"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Лоша порука о задужењу"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> објави слободно/заузето време."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Слободно/заузето време"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> пита када сте слободни/заузети."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Слободно/заузето захтев"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> одговори на слободно/заузето захтев."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Слободно/заузето одговор"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободно/заузето порука"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "Порука изгледа да није исправно сачињена"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Порука садржи само неподржане захтеве."
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прилог не садржи исправну поруку за календар"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема предмете календара који се могу прегледати"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Освежавање завршено\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат није исправан и не може бити освежен\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао присутан учесник.  Додати га у присутне?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање учесника није освежено јер нема исправано стање!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Освежен статус учесника\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стање учесника није освежено јер предмет више не постоји"
 
-#: ../calendar/gui/e-itip-control.c:2111
-#: ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "Предмет послат!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117
-#: ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "Предмет није могао бити послат!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Изаберите радњу:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Освежи"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободно/заузето податак"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Освежи статус саговорника"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Пошаљи најновији податак"
 
-#: ../calendar/gui/e-itip-control.c:2470
-#: ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Поништи"
 
@@ -8133,120 +8345,86 @@ msgstr "Учитавање календара..."
 msgid "Server Message:"
 msgstr "Порука сервера:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Председавајући"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Обавезни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Могући учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Извори"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740
-#: ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Појединац"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90
-#: ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Извор"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Место"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Потребна радња"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "Са резервом"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "Делегирано"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Учесник"
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "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 "У току"
 
@@ -8254,7 +8432,7 @@ msgstr "У току"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8268,7 +8446,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:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y."
 
@@ -8283,67 +8461,67 @@ msgstr "%a %d/%m/%Y."
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Нема податка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Уч_есници..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "О_пције"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Освежи слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
@@ -8371,18 +8549,15 @@ msgstr "Језик"
 msgid "Member"
 msgstr "Члан"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Обриши изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:1093
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Притисните да додате белешку"
 
-#: ../calendar/gui/e-memos.c:760
-#: ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8391,17 +8566,16 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Учитавање белешки је у току"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Отварање белешки са %s је у току"
 
-#: ../calendar/gui/e-memos.c:1062
-#: ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Брисање изабраних објеката..."
 
@@ -8409,20 +8583,20 @@ msgstr "Брисање изабраних објеката..."
 msgid "Loading tasks"
 msgstr "Учитавање задужења"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварање задужења у %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Завршавање задужења..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Избацивање"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Изаберите временску зону"
 
@@ -8431,44 +8605,43 @@ msgstr "Изаберите временску зону"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343
-#: ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "Пр_илагођен преглед"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "Сачувај прилагођен прег_лед"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "Одре_ди прегледе..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавање састанака са %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавање задужења са %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Учитавање белешки на %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Брисање"
 
@@ -8528,70 +8701,132 @@ msgstr "Септембар"
 msgid "_Select Today"
 msgstr "_Изабери данашњи дан"
 
-#: ../calendar/gui/itip-utils.c:404
-#: ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:626
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Податак о догађају"
 
-#: ../calendar/gui/itip-utils.c:628
-#: ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Податак о задужењу"
 
-#: ../calendar/gui/itip-utils.c:630
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Подаци о белешки"
 
-#: ../calendar/gui/itip-utils.c:632
-#: ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Слободно/заузето податак"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Податак о календару"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+#, fuzzy
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Прихваћено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Прихваћено с резервом"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#, fuzzy
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Одбијено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Делегирано"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+#, fuzzy
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Освежено"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+#, fuzzy
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Поништи"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+#, fuzzy
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+#, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободно/заузето време (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "иКалендар податак"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8599,8 +8834,7 @@ msgstr[0] "%d белешка"
 msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 
-#: ../calendar/gui/memos-component.c:546
-#: ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8608,94 +8842,93 @@ msgstr[0] ", %d изабрано"
 msgstr[1] "%d изабрана"
 msgstr[2] "%d изабраних"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Неуспела допуна белешки."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Није могуће отварање списка белешки „%s“ за прављење догађаја и састанака"
+msgstr ""
+"Није могуће отварање списка белешки „%s“ за прављење догађаја и састанака"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Ниједан календар није доступан за прављење белешки"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Бирач извора белешки"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Нова белешка"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Белешк_а"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Напиши једну нову белешку"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Нова дељена белешка"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Дељена белешка"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Направи нобу дељену белешку"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Нови списак белешки"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Спи_сак белешки"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Састави нови списак белешки"
 
-#: ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Следећих 7 дана"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since 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 ""
-"Место и хијерархија фасцикли задужења у Еволуцији је измењена од Еволуције 1.х.\n"
+"Место и хијерархија фасцикли задужења у Еволуцији је измењена од Еволуције 1."
+"х.\n"
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
 #: ../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 ""
-"Место и хијерархија фасцикли календара у Еволуцији је измењена од Еволуције 1.х.\n"
+"Место и хијерархија фасцикли календара у Еволуцији је измењена од Еволуције "
+"1.х.\n"
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
 #. 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 "Није могућ пренос старих подешавања из evolution/config.xmldb"
@@ -8719,210 +8952,210 @@ msgstr "Није могућ пренос задужења ’%s‘"
 msgid "Notes"
 msgstr "Напомене"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "Не"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "По"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Ут"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Пе"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Су"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Заказани састанак"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Задужење"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Преглед: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Присутни:"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Контакти: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "Но_ви списак задужења"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8930,79 +9163,80 @@ msgstr[0] "%d задужење"
 msgstr[1] "%d задужења"
 msgstr[2] "%d задужења"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Неуспела допуна задужења."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Није могуће отварање листе задужења ’%s‘ за прављење догађаја и састанака"
+msgstr ""
+"Није могуће отварање листе задужења ’%s‘ за прављење догађаја и састанака"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за прављење задужења"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Бирач извора задужења"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задужење"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Направи ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Ново додељено задужење"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_о задужење"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Додели ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Нова листа задужења"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Листа задуж_ења"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Састави нову листу задужења"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ова операција ће трајно обрисати сва задужења обележена као завршена. Ако наставите, нећете моћи да повратите ова задужења.\n"
+"Ова операција ће трајно обрисати сва задужења обележена као завршена. Ако "
+"наставите, нећете моћи да повратите ова задужења.\n"
 "\n"
 "Заиста обрисати ова задужења?"
 
-#: ../calendar/gui/tasks-control.c:455
-#: ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "Не питај ме поново."
 
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Штампај задужења"
 
@@ -9011,59 +9245,57 @@ msgstr "Штампај задужења"
 msgid "% Completed"
 msgstr "% завршено"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "У току"
 
-#: ../calendar/gui/tasktypes.xml.h:50
-#: ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "је веће од"
 
-#: ../calendar/gui/tasktypes.xml.h:51
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "је мање од"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "иКалендар датотеке (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Еволуција иКалендар увозник"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Подсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "вКалендар датотеке (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Еволуција вКалендар увозник"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Календарски догађаји"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Еволуција календар интелигентни увозник"
 
@@ -10618,224 +10850,227 @@ msgstr "Пацифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Није могуће отворити аутоматски сачувану датотеку"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Није могуће вратити поруку из уређивача"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Уметни прилог"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "При_ложи"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Неименована порука"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Приложи датотеку"
 
-#: ../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 "_Затвори"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Затвори тренутну датотеку"
 
-#: ../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 "Штам_пај..."
 
-#: ../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 "Пре_глед пред штампу"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Сачувај тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Сачувај тренутну датотеку под другим именом"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Сачувај _припрему"
+#: ../composer/e-composer-actions.c:511
+#, fuzzy
+msgid "Save as _Draft"
+msgstr "Сачувај као припрему"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Сачувај као припрему"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "Пош_аљи"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Пошаљи ову поруку"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Уметни опције слања"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Нова _порука"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Ко_дна страна"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Сигурност"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP _шифруј"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Шифруј ову поруку помоћу PGP-а"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP _потпиши"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Потпиши ову поруку помоћу PGP кључа"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "В_ажности поруке"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Постави важност поруке на високо"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "Т_ражи признаницу"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Прими извештај о достави када је ваша порука прочитана"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "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 "Шифруј ову поруку помоћу S/MIME сертификата за шифровање"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "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 "Потпиши ову поруку S/MIME сертификатом"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "_Bcc поље"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље BCC приказано"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "_Cc поље"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље CC приказано"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "Ш_аље поље"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Бира да ли је поље Шаље приказано"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "_Пошаљи поље"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Бира да ли је поље Пошаљи приказано"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Одго_вор поље"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор приказано"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Поље за _тему"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Бира да ли да прикаже поље за тему"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "_Прима поље"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Бира да ли је поље Прима приказано"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#, fuzzy
+msgid "Save Draft"
+msgstr "Сачувај _припрему"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити копију (cc) поруке"
 
-#: ../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 "Унесите адресе које ће примити копију поруке без појављивања у листи прималаца поруке"
+#: ../composer/e-composer-header-table.c:69
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"Унесите адресе које ће примити копију поруке без појављивања у листи "
+"прималаца поруке"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "Ш_аље:"
 
@@ -10843,31 +11078,31 @@ msgstr "Ш_аље:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Одговор:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Копија (Cc):"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Невидљива копија (Bcc):"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "С_лање на:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "На_слов:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
@@ -10887,23 +11122,27 @@ msgstr "Изаберите фасцикле за слање поруке."
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-composer-private.c:180
-#: ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Прикажи лини_ју прилога"
 
-#: ../composer/e-msg-composer.c:872
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Није могуће потписивање одлазеће поруке: није постављен сертификат за потписивање за овај налог"
+#: ../composer/e-msg-composer.c:866
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Није могуће потписивање одлазеће поруке: није постављен сертификат за "
+"потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:879
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Није могуће шифровање одлазеће поруке: није постављен сертификат за шифровање за овај налог"
+#: ../composer/e-msg-composer.c:873
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Није могуће шифровање одлазеће поруке: није постављен сертификат за "
+"шифровање за овај налог"
 
-#: ../composer/e-msg-composer.c:1500
-#: ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405
-#: ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10911,29 +11150,37 @@ msgstr[0] "Прилог"
 msgstr[1] "Прилози"
 msgstr[2] "Прилога"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Сакриј ли_нију прилога"
 
-#: ../composer/e-msg-composer.c:1573
-#: ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4055
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-msgstr "<b>(Састављач у телу поруке не садржи текст, што не може бити измењено.)<b>"
+#: ../composer/e-msg-composer.c:4093
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+"<b>(Састављач у телу поруке не садржи текст, што не може бити измењено.)<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 " Преузима се неколико прилога. Уколико сада пошаљете поруку ови прилози неће бити послати са њом "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Преузима се неколико прилога. Уколико сада пошаљете поруку ови прилози неће "
+"бити послати са њом "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Сви налози су уклоњени."
 
 #: ../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 "Сигурно желите да одбаците поруку, насловљену ’{0}‘, коју састављате?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10950,8 +11197,14 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Због &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 "Затварањем овог прозора за састављање ћете трајно одбацити поруку, осим ако одлучите да сачувате поруку у фасциклу Припрема. Ово ће Вам омогућити да наставите поруку касније."
+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 ""
+"Затварањем овог прозора за састављање ћете трајно одбацити поруку, осим ако "
+"одлучите да сачувате поруку у фасциклу Припрема. Ово ће Вам омогућити да "
+"наставите поруку касније."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -10991,12 +11244,21 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Грешка у чувању самочувајуће датотеке због &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 "Еволуција је неочекивано завршила током писања нове поруке. Спашавање поруке ће Вам омогућити да наставите где сте стали."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Еволуција је неочекивано завршила током писања нове поруке. Спашавање поруке "
+"ће Вам омогућити да наставите где сте стали."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
-msgstr "Опције слања су доступне само за Novell Groupwise и Microsoft Exchange налоге."
+#, fuzzy
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
+msgstr ""
+"Опције слања су доступне само за Novell Groupwise и Microsoft Exchange "
+"налоге."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11007,14 +11269,19 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Датотека ’{0}‘ није регуларна и не може бити послата у поруци."
 
 #: ../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 "Да приложите садржај овог директоријума, или приложите све датотеке из њега појединачно, или направите архиву директоријума и приложите је."
+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 ""
+"Да приложите садржај овог директоријума, или приложите све датотеке из њега "
+"појединачно, или направите архиву директоријума и приложите је."
 
 #: ../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 ""
 "Није могуће покретање контроле HTML уређивача.\n"
 "\n"
@@ -11063,8 +11330,7 @@ msgstr "Еволуцијина пошта и календар"
 # bug(slobo): tooltip би могао да буде и „Пошаљите е-поруку пријатељима и поред
 # овако уштогљених оригинала
 # msgstr "Пакет пословних програма"
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Пoшаљите електронску пошту пријатељима и пословним сарадницима"
 
@@ -11080,48 +11346,101 @@ msgstr "карта именика"
 msgid "calendar information"
 msgstr "податак календара"
 
-#: ../e-util/e-error.c:77
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Грешка Еволуције"
 
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Упозорење Еволуције"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Податак Еволуције"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Упит Еволуције"
 
 # bug(slobo): могли су дати и бољи оригинал, добили су исто тако смислен превод
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Унутрашња грешка, захтевана је непозната грешка „%s“"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Компонента"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Назив компоненте који се бележи"
 
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Дневници дијагнозе квара"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Прикажи у статусној линији _грешке за"
+
+# bug: plural-forms
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "секунд(е)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Уноси дневника:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Ниво записивања у дневник"
+
+# note(slobo): можда треба рок
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Време"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Поруке"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвори овај прозор"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Грешка"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Грешке"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Упозорења и грешке"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Дијагноза квара"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Поруке о грешци, упозорењу и дијагнози квара"
+
 # has "activatable" set.
-#: ../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-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 "Омогућено"
 
@@ -11138,7 +11457,8 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Систем за штампање је известио следеће детаље о грешки:"
 
 #: ../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 "Систем за штампање није понудио никакве додатне детаље о грешки."
 
 # mail-composer:no-sig-file secondary
@@ -11146,8 +11466,7 @@ msgstr "Систем за штампање није понудио никакв�
 # mail:no-delete-folder secondary
 # system:no-save-file secondary
 # system:no-load-file secondary
-#: ../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 "Због „{1}“."
 
@@ -11171,21 +11490,25 @@ msgstr "Датотека постоји „{0}“."
 msgid "Overwrite file?"
 msgstr "Преписати датотеку?"
 
-#: ../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 "_Препиши"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Није могуће отворити аутоматски сачувану датотеку"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Није могуће приказати помоћ Еволуције."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "Важ_но"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "По_сао"
 
@@ -11193,50 +11516,52 @@ msgstr "По_сао"
 # Create the default Person task list
 # orange
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "Л_ично"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "За уради_ти"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "Касни_је"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "Назив _ознаке:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Уреди ознаку"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Додај ознаку"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Ознака не може бити без назива."
 
-#: ../e-util/e-util-labels.c:356
-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 "Ознака истога назива већ постоји на серверу. Промените име ознаци."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf грешка: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Све грешке се убудуће приказују само у терминалу."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11244,7 +11569,7 @@ msgstr[0] "пре %d секунде"
 msgstr[1] "пре %d секунде"
 msgstr[2] "пре %d секунди"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11252,7 +11577,7 @@ msgstr[0] "%d секунда у будућности"
 msgstr[1] "%d секунде у будућности"
 msgstr[2] "%d секунди у будућности"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11260,7 +11585,7 @@ msgstr[0] "пре %d минут"
 msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11268,7 +11593,7 @@ msgstr[0] "%d минут у будућности"
 msgstr[1] "%d минута у будућности"
 msgstr[2] "%d минута у будућности"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11276,7 +11601,7 @@ msgstr[0] "пре %d сат"
 msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11284,7 +11609,7 @@ msgstr[0] "%d сат у будућности"
 msgstr[1] "%d сата у будућности"
 msgstr[2] "%d сати у будућности"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11292,7 +11617,7 @@ msgstr[0] "пре %d дан"
 msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11300,7 +11625,7 @@ msgstr[0] "%d дан у будућности"
 msgstr[1] "%d дана у будућности"
 msgstr[2] "%d дана у будућности"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11308,7 +11633,7 @@ msgstr[0] "пре %d недељу"
 msgstr[1] "пре %d недеље"
 msgstr[2] "пре %d недеља"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11316,7 +11641,7 @@ msgstr[0] "%d недеља у будућности"
 msgstr[1] "%d недеље у будућности"
 msgstr[2] "%d недеља у будућности"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11324,7 +11649,7 @@ msgstr[0] "пре %d месец"
 msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11332,7 +11657,7 @@ msgstr[0] "%d месец у будућности"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11340,7 +11665,7 @@ msgstr[0] "пре %d годину"
 msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11348,22 +11673,21 @@ msgstr[0] "%d година у будућности"
 msgstr[1] "%d године у будућности"
 msgstr[2] "%d година у будућности"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<кликните овде да изаберете датум>"
 
-#: ../filter/filter-datespec.c:290
-#: ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "сада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Изаберите време за поређење"
 
@@ -11376,58 +11700,60 @@ msgstr "Изаберите датотеку"
 msgid "Test"
 msgstr "Проба"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Име п_равила:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Пронађи ставке које задовољавају следеће услове"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "До_дај критеријум филтрирања"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Додај ра_дњу"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "ако су сви услови задовољени"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "ако је било који услов задовољен"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Пронађи предмете:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "У_кључи нити"
 
-#: ../filter/filter-rule.c:1044
-#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Долазно"
 
-#: ../filter/filter-rule.c:1044
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Одлазно"
 
@@ -11452,8 +11778,7 @@ msgid "Missing file name."
 msgstr "Недостаје име датотеке."
 
 # mail:no-name-vfolder primary
-#: ../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 "Недостаје име."
 
@@ -11531,8 +11856,7 @@ msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: ../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 "секунде"
 
@@ -11544,11 +11868,11 @@ msgstr "тренутно време"
 msgid "the time you specify"
 msgstr "време које одредите"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
 #: ../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
+#: ../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 "недеље"
 
@@ -11556,15 +11880,15 @@ msgstr "недеље"
 msgid "years"
 msgstr "године"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Уреди правило"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Име правила"
 
@@ -11573,7 +11897,8 @@ msgid "Composer Preferences"
 msgstr "Поставке састављача"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Подесите пошту, укључујући сигурност и приказ поруке, овде"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11617,12 +11942,9 @@ msgid "Evolution Network configuration control"
 msgstr "Контрола мрежних подешавања Еволуције"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597
-#: ../mail/mail-component.c:598
+#: ../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"
@@ -11634,7 +11956,7 @@ msgid "Mail Accounts"
 msgstr "Поштански налози"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
@@ -11646,12 +11968,12 @@ msgstr "Поставке мреже"
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s уговор о лиценци"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11664,77 +11986,65 @@ msgstr ""
 "за %s\n"
 "и означите кућицу да би га прихватили\n"
 
-#: ../mail/em-account-editor.c:466
-#: ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Изаберите фасциклу"
 
-#: ../mail/em-account-editor.c:590
-#: ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702
-#: ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/em-account-editor.c:1810
-#: ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../mail/em-account-editor.c:1859
-#: ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Провери за _нову пошту сваких"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "мину_та"
 
-#: ../mail/em-account-editor.c:2327
-#: ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: ../mail/em-account-editor.c:2386
-#: ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Подразумевано"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452
-#: ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Сигурност"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489
-#: ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Опције за примање"
 
-#: ../mail/em-account-editor.c:2490
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Проверам за нове поруке"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Помоћник Еволуција налога"
 
@@ -11751,31 +12061,37 @@ msgstr "Име налога"
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../mail/em-composer-prefs.c:303
-#: ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158
-#: ../mail/mail-signature-editor.c:478
+#: ../mail/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 "Без имена"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Додај скрипту за потпис"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: ../mail/em-composer-utils.c:1150
-#: ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
@@ -11784,11 +12100,15 @@ msgstr "непознати пошиљалац"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} ${TimeZone}, ${Sender} пише:"
+#: ../mail/em-composer-utils.c:2105
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
@@ -11838,11 +12158,9 @@ msgid "Date sent"
 msgstr "Датум слања"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
-#: ../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
+#: ../plugins/groupwise-features/share-folder.c:768
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Обриши"
@@ -11891,8 +12209,7 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../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 "Важно"
 
@@ -11920,8 +12237,7 @@ msgstr "није подешено"
 msgid "is set"
 msgstr "подешено"
 
-#: ../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 "Ђубре"
@@ -11930,8 +12246,7 @@ msgstr "Ђубре"
 msgid "Junk Test"
 msgstr "Провера ђубрета"
 
-#: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Етикета"
 
@@ -11971,52 +12286,53 @@ msgstr "Повежи на програм"
 msgid "Play Sound"
 msgstr "Пусти звук"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53
-#: ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Читај"
 
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Примаоци"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex одговара"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Одговорено"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "повратно"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "повратно веће од"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "повратно мање од"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Покрени програм"
 
-#: ../mail/em-filter-i18n.h:61
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Пошиљалац"
 
+# bug(slobo): вероватно извештај о достави
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "Пошаљи признаницу"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Постави ознаку"
@@ -12049,14 +12365,11 @@ msgstr "почиње са"
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: ../mail/em-filter-i18n.h:72
-#: ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889
-#: ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:312
+#: ../mail/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 "Наслов"
 
@@ -12073,51 +12386,51 @@ msgstr "Потом"
 msgid "Add Ac_tion"
 msgstr "Додај ра_дњу"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "Направи Фасциклу претраге из претраге..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Скорашње поруке"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
@@ -12153,17 +12466,15 @@ msgid "Quota usage"
 msgstr "Искоришћеност квоте"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358
-#: ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Сандуче"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Особине фасцикле"
@@ -12180,37 +12491,35 @@ msgstr "На_прави"
 msgid "Folder _name:"
 msgstr "_Име фасцикле:"
 
-#. load store to mail component at the end, when everything is loaded
-#: ../mail/em-folder-tree-model.c:204
-#: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970
-#: ../mail/mail-vfolder.c:1027
+#. load store to mail component
+#: ../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 "Фасцикле претраге"
 
 #. 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 "НЕОДГОВАРА"
 
-#: ../mail/em-folder-tree-model.c:504
-#: ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Припрема"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Шаблони"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "За слање"
 
-#: ../mail/em-folder-tree-model.c:512
-#: ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Послато"
 
-#: ../mail/em-folder-tree-model.c:534
-#: ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "Учитавање..."
 
@@ -12249,14 +12558,12 @@ msgstr "Премештање фасцикле %s"
 msgid "Copying folder %s"
 msgstr "Умножавање фасцикле %s"
 
-#: ../mail/em-folder-tree.c:909
-#: ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештање порука у фасциклу %s"
 
-#: ../mail/em-folder-tree.c:911
-#: ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавање порука у фасциклу %s"
@@ -12265,157 +12572,145 @@ msgstr "Умножавање порука у фасциклу %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Није могуће убацити поруку(е) у оставу на највишем нивоу"
 
-#: ../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 "_Умножи у фасциклу"
 
-#: ../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 "_Премести у фасциклу"
 
-#: ../mail/em-folder-tree.c:1718
-#: ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претрага фасцикли у „%s“"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Премести..."
 
-#: ../mail/em-folder-tree.c:2114
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Преименуј..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "О_свежи"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Ис_празни За слање"
 
-#: ../mail/em-folder-tree.c:2122
-#: ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Испразни _смеће"
 
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Направи Фасциклу _претраге"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Умножавање ’%s‘ у ’%s‘"
 
-#: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Изаберите фасциклу"
 
-#: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "_Умножи"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Прављење фасцикле ’%s‘"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Направи фасциклу"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Наведите где направити фасциклу:"
 
-#: ../mail/em-folder-view.c:1090
-#: ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Неуспешно брисање поште"
 
-#: ../mail/em-folder-view.c:1091
-#: ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате довољна овлашћења да обришете ову пошту."
 
-#: ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:568
-#: ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Просл_еди"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "_Означи као неважно"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "Нат_пис"
 
@@ -12426,266 +12721,286 @@ msgstr "Нат_пис"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355
-#: ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "Ништ_а"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Нова ознака"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Фасцикла претраге на _тему"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Фасцикла претраге на п_ошиљаоца"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Фасцикла претраге на _примаоце"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Фасцикла претраге на дописну _листу"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Филтер на те_му"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Филтер на п_ошиљаоца"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Филтер на п_римаоце"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Филтер на _дописну листу"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255
-#: ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Није могуће добити поруку"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Довлачење поруке..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "П_озив за..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Направи Фасциклу _претраге"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_на ову адресу"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Кликните да позовете %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Притисни да сакријеш/откирјеш адресу"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Поклапања: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Про_нађи:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Следеће"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "_Подударај велико/мало слово"
 
-#: ../mail/em-format-html-display.c:947
-#: ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Непотписано"
 
-#: ../mail/em-format-html-display.c:947
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "Ова порука није потписана. Није сигурно да је ова порука аутентична."
 
-#: ../mail/em-format-html-display.c:948
-#: ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
-#: ../mail/em-format-html-display.c:948
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло вероватно аутентичан."
+#: ../mail/em-format-html-display.c:952
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
+"вероватно аутентичан."
 
-#: ../mail/em-format-html-display.c:949
-#: ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
-#: ../mail/em-format-html-display.c:949
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Потпис ове поруке није могао бити проверен, можда је измењена у преносу."
+#: ../mail/em-format-html-display.c:953
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Потпис ове поруке није могао бити проверен, можда је измењена у преносу."
 
-#: ../mail/em-format-html-display.c:950
-#: ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Исправан потпис, али није могућа провера пошиљаоца"
 
-#: ../mail/em-format-html-display.c:950
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "Ова порука је потписана исправним потписом, али пошиљалац поруке не може бити проверен."
+#: ../mail/em-format-html-display.c:954
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
+"бити проверен."
 
-#: ../mail/em-format-html-display.c:951
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Потпис постоји, али тражи јавни кључ"
 
-#: ../mail/em-format-html-display.c:951
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:955
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "Ова порука је потписана, али нема одговарајућег јавног кључа."
 
-#: ../mail/em-format-html-display.c:958
-#: ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
-#: ../mail/em-format-html-display.c:958
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "Ова порука није шифрована.  Њен садржај је могуће видети у преносу преко Интернета."
+#: ../mail/em-format-html-display.c:962
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Ова порука није шифрована.  Њен садржај је могуће видети у преносу преко "
+"Интернета."
 
-#: ../mail/em-format-html-display.c:959
-#: ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
-#: ../mail/em-format-html-display.c:959
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "Ова порука је шифрована, али слабим алгоритмом.  Тешко је, али не и немогуће да неко са стране у догледно време види садржај ове поруке."
+#: ../mail/em-format-html-display.c:963
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Ова порука је шифрована, али слабим алгоритмом.  Тешко је, али не и немогуће "
+"да неко са стране у догледно време види садржај ове поруке."
 
-#: ../mail/em-format-html-display.c:960
-#: ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Шифровано"
 
-#: ../mail/em-format-html-display.c:960
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "Ова порука је шифрована.  Тешко ће неко са стране видети садржај ове поруке."
+#: ../mail/em-format-html-display.c:964
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Ова порука је шифрована.  Тешко ће неко са стране видети садржај ове поруке."
 
-#: ../mail/em-format-html-display.c:961
-#: ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
-#: ../mail/em-format-html-display.c:961
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "Ова порука је шифрована — и то јаким алгоритмом.  Веома је тешко да неко са стране у догледно време види садржај ове поруке."
+#: ../mail/em-format-html-display.c:965
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Ова порука је шифрована — и то јаким алгоритмом.  Веома је тешко да неко са "
+"стране у догледно време види садржај ове поруке."
 
-#: ../mail/em-format-html-display.c:1062
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Пре_гледај сертификат"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Овај сертификат није читљив"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено у %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Прекорачено:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "до %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "Пре_гледај унутар"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Прилагоди на ширину"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Прикажи _оригиналну величину"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Сачувај прилог као"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Изаберите фасциклу за чување свих прилога"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "Изабрано чување..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12693,43 +13008,44 @@ msgstr[0] "%d при_лог"
 msgstr[1] "%d при_лога"
 msgstr[2] "%d при_логa"
 
-#: ../mail/em-format-html-display.c:2112
-#: ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_Сачувај"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Сач_увај све"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Нема прилога"
 
-#: ../mail/em-format-html-display.c:2338
-#: ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Прегледај _неформатирано"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Сакриј _неформатирано"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "О_твори помоћу"
 
-#: ../mail/em-format-html-display.c:2473
-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 "Еволуција не може да исцрта ово писмо пошто је превелико. Можете га погледати неформатирано или помоћу другог уређивача текста."
+#: ../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 ""
+"Еволуција не може да исцрта ово писмо пошто је превелико. Можете га "
+"погледати неформатирано или помоћу другог уређивача текста."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. страна од %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 "Довлачење ’%s‘"
@@ -12775,28 +13091,21 @@ msgstr "Обликовање поруке"
 msgid "Formatting Message..."
 msgstr "Обликовање поруке..."
 
-#: ../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-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Пошиљалац"
 
@@ -12813,147 +13122,141 @@ 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 "Поруку шаље <b>%s</b> у име <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 "Шаље"
 
-#: ../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 "Одговор"
 
-#: ../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 "Датум"
 
-#: ../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 "Групе за вести"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Лице"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
 
-#: ../mail/em-format.c:1336
-#: ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Није могућа обрада MIME поруке. Приказивање извора."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржани тип шифре за multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Није могућа обрада PGP/MIME поруке"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Није могућа обрада PGP/MIME поруке: непозната грешка"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Грешка при провери потписа"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1581
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка при провери потписа"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Није могућа обрада PGP поруке."
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Није могућа обрада PGP/MIME поруке: непозната грешка"
 
 # bug: requires a comment on usage
 # слично као за месеце и недеље
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "сваки пут"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "једном дневно"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "једном недељно"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "једном месечно"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Додаје прилагођено заглавље за нежељену пошту"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Назив фасцикле:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Вредност заглавља садржи:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Садржи вредност"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Етикета"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078
-#: ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Доступан је %s додатак и бинарни облик је инсталиран."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086
-#: ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr "Додатак %s није доступан. Проверите да ли је пакет инсталиран."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Нема доступног додатка за ђубре"
 
@@ -12984,11 +13287,13 @@ msgstr "Није могућа претрага за постојећим пош�
 
 #: ../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 ""
-"Место и хијерархија фасцикли поште у Еволуцији је измењена од Еволуције 1.х.\n"
+"Место и хијерархија фасцикли поште у Еволуцији је измењена од Еволуције 1."
+"х.\n"
 "\n"
 "Молим будите стрпљиви док Еволуција преноси фасцикле..."
 
@@ -13000,100 +13305,104 @@ msgstr "Није могуће отварање старог POP чувај-на-
 #: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Није могуће прављење POP3 чувај-на-серверу директоријума података ’%s‘: %s"
+msgstr ""
+"Није могуће прављење POP3 чувај-на-серверу директоријума података ’%s‘: %s"
 
 #: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Није могуће умножавање POP3 чувај-на-серверу податка ’%s‘: %s"
 
-#: ../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 "Није успело прављење локалне оставе поште ’%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 ""
-"Формат прегледа фасцикли поште пребачен је на sqlite почев од Еволуције 2.24.\n"
+"Формат прегледа фасцикли поште пребачен је на sqlite почев од Еволуције "
+"2.24.\n"
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Није могуће прављење локалних фасцикли поште у ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2982
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "Није могуће читање подешавања претходне инсталације Еволуције, ’evolution/config.xmldb‘ не постоји или је оштећен."
+#: ../mail/em-migrate.c:3053
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Није могуће читање подешавања претходне инсталације Еволуције, ’evolution/"
+"config.xmldb‘ не постоји или је оштећен."
 
-#: ../mail/em-popup.c:564
-#: ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/em-popup.c:565
-#: ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
 #. make it first item
-#: ../mail/em-popup.c:629
-#: ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "Додај у _именик"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ова остава не подржава пријаве, или нису омогућене."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Пријављено"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Фасцикла"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Изаберите сервер."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Није изабран сервер"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Пропусни_ци порука"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "порука"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Сачувај поруку..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Додај адресу"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке од %s"
@@ -13119,17 +13428,13 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Ширина прозора „Слање и примање поште“"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Дозволи еволуцији да прикаже текстуални део ограничене величине"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Увек тражи признаницу"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Време у секундама за које се приказује грешка у статусној линији."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Аутоматско препознавање емотикона"
@@ -13167,20 +13472,32 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сажми приказ адреса у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-msgstr "Сажми приказ адреса у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА на број назначен у address_count-у."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Сажми приказ адреса у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА на број назначен у "
+"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 "Контролише учесталост усклађивања локалних измена са мрежним сервером поште. Интервал мора бити најмање 30 секунди."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Контролише учесталост усклађивања локалних измена са мрежним сервером поште. "
+"Интервал мора бити најмање 30 секунди."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Прилагођена заглавља за употребу приликом провере нежељене поште."
 
 #: ../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 "Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи списка су низ формата „headername=value“."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи "
+"списка су низ формата „назив_заглавља=вредност“."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13235,28 +13552,51 @@ msgid "Default width of the subscribe dialog."
 msgstr "Подразумевана ширина прозорчета за пријаву."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "Утврђује да ли да само у адресару прегледа адресе у потрази за нежељеном поштом"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Утврђује да ли да само у адресару прегледа адресе у потрази за нежељеном "
+"поштом"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Утврђује да ли да прегледа у адресару адресе пошиљаоца"
 
 #: ../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 "тврђује да ли да прегледа у адресару адресе пошиљаоца. Уколико је пронађе, не сврстава је у нежељену пошту. Тражи је у адресарима означеним за самодопуњавање. Може бити споро ако су адресари (рецимо LDAP) означени за самодопуњавање."
+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 ""
+"тврђује да ли да прегледа у адресару адресе пошиљаоца. Уколико је пронађе, "
+"не сврстава је у нежељену пошту. Тражи је у адресарима означеним за "
+"самодопуњавање. Може бити споро ако су адресари (рецимо LDAP) означени за "
+"самодопуњавање."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене поште"
+msgstr ""
+"Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
+"поште"
 
 #: ../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 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
+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 ""
+"Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
+"поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
 
 #: ../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 "Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Тема“ у усправном погледу колоне „Поруке“."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Тема“ у усправном "
+"погледу колоне „Поруке“."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13267,8 +13607,8 @@ msgid "Directory for saving mail component files."
 msgstr "Директоријум за чување датотека модула за пошту."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Искључује или омогућава скраћивање назива фасцикли у стаблу"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Искључује или омогућава скраћивање назива фасцикли у бочној површи"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13311,12 +13651,24 @@ msgid "Enable search folders on startup."
 msgstr "Омогућава фасцикле претраге при покретању."
 
 #: ../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 "Укључи могућност претраге у бочној области тако да можете покренути интерактивну претрагу куцајући у поље за текст. Корист је да можете лако наћи фасциклу у тој бочној области само куцајући име фасцикле и избор скаче аутоматски на ту фасциклу."
+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 ""
+"Укључи могућност претраге у бочној области тако да можете покренути "
+"интерактивну претрагу куцајући у поље за текст. Корист је да можете лако "
+"наћи фасциклу у тој бочној области само куцајући име фасцикле и избор скаче "
+"аутоматски на ту фасциклу."
 
 #: ../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 "Укључите ово да би размакницом померали текст поруке при прегледању, као и списак порука и фасцикли."
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Укључите ово да би размакницом померали текст поруке при прегледању, као и "
+"списак порука и фасцикли."
 
 # bug: unclear
 #: ../mail/evolution-mail.schemas.in.h:54
@@ -13327,496 +13679,620 @@ msgstr "Укључите да исцртавате текстуални део �
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курзора"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Height of the message-list pane"
-msgstr "Висина површи листе порука"
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Height of the message-list pane."
-msgstr "Висина површи листе порука."
+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 "Скрива преглед по фасциклама и уклања избор"
+msgid "Height of the message-list pane"
+msgstr "Висина површи листе порука"
 
 #: ../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 "Уколико корисник покуша да отвори 10 или више порука одједном, пита га да ли заиста жели то да уради."
+msgid "Height of the message-list pane."
+msgstr "Висина површи листе порука."
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "Ako je „Преглед поркуе“ површ укључена, онда покажите је једну до друге радије него усправно."
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Скрива преглед по фасциклама и уклања избор"
 
 #: ../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 "Уколико нема уграђеног прегледача за овај mime тип у оквиру Еволуције, сви mime типови са ове листе који су везани bonobo прегледачем делова у Гномовој бази mime типова могу бити коришћени за приказ садржаја."
+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 ""
+"Уколико корисник покуша да отвори 10 или више порука одједном, пита га да ли "
+"заиста жели то да уради."
 
 #: ../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 "Почетна висина прозора „Слање и примање поште“. Вредност се ажурира уколико корисник продужи прозор."
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+"Ako je „Преглед поруке“ површ укључена, онда покажите је једну до друге "
+"радије него усправно."
 
 #: ../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 "Почетна величина увећаног прозора „Слање и примање поште“. Вредност се ажурира уколико корисник увећа или умањи прозор. Напомињемо да Еволуција не користи ову вредност пошто овај прозор не може бити увећан. Ова је вредност само употпуњује поставке."
+#, 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 ""
+"Уколико нема уграђеног прегледача за овај mime тип у оквиру Еволуције, сви "
+"mime типови са ове листе који су везани bonobo прегледачем делова у Гномовој "
+"бази mime типова могу бити коришћени за приказ садржаја."
 
 #: ../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 "Почетна ширина прозора „Слање и примање поште“. Вредност се ажурира уколико корисник прошири прозор."
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Почетна висина прозора „Слање и примање поште“. Вредност се ажурира уколико "
+"корисник продужи прозор."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "То укључује/искључује упозорење када означавате више порука."
+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 ""
+"Почетна величина увећаног прозора „Слање и примање поште“. Вредност се "
+"ажурира уколико корисник увећа или умањи прозор. Напомињемо да Еволуција не "
+"користи ову вредност пошто овај прозор не може бити увећан. Ова је вредност "
+"само употпуњује поставке."
 
 #: ../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 "Укњучује/онемогућује својство где су потребни вишеструки упити за неопходност синхронизације ван мреже."
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Почетна ширина прозора „Слање и примање поште“. Вредност се ажурира уколико "
+"корисник прошири прозор."
 
 #: ../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 "Укључује/искључује понављање упозорења да је брисање поруке из фасцикле претраге трајно, а не само уклањање из резултата претраге. "
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "То укључује/искључује упозорење када означавате више порука."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Last time empty junk was run"
-msgstr "Последње време пражњења ђубрета"
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+"Укњучује/онемогућује својство где су потребни вишеструки упити за "
+"неопходност синхронизације ван мреже."
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Last time empty trash was run"
-msgstr "Последње време пражњења смећа"
+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 ""
+"Укључује/искључује понављање упозорења да је брисање поруке из фасцикле "
+"претраге трајно, а не само уклањање из резултата претраге. "
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Ниво након којег се порука заводи у дневник."
+msgid "Last time empty junk was run"
+msgstr "Последње време пражњења ђубрета"
 
 #: ../mail/evolution-mail.schemas.in.h:71
+msgid "Last time empty trash was run"
+msgstr "Последње време пражњења смећа"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Листа ознака и њима додељених боја"
 
-#: ../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 "Листа mime типова ради провере за bonobo прегледачима"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Листа прихваћених лиценци"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Листа налога"
 
-#: ../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 "Листа налога које познаје поштански део Еволуције. Листа садржи низове које именују поддиректоријуме у односу на /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 ""
+"Листа налога које познаје поштански део Еволуције. Листа садржи низове које "
+"именују поддиректоријуме у односу на /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 "Листа прилагођених заглавља и да ли су укључена."
 
-#: ../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 "Списак ознака језика речника који се користе за проверу правописа."
 
-#: ../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 "Листа ознака које познаје поштански део Еволуције. Листа садржи низове облика име:боја где боја користи HTML hex кодирање."
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Листа mime типова ради провере за 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 ""
+"Листа ознака које познаје поштански део Еволуције. Листа садржи низове "
+"облика име:боја где боја користи 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 "Листа имена протокола чија је лиценца прихваћена."
 
-#: ../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 "Учитава слике за HTML поруке преко 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 "Учитава слике за HTML поруке преко http(s)-а. Могуће су вредности: „0“ - никада не учитавај слике са мреже. „1“ - учитавај слике уколико је пошиљалац у именику. „2“ - увек учитавај слике са мреже."
+#: ../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 ""
+"Учитава слике за HTML поруке преко http(s)-а. Могуће су вредности: „0“ - "
+"никада не учитавај слике са мреже. „1“ - учитавај слике уколико је пошиљалац "
+"у именику. „2“ - увек учитавај слике са мреже."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Бележи радње филтера"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава као виђену после наведеног рока"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава као виђену после наведеног рока."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Стил приказа поруке ( „нормалан“, „сва заглавља“, „извор“)"
+msgstr ""
+"Стил приказа поруке ( „normal“ за нормалан приказ; „full headers“ за приказ "
+"свих заглавља; „source“ за изворни приказ)"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Најмање дана између пражњења ђубрета на излазу"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../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 "Најмање време између пражњења ђубрета на излазу, у данима."
 
-#: ../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 "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../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 "Број адреса за приказ у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Пита када је наслов празан"
 
-#: ../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 "Пита корисника када покуша да испразни фасциклу."
 
-#: ../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 "Пита корисника када покуша да пошаље поруку без наслова."
 
-#: ../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 "Тражи проверу да ли корисник жели одмах да се искљући са мреже"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Упозори код брисања порука из фасцикле претраге"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Пита при пражњењу"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Пита када корисник унесе само невидљиву копију (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 "Пита корисника када покуша да отвори 10 или више порука одједном"
 
-#: ../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 "Пита када корисник покуша да пошаље HTML поруку примаоцима који можда не желе да примају HTML пошту."
+#: ../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 ""
+"Пита када корисник покуша да пошаље HTML поруку примаоцима који можда не "
+"желе да примају HTML пошту."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Пита корисника када покуша да пошаље поруку без прималаца."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Пита када корисник покуша да пошаље нежељени HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Пита при означавању више порука"
 
-#: ../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 "Препознаје емотиконе у тексту и замењује их сликама."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Препознаje везе у тексту и замењује их."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Проверава да ли има ђубрета у долазној пошти."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Сачувај директоријум"
 
-#: ../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 "Тражи слику пошиљаоца у локалним адресарима"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Подразумевано шаљи пошту као HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Подразумевано шаље пошту као 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 "Приказује колону са е-адресама  у списку порука"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Интервал синхронизације са сервером"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Прикажи анимације"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../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 "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Прикажи обрисане поруке у листи порука"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Прикатује слику пошиљаоца"
 
-#: ../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 "Приказује е-адресу пошиљаоца у посебној колони у списку порука."
 
-#: ../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 "Приказује слику пошиљаоца у окну за читање поруке."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Провера правописа унутар"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Боја за проверу правописа"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Језици за проверу правописа"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Подразумевана висина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Подразумевана ширина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Словни лик терминала"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Ограничење текстуалног дела поруке"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "Подразумевани додатак куке за ђубре"
 
-#: ../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 "Последње време пражњења ђубрета, у данима од почетка епохе."
 
-#: ../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 "Време пражњења смећа, у данима од почетка епохе."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "Фонт терминала за приказ поште."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "Фонт променљиве величине за приказ поште."
 
-#: ../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 "Може имати три могуће вредности. \"0\" for errors. „1“ за упозорења. „2“ за поруке о дијагнози квара."
-
-# bug: s/interms/in terms/ (space)
-#: ../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 "Ово одређује највећу величину текстуалног дела који се може исцртати у Еволуцији. Подразумева се 4MB/4096 KB и наведено је као број 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 "Ово је подразумевани додатак куке за ђубре, чак и ако су укључени вишеструки додаци. Уколико је поменути подразумевани додатак искључен, преостали доступни додаци неће бити активирани."
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Може имати три могуће вредности. „0“ за грешке. „1“ за упозорења. „2“ за "
+"поруке о дијагнози квара."
 
+# bug: s/interms/in terms/ (space)
 #: ../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 "Овак кључ је прочитан једном и потом враћен на „лажно“. Ово уклања пошту са списка и преглед за ту фасциклу."
+#, 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 ""
+"Ово одређује највећу величину текстуалног дела који се може исцртати у "
+"Еволуцији. Подразумева се 4MB/4096 KB и наведено је као број 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 "Овај кључ треба да садржи листу XML структура за навођење прилагођених заглавља и потребу њиховог приказивања. XML структура је формата &lt;header enabled&gt; - омогућено за приказивање заглавља у прегледу поште."
+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 ""
+"Ово је подразумевани додатак куке за ђубре, чак и ако су укључени вишеструки "
+"додаци. Уколико је поменути подразумевани додатак искључен, преостали "
+"доступни додаци неће бити активирани."
 
 #: ../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 "Ова опција се односи на кључ lookup_addressbook и користи се за одређивање да ли да се адреса тражи само у локалном адресару како би се издвојила пошта примљена од познатих пошиљалаца од оне нежељене."
+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 ""
+"Овак кључ је прочитан једном и потом враћен на „false“ (нетачно). Ово уклања "
+"пошту са списка и преглед за ту фасциклу."
 
 #: ../mail/evolution-mail.schemas.in.h:146
-msgid "This option would help in improving the speed of fetching."
-msgstr "Ова ће опција припомоћи брзини прибављања поште."
+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 ""
+"Овај кључ треба да садржи листу XML структура за навођење прилагођених "
+"заглавља и потребу њиховог приказивања. XML структура је формата &lt;header "
+"enabled&gt; - омогућено за приказивање заглавља у прегледу поште."
 
 #: ../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 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, после чега је „...“ приказано."
+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 ""
+"Ова опција се односи на кључ lookup_addressbook и користи се за одређивање "
+"да ли да се адреса тражи само у локалном адресару како би се издвојила пошта "
+"примљена од познатих пошиљалаца од оне нежељене."
 
 #: ../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 "Ово подешавање одређује да ли ће низови подразумевано бити раширени или скупљени. Еволуција захтева поновно покретање."
+msgid "This option would help in improving the speed of fetching."
+msgstr "Ова ће опција припомоћи брзини прибављања поште."
 
 #: ../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 "Ово подешавање одређује да ли ће низови бити разврстани по последњој поруци једног низа, уместо по датуму. Еволуција захтева поновно покретање."
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
+"после чега је „...“ приказано."
 
 #: ../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 ""
+"Ово подешавање одређује да ли ће низови подразумевано бити раширени или "
+"скупљени. Еволуција захтева поновно покретање."
+
+#: ../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 ""
+"Ово подешавање одређује да ли ће низови бити разврстани по последњој поруци "
+"једног низа, уместо по датуму. Еволуција захтева поновно покретање."
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Разврстава списак порука по расправама."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Разврстај поруке по расправама"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Прикажи поруке према наслову расправе"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Време за означавање поруке као виђене"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Време за означавање поруке као виђене."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../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 "Боја за подвлачење правописних грешки приликом провере правописа."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Користи сервис и клијента Убице спама"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Користи демона и клијента Убице спама (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Користи сопствени словни лик"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи прилагођени фонт за приказ поште."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Користи само локалне провере спама."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без DNS-а)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Користите један до другог или широки распоред"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Словни лик променљиве величине"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Опција Преглед/невидљива копија (Bcc) је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Опција Преглед/невидљива копија (Bcc) је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Опција Преглед/копија (Cc) је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Опција Преглед/копија (Cc) је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Опција Преглед/шаље је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Опција Преглед/шаље је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Опција Преглед/прима је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Опција Преглед/пошаљи је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Опција Преглед/одговор је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Опција Преглед/одговор је изабрана."
 
-#: ../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 "Да ли се повратница подразумевано додаје свакој поруци."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Да ли се искључује скраћивање назива фасцикли у стаблу."
 
-#: ../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 "Да ли покушати приказ низа расправе по наслову када поруке не садрже заглавља „In-Reply-To“ или „References“."
+#: ../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 ""
+"Да ли покушати приказ низа расправе по наслову када поруке не садрже "
+"заглавља „In-Reply-To“ или „References“."
 
-#: ../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 "Да ли се поруке нижу на основу последње поруке у низу"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Ширина површи листе порука"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Ширина површи листе порука."
 
@@ -13832,82 +14308,72 @@ msgstr "Еволуција Elm увозник"
 msgid "Import mail from Elm."
 msgstr "Важна пошта из програма Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Одредишна фасцикла:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Изаберите фасциклу за увоз"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Беркли поштанско сандуче (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увозник за фасцикле облика Беркли поштанског сандучета"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Увожење поштанског сандучета"
 
-#: ../mail/importers/mail-importer.c:232
-#: ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увожење ’%s‘"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Претрага %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Увожење Pine података"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Еволуција Pine увозник"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Увози пошту из програма Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: ../mail/mail-autofilter.c:239
-#: ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслов је %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
-#: ../mail/mail-component.c:164
-#: ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691
-#: ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Шаблони"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13972,97 +14438,36 @@ msgstr[0] "%d укупно"
 msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Нова фасцикла за пошту"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Направи нову фасциклу за пошту"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Неуспела надоградња подешавања поште или фасцикли."
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "Грешке"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "Упозорења и грешке"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "Дијагноза квара"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "Поруке о грешци, упозорењу и дијагнози квара"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "Дневници дијагнозе квара"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "Прикажи у статусној линији _грешке за"
-
-# bug: plural-forms
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "секунд(е)."
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "Уноси дневника:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "Ниво записивања у дневник"
-
-# note(slobo): можда треба рок
-#: ../mail/mail-component.c:1811
-#: ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Време"
-
-#: ../mail/mail-component.c:1821
-#: ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Поруке"
-
-#: ../mail/mail-component.c:1830
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвори овај прозор"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Провери подржане типове "
@@ -14341,123 +14746,128 @@ msgid "Empty trash folders on e_xit"
 msgstr "Испразни фасцикле са _смећем на излазу"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+msgid "Enable Magic S_pacebar"
 msgstr "Укључи Магичну размак_ницу"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Укључи фасцикле прет_раге"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за ши_фровање:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Шифруј одлазеће поруке (подразумевано)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Утврђене-пирине:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Фонт неп_ромењиве ширине:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Особине словног лика"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Обликуј поруке у H_TML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "Име и презиме:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML поруке"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "H_TTP посредник:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Унутар (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 "Ознаке"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Табела језика"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Место поштанског сандучета"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "Без _посредника за:"
 
-#: ../mail/mail-config.glade.h:107
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "Напомена: Подвучен знак у називу користи се као скраћеница у менију."
 
-#: ../mail/mail-config.glade.h:108
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.glade.h:109
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "Напомена: нећете бити упитани за лозинку док се не повежете први пут"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Опција се занемарује уколико је пронађено поклапање са прилагођеним заглављем за нежељену пошту."
+msgstr ""
+"Опција се занемарује уколико је пронађено поклапање са прилагођеним "
+"заглављем за нежељену пошту."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG ИБ _кључа:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "_Лозинка:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14465,127 +14875,147 @@ msgstr ""
 "Унесите доле описно име за овај налог.\n"
 "Ово име ће бити коришћено само за потребе приказа."
 
-#: ../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 "Унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, питајте администратора система или продавца Интернет услуга."
-
 #: ../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 "Унесите доле име и електронску адресу. „Необавезна“ поља доле не морају бити попуњена, осим ако не желите да ове податке укључите у поруке које шаљете."
+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 ""
+"Унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
+"питајте администратора система или продавца Интернет услуга."
 
 #: ../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 ""
+"Унесите доле име и електронску адресу. „Необавезна“ поља доле не морају бити "
+"попуњена, осим ако не желите да ове податке укључите у поруке које шаљете."
+
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Молим изаберите међу следећим могућностима"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са наведеним Bcc примаоцима"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "З_апамти лозинку"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Запа_мти лозинку"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "Домаћин за S_OCKS:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Тр_ажи фотографију пошиљаоца само у локалним адресарима"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "Изаб_ери..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "_Пошаљи признанице:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "_Стандардни словни лик:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "Одабира фасциклу Припрема"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Изаберите HTML словни лик фиксиране величине"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Изаберите HTML словни лик фиксиране величине за штампу"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Изаберите HTML словни лик променљиве величине"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Изаберите HTML словни лик променљиве величине за штампу"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "Одабира фасциклу Послато"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Слање поште"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи аутентификацију"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Тип сервера: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за _потписивање:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "Потп_ис:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Табела потписа"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "У одговору започни _куцање на дну"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "Т_ип: "
 
-#: ../mail/mail-config.glade.h:148
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
-msgstr "Листа језика овде осликава само оне језике за које имате инсталиран речник."
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Листа језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14595,7 +15025,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану. "
 
-#: ../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\""
@@ -14603,27 +15033,26 @@ msgstr ""
 "Укуцајте име по коме желите да назовете овај налог.\n"
 "На пример: „Пословни“ или „Лични“"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Корисничко_име:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Користи ауте_нтификацију"
 
-#: ../mail/mail-config.glade.h:156
-#: ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "Про_менљива величина:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14633,124 +15062,124 @@ msgstr ""
 "\n"
 "Кликните „Напред“ за почетак. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "_Увек учитавај слике са Интернета"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Аутоматско подешавање посредника:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "_Подразумевани додатак за ђубре:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "_Директна веза са Интернетом"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанке (Outlook компатибилност)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Задржи потпис изнад оригиналне поруке при одговору"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Учитај слике од контаката у поруку"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "_Потражи само у локалном адресару"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој подразумевани налог"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "_Ручно подешавање посредника:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_Никада не учитавај слике са Интернета"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Путања:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Упозори при слању HTML поште контактима који их не желе"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "_Безбедан HTTP посредник:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "Изаб_ери..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "Прикажи _анимације"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Прикажи фотографију пошиљаоца у прегледу поште"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Сажмите ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА заглавља у "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Користи сигурну везу:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "_Користи системске поставке"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте словне ликове као други програми"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "Адресе"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "опис"
 
@@ -14799,8 +15228,7 @@ msgstr "Про_нађи:"
 msgid "Find in Message"
 msgstr "Пронађи у поруци"
 
-#: ../mail/mail-dialogs.glade.h:12
-#: ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
@@ -14852,27 +15280,26 @@ msgstr "_Ознака:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Оз_начите ово да прихватите уговор о лиценци"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Испитујем доступност за %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Филтрирање изабраних порука"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Узимање поште"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспела примена одлазећих филтера: %s"
 
-#: ../mail/mail-ops.c:572
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14881,113 +15308,110 @@ msgstr ""
 "Неуспело допуњавање у %s: %s\n"
 "Допуњавање у локалну фасциклу ’Послато‘."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспело допуњавање у локалну фасциклу ’Послато‘: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Слање поруке"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Слање поруке %d од %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Неуспело слање %d од %d порука"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Отказано."
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Чување поруке у фасциклу"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештање порука у %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Умножавање порука у %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварање фасцикле %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Добијам податке о квоти за фасциклу %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварање оставе %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањање фасцикле %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештање фасцикле ’%s‘"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Пражњење и смештање налога ’%s‘"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештање налога ’%s‘"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Освежавање фасцикле"
 
-#: ../mail/mail-ops.c:1659
-#: ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Пражњење фасцикле"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацивање смећа у ’%s‘"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Локалне фасцикле"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Довлачење поруке %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14995,7 +15419,7 @@ msgstr[0] "Довлачење %d поруке"
 msgstr[1] "Довлачење %d поруке"
 msgstr[2] "Довлачење %d порука"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15003,7 +15427,7 @@ msgstr[0] "Чување %d поруке"
 msgstr[1] "Чување %d поруке"
 msgstr[2] "Чување %d порука"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15012,12 +15436,11 @@ msgstr ""
 "Грешка при чувању поруке у: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Чување прилога"
 
-#: ../mail/mail-ops.c:2148
-#: ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15026,27 +15449,27 @@ msgstr ""
 "Није могуће прављење излазне датотеке: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Није могућ упис података: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидање везе са %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поновно повезивање на %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Припрема налог ’%s‘ за рад ван мреже"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Провера услуге"
 
@@ -15062,40 +15485,39 @@ msgstr "Слање и примање поште"
 msgid "Cancel _All"
 msgstr "Обустави _све"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Освежавање..."
 
-#: ../mail/mail-send-recv.c:498
-#: ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Чекање..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Провера за нове поруке"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Унесите лозинку за %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Унесите лозинку"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Корисник је обуставио операцију."
 
@@ -15140,21 +15562,21 @@ msgstr "Неисправна фасцикла ’%s‘"
 msgid "Setting up Search Folder: %s"
 msgstr "Подешавање фасцикле претраге: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Освежавање фасцикла претраге за ’%s: %s‘"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Освежавање фасцикла претраге за ’%s‘"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Уреди фасциклу претраге"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
@@ -15171,24 +15593,34 @@ msgstr "Фасцикла имена „{1}“ већ постоји. Додел�
 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 ""
 "Фасцикла са садржајем на „{1}“ већ постоји.\n"
 "\n"
-"Можете или да игноришете ову фасциклу, препишете је или допуните њен садржај, или изађете."
+"Можете или да игноришете ову фасциклу, препишете је или допуните њен "
+"садржај, или изађете."
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "Признаница је затражена за „{1}“. Послати признаницу за {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../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 "Потпис назван „{0}“ већ постоји. Наведите друго име."
 
 #: ../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 "Додавањем смисленог наслова вашим порукама даћете примаоцима до знања о чему пишете."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Додавањем смисленог наслова вашим порукама даћете примаоцима до знања о чему "
+"пишете."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15199,7 +15631,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
 
 #: ../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 "Сигурно желите да искључите овај налог и обришете све посреднике?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15207,11 +15640,16 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Сигурно желите да отворите {0} порука одједном?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "Желите ли трајно да уклоните све обрисане поруке из фасцикле „{0}“?"
 
 #: ../mail/mail.error.xml.h:15
@@ -15292,8 +15730,12 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Није могуће отворити циљ „{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 "Није могуће прочитати датотеку лиценце „{0}“, због проблема са инсталацијом. Нећете моћи да користите овог пружаоца док не прихватите лиценцу."
+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 ""
+"Није могуће прочитати датотеку лиценце „{0}“, због проблема са инсталацијом. "
+"Нећете моћи да користите овог пружаоца док не прихватите лиценцу."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:35
@@ -15328,8 +15770,12 @@ msgid "Check Junk Failed"
 msgstr "Провера нежељене поште није успела"
 
 #: ../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 "Проверите да ли сте исправно откуцали лозинку. Не заборавите да је у већини лозинки величина слова битна; можда су укључена велика слова."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Проверите да ли сте исправно откуцали лозинку. Не заборавите да је у већини "
+"лозинки величина слова битна; можда су укључена велика слова."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15368,8 +15814,12 @@ msgid "Do not disable"
 msgstr "Немој искључити"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "Желите ли локално да ускладите фасцикле које су означене за коришћење ван мреже?"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Желите ли локално да ускладите фасцикле које су означене за коришћење ван "
+"мреже?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15409,8 +15859,12 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наставите, нећете моћи да вратите ове поруке."
 
 #: ../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 "Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли ће бити трајно обрисани."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли ће бити "
+"трајно обрисани."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15429,8 +15883,12 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци налога биће трајно обрисани."
 
 #: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Уколико изађете, ове поруке неће бити послате док поново не покренете Еволуцију."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Уколико изађете, ове поруке неће бити послате док поново не покренете "
+"Еволуцију."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15445,8 +15903,15 @@ msgid "Mail filters automatically updated."
 msgstr "Филтери поште су аутоматски освежени."
 
 #: ../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 "Многи системи е-поште додају заглавље Изгледа-прима порукама које имају само BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
+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 ""
+"Многи системи е-поште додају заглавље Изгледа-прима порукама које имају само "
+"BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
+"Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15473,12 +15938,17 @@ msgid "Please enable the account or send using another account."
 msgstr "Молим одобрите налог или пошаљите коришћењем неког другог."
 
 #: ../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 "Унесите важећу електронску адресу у поље Прима:. Можете претражити електронске адресе кликом на дугме Прима: поред поља за унос."
+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 ""
+"Унесите важећу електронску адресу у поље Прима:. Можете претражити "
+"електронске адресе кликом на дугме Прима: поред поља за унос."
 
 #: ../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 ""
 "Проверите да ли следећи примаоци желе и могу да приме HTML пошту:\n"
@@ -15544,18 +16014,27 @@ msgstr "Ускладити фасцикле локално за рад ван м
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
 #: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Системске фасцикле неопходне да би Еволуција исправно радила се не могу преименовати, преместити или обрисати."
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Системске фасцикле неопходне да би Еволуција исправно радила се не могу "
+"преименовати, преместити или обрисати."
 
 #: ../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 ""
 "Листа контаката којој шаљете је подешена да скрива примаоце листе.\n"
 "\n"
-"Многи системи е-поште додају заглавље Изгледа-прима порукама које имају само BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
+"Многи системи е-поште додају заглавље Изгледа-прима порукама које имају само "
+"BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
+"Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -15598,32 +16077,46 @@ msgstr ""
 "идите у уређивач фасцикле претраге и додајте је изричито, ако желите."
 
 #: ../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 "Ова порука се не може послати пошто је искључен налог са којег шаљете"
 
 #: ../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 "Ова порука се не може послати пошто нисте навели ниједног примаоца"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "Овај сервер не подржава тражени тип аутентификације и можда уопште не подржава аутентификацију."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Овај сервер не подржава тражени тип аутентификације и можда уопште не "
+"подржава аутентификацију."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Овај потпис је промењен, али није сачуван."
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "Ово означава све поруке као прочитане у изабраној фасцикли и подфасциклама."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Ово означава све поруке као прочитане у изабраној фасцикли и подфасциклама."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Неуспело повезивање на GroupWise сервер."
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "Није могуће отварање фасцикле за припрему за овај налог.  Користити системску фасциклу за припрему?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Није могуће отварање фасцикле за припрему за овај налог.  Користити "
+"системску фасциклу за припрему?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15639,10 +16132,12 @@ msgstr "Користити подразумевану фасциклу за пр
 
 #: ../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 ""
-"Упозорење: брисање порука из фасцикле пертраге ће обрисати саму поруку са њене локације у фасцикли.\n"
+"Упозорење: брисање порука из фасцикле пертраге ће обрисати саму поруку са "
+"њене локације у фасцикли.\n"
 "Желите ли ово да урадите?"
 
 #: ../mail/mail.error.xml.h:127
@@ -15668,10 +16163,12 @@ msgstr "Морате навести фасциклу."
 #: ../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 ""
 "Морате навести бар једну фасциклу као извор.\n"
-"Било појединачним избором фасцикли, и/или избором свих локалних фасцикли, свих мрежних фасцикли или и једних и других."
+"Било појединачним избором фасцикли, и/или избором свих локалних фасцикли, "
+"свих мрежних фасцикли или и једних и других."
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -15697,90 +16194,87 @@ msgstr "Из_баци"
 msgid "_Open Messages"
 msgstr "_Отвори поруке"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:1596
-#: ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Данас %l:%M %p"
 
-#: ../mail/message-list.c:1612
-#: ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %l:%M %p"
 
-#: ../mail/message-list.c:1624
-#: ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632
-#: ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1634
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%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 "Прављење листе порука"
 
-#: ../mail/message-list.c:4224
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "Нема поруке са задатим условим претраге. Можете очистити претрагу из менија Претрага->Очисти или је изменити."
+#: ../mail/message-list.c:4288
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Нема поруке са задатим условим претраге. Можете очистити претрагу из менија "
+"Претрага->Очисти или је изменити."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -15813,42 +16307,44 @@ msgstr "_Пошаљи поруке"
 msgid "Size"
 msgstr "Величина"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Поље за _тему"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Позив"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Не прослеђуј"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Следи"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "За вашу информацију"
 
-#: ../mail/message-tag-followup.c:60
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Проследи"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
-#: ../mail/message-tag-followup.c:64
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/message-tag-followup.c:65
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Одговори свима"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Прочитати"
 
@@ -15889,15 +16385,23 @@ msgid "Provides core functionality for local address books."
 msgstr "Обезбеђује основну функционалност за локалне именике."
 
 #: ../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 "Списак предмета за којима ће додатак за подсећање укључивања прилога трагати у телу поруке"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Списак предмета за којима ће додатак за подсећање укључивања прилога трагати "
+"у телу поруке"
 
 #: ../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 "Списак предмета за којима ће прикључак за подсећање укључивања прилога трагати у телу поруке"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+"Списак предмета за којима ће прикључак за подсећање укључивања прилога "
+"трагати у телу поруке"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Кључне речи"
 
@@ -15907,12 +16411,20 @@ msgid "Attachment Reminder"
 msgstr "Подсетник на прилоге"
 
 #: ../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 "Трага за предметима у којима се може налазити прилог у поруци и упозорава уколико прилога нема"
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+"Трага за предметима у којима се може налазити прилог у поруци и упозорава "
+"уколико прилога нема"
 
 #: ../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 "Еволуција је пронашла неке кључне речи које наводе да би порука требало да садржи прилог, али исти не може да пронађе."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Еволуција је пронашла неке кључне речи које наводе да би порука требало да "
+"садржи прилог, али исти не може да пронађе."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
@@ -15923,154 +16435,163 @@ msgid "_Edit Message"
 msgstr "_Уреди поруку"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-msgstr "Додатак за обликовање који приказује звучне прилоге унутар поруке и дозвољава њихово пуштање директно из еволуције."
+#, fuzzy
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from Evolution."
+msgstr ""
+"Додатак за обликовање који приказује звучне прилоге унутар поруке и "
+"дозвољава њихово пуштање директно из еволуције."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "Додатак за звук унутар поруке"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Изаберите име за резервну копију Еволуције"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "_Поново покрени Еволуцију након прављења резерве"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Изаберите име резервне копије Еволуције за повраћај"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "_Поново покрени Еволуцију након повраћаја"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Враћа из резервне копије"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 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 ""
-"Еволуцију можете повратити из резервне копије. Можете повратити пошту, календаре, задужења, белешке, контакте.\n"
+"Еволуцију можете повратити из резервне копије. Можете повратити пошту, "
+"календаре, задужења, белешке, контакте.\n"
 "Такође се  могу повратити сва лична подешавања, филтери за пошту, итд."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "_Поврати Еволуцију из датотеке резервне копије"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Изаберите архиву Еволуције за повраћај:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Изаберите датотеку за повраћај"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Директоријум за резерву Еволуције"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Директоријум за повраћај Еволуције"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Проверава резервну копију Еволуције"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Поново покреће Еволуцију"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Са графичком окружењем"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Гашење Еволуције"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Израђује резервну копију налога и подешавања Еволуције"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Израда резервне копије података Еволуције (пошта, календари, задужења, белешке)"
+msgstr ""
+"Израда резервне копије података Еволуције (пошта, календари, задужења, "
+"белешке)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Израда резервне копије завршена"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Поновно покретање Еволуције"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Израђује резервну копију тренутних података Еволуције"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Отпакивање датотека из резервне копије"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Учитава подешавања Еволуције"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Уклањање привремених резервних датотека"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Осигурање локалних извора"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Смешта резервну копију у фасциклу %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Врши повраћај из фасцикле %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Резервна копија Еволуције"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Повраћај Еволуције"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Израђује резервну копију података Еволуције"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Сачекајте док Еволуција прави резервну копију података."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Повраћај података Еволуције"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Сачекајте док Еволуција враћа податке у првобитно стање."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ово може потрајати, у зависности од количине података на налогу."
 
@@ -16088,12 +16609,22 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Сигурно желите да затворите Еволуцију?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "Сигурно желите да повратите Еволуцију из изабране датотеке резервне копије?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Сигурно желите да повратите Еволуцију из изабране датотеке резервне копије?"
 
 #: ../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 "Израда резервне копије може бити покренута само када Еволуција не ради. Пре него што наставите, проверите да ли сте сачували и затворили све прозоре у којима сте радили. Уколико желите да се Еволуција сама покрене након завршетка процедуре, означите ову опцију."
+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 ""
+"Израда резервне копије може бити покренута само када Еволуција не ради. Пре "
+"него што наставите, проверите да ли сте сачували и затворили све прозоре у "
+"којима сте радили. Уколико желите да се Еволуција сама покрене након "
+"завршетка процедуре, означите ову опцију."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16112,8 +16643,18 @@ msgid "The selected folder is not writable."
 msgstr "У изабрану фасциклу се не може писати."
 
 #: ../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 "Ово ће обрисати све тренутне податке и подешавања Еволуције и повратити их из резервне копије. Ова процедура се може покренути само када Еволуција не ради. Пре него што наставите, проверите да ли сте затворили све прозоре у којима сте радили. Уколико желите да се Еволуција сама покрене након завршетка процедуре, означите ову опцију."
+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 ""
+"Ово ће обрисати све тренутне податке и подешавања Еволуције и повратити их "
+"из резервне копије. Ова процедура се може покренути само када Еволуција не "
+"ради. Пре него што наставите, проверите да ли сте затворили све прозоре у "
+"којима сте радили. Уколико желите да се Еволуција сама покрене након "
+"завршетка процедуре, означите ову опцију."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16127,69 +16668,73 @@ msgstr "Оп_оравља подешавања..."
 msgid "_Backup Settings..."
 msgstr "_Израђује резерву подешавања..."
 
-#: ../plugins/bbdb/bbdb.c:543
-#: ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Аутоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Аутоматски направи уносе у адресар при одговарању на поруке"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изабери именик за Аутоматске контакте"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Брзе поруке"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Усклађује податке о контактима и сликама са листом другара у Пиџину"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Бира адресар за Pidgin листу пријатеља"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Усклади са _листом другара сада"
 
 #: ../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 "Аутоматски попуњава адресар именима и адресама е-поште када одговарате на поруке. Такође попуњава податке за контакт брзим гласником из списка другара."
+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 ""
+"Аутоматски попуњава адресар именима и адресама е-поште када одговарате на "
+"поруке. Такође попуњава податке за контакт брзим гласником из списка другара."
 
 #: ../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:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Дошло је до грешке у припреми %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Зависан процес Богофилтера не реагује, гасим..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Чекање на зависан процес Богофилтера ометено, прекидам..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Цев ка Богофилтеру је пукла, ознака грешке: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Пребаци текст поруке у _Уникод"
 
@@ -16198,8 +16743,12 @@ msgid "Convert mail messages to Unicode"
 msgstr "Пребацује поруке поште у Уникод"
 
 #: ../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 "Пребацује текст поруке у Уникод UTF-8 ради обједињавања spam/ham предмета чији су узрок различити кодни распореди."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Пребацује текст поруке у Уникод UTF-8 ради обједињавања spam/ham предмета "
+"чији су узрок различити кодни распореди."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
@@ -16213,22 +16762,31 @@ msgstr "Прикључак за нежељену пошту Богофилтер
 msgid "Filters junk messages using Bogofilter."
 msgstr "Филтрира нежељену пошту коришћењем Богофилтера."
 
-#: ../plugins/caldav/caldav-source.c:66
-#: ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_Адреса :"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "Користи шифровану везу"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "О_свежи:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV извори календара"
@@ -16245,13 +16803,6 @@ msgstr "Локални календари"
 msgid "Provides core functionality for local calendars."
 msgstr "Даје основну употребу локалним календарима."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "О_свежи:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Користи сигурну везу"
@@ -16268,48 +16819,55 @@ msgstr "HTTP Календари"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Даје основну употребу http календарима и оним на вебу."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Време: облачно"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Време: магла"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Време: местимично облачно"
+msgid "Weather: Cloudy"
+msgstr "Време: облачно"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Време: киша"
+msgid "Weather: Cloudy Night"
+msgstr "Време: облачна ноћ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "Време: тмурно"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Време: киша"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Време: снег"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Време: сунчано"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Време: ведра ноћ"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Време: грмљавине"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Изаберите место"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Јединице:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Метричне (Целзијус, цм, итд.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Империјалне (Фаренхајт, инчи, итд.)"
 
@@ -16322,8 +16880,12 @@ msgid "Weather Calendars"
 msgstr "Календари времена"
 
 #: ../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 "Пробни додатак који показује искачући мени за умножавање ствари у листу исечака."
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+"Пробни додатак који показује искачући мени за умножавање ствари у листу "
+"исечака."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16334,12 +16896,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Провери да ли је Еволуција подразумевани програм за пошту"
 
 #: ../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 "Сваки пут када се Еволуција покрене, провери да ли је подразумевани програм за пошту."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Сваки пут када се Еволуција покрене, провери да ли је подразумевани програм "
+"за пошту."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "При покретању проверава да ли је Еволуција подразумевани клијент за пошту."
+msgstr ""
+"При покретању проверава да ли је Еволуција подразумевани клијент за пошту."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16350,7 +16916,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Желите ли да Еволуцију учините подразумеваним клијентом е-поште?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Еволуција"
 
@@ -16375,19 +16941,23 @@ msgid "Default Sources"
 msgstr "Подразумевани извори"
 
 #: ../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."
-msgstr "Обезбеђује функционалност за обележавање неког календара или именика као подразумеваног."
+msgid ""
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr ""
+"Обезбеђује функционалност за обележавање неког календара или именика као "
+"подразумеваног."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Прилагођено заглавље"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Кључ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Вредности"
 
@@ -16418,8 +16988,20 @@ msgid "List of Custom Headers"
 msgstr "Списак прилагођених заглавља"
 
 #: ../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 \";\""
-msgstr "Кључ наводи списак прилагођених заглавља које можете додати одлазној поруци. Формат за навођење заглавља и његове вредности је: назив прилагођеног заглавља, затим „=“ и вредности одвојене са „;“"
+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 ""
+"Кључ наводи списак прилагођених заглавља које можете додати одлазној поруци. "
+"Формат за навођење заглавља и његове вредности је: назив прилагођеног "
+"заглавља, затим „=“ и вредности одвојене са „;“"
+
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16438,28 +17020,36 @@ msgid "_User:"
 msgstr "_Корисник:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Сигурна лозинка"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
-msgstr "Ова опција ће повезати на Exchange сервер коришћењем пријаве сигурном лозинком (NTLM)."
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+"Ова опција ће повезати на Exchange сервер коришћењем пријаве сигурном "
+"лозинком (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Текстуална лозинка"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "Ова опција ће повезати на Exchange сервер коришћењем пријаве текстуалном лозинком."
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"Ова опција ће повезати на Exchange сервер коришћењем пријаве текстуалном "
+"лозинком."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Ван канцеларије"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16467,88 +17057,93 @@ msgstr ""
 "Доле изабрана порука ће бити аутоматски послата свакој особи \n"
 "која Вам пошаље пошту док сте ван канцеларије."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Нисам у канцеларији"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "У канцеларији сам"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Унесите лозинку за налог Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Измените лозинку"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Управљајте подешавањима делегата за налог Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Помоћник за делегирање"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Разно"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Прегледај величине свих Exchange фасцикли"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Величина фасцикли"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange подешавања"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA адреса:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "А_утентификуј"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+msgid "S_pecify the mailbox name"
+msgstr "Одреди име _датотеке:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Сандуче:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "Тип _аутентификације"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "_Провери подржане типове"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../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 КБ"
 
-#: ../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."
@@ -16560,8 +17155,12 @@ msgstr ""
 #. * 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"
-msgstr "Тренутна лозинка не одговара постојећој лозинки за овај налог. Унесите исправну лозинку"
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+"Тренутна лозинка не одговара постојећој лозинки за овај налог. Унесите "
+"исправну лозинку"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -16589,34 +17188,34 @@ msgstr "Тренутна лозинка је истекла. Измените л
 msgid "Your password will expire in the next %d days"
 msgstr "Број дана након којих Ваша лозинка истиче: %d"
 
-#: ../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 "Прилагођено"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Уређивач (чита, прави, уређује)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Аутор (чита, прави)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Рецензент (само чита)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Делегирај овлашћења"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../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"
@@ -16625,31 +17224,35 @@ msgstr "Овлашћења за %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
-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 "Ову поруку је Еволуција аутоматски послала да би Вас обавестила да сте одређени за делегата. Сада можете слати поруке у моје име."
+#: ../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 ""
+"Ову поруку је Еволуција аутоматски послала да би Вас обавестила да сте "
+"одређени за делегата. Сада можете слати поруке у моје име."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Додељена су Вам следећа овлашћења на мојим фасциклама:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Такође Вам је дозвољено да видите моје приватне ствари."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Нисте овлашћени, међутим, да видите моје приватне податке."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "%s Вас је одредио за свог делегата"
@@ -16807,10 +17410,12 @@ msgstr "<b>Статус:</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>Доле изабрана порука ће бити аутоматски послата свакој особи која Вам пошаље\n"
+"<small>Доле изабрана порука ће бити аутоматски послата свакој особи која Вам "
+"пошаље\n"
 "пошту док нисте у канцеларији.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -16857,8 +17462,8 @@ msgstr "Додај корисника:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Додаје корисника"
 
@@ -16976,11 +17581,11 @@ msgstr "_Осетљивост: "
 msgid "_User"
 msgstr "_Корисник"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Изаберите корисника"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Именик..."
 
@@ -16993,38 +17598,50 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Пријави се на календар другог корисника"
 
 #: ../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 "Прикључак који рукује збирком нарочитих радњи и својстава над налозима за Exchange."
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Прикључак који рукује збирком нарочитих радњи и својстава над налозима за "
+"Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Exchange радње"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Није могуће променити лозинку због проблема у подешавању."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "Није могуће приказати фасцикле."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "Операција се не може одрадити."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
-msgstr "Промене у подешавању Exchange налога „{0}“ ће наступити након изласка и поновног покретања Еволуције."
-
 #: ../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 ""
+"Промене у подешавању Exchange налога „{0}“ ће наступити након изласка и "
+"поновног покретања Еволуције."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Није могућа аутентификација на сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Није могуће изменити лозинку."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17034,59 +17651,61 @@ msgstr ""
 "појаве непознате грешке. Проверите адресу, \n"
 "корисничко име и лозинку, и покушајте поново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "Није могуће повезивање на Exchange сервер."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Није могуће повезивање на сервер {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "Није могуће утврдити овлашћења за фасцикле делегата."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "Није могуће пронаћи Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Није могуће пронаћи сервер {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Није могуће {0} учинити делегатом"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Није могуће прочитати овлашћења фасцикли"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "Није могуће прочитати овлашћења фасцикли."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "Неуспело читање стања за ван канцеларије"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "Није могуће освежити овлашћења фасцикли."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "Није могуће освежити стање за ван канцеларије"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Потребно је поново покренути Еволуцију да би се учитало сандуче пријављеног корисника"
+msgstr ""
+"Потребно је поново покренути Еволуцију да би се учитало сандуче пријављеног "
+"корисника"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Exchange налог није на мрежи."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17114,101 +17733,106 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Неуспело освежавање делегата:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Фасцикла већ постоји"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Фасцикла не постоји"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Фасцикла није на мрежи"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Општа грешка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Сервер за општи каталог није приступачан."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
-msgstr "Уколико OWA ради на другој путањи, морате је навести у дијалогу за подешавање налога."
-
 #: ../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 ""
+"Уколико OWA ради на другој путањи, морате је навести у дијалогу за "
+"подешавање налога."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Поштанско сандуче за {0} није на овом серверу."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Проверите да ли је адреса исправна и покушајте поново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Проверите да ли је име сервера исправно написано и покушајте поново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
-msgstr "Проверите да ли су корисничко име и лозинка исправни и покушајте поново."
+msgstr ""
+"Проверите да ли су корисничко име и лозинка исправни и покушајте поново."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "Сервер за општи каталог није подешен за овај налог."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нема поштанског сандучета за корисника {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Нема таквог корисника {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "Лозинка је успешно промењена."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "Унесите ИБ делегата или искључите опцију слања као делегата"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Молим будите сигурни да је име Глобалног сервера за каталог тачно."
 
 # shell:noshell-reason title
-#: ../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 "Поново покрените Еволуцију да би промене наступиле"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Изаберите корисника."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "Сервер је одбио лозинку јер је преслаба."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange налог ће бити искључен када изађете из Еволуције"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange налог ће бити уклољен када изађете из Еволуције"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange сервер није компатибилан са Exchange Connector-ом."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17216,7 +17840,7 @@ msgstr ""
 "Сервер има покренут Exchange 5.5. Exchange Connector \n"
 "подржава само Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17230,80 +17854,95 @@ msgstr ""
 "\n"
 "Или сте можда само погрешно укуцали лозинку."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Покушајте поново другом лозинком."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "Није могућа додати корисника на листу за контролу приступа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "Није могуће уређивање делегата."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "Непозната грешка у проналажењу {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "Непозната грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Непознат тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "Операција није подржана"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "Приближавате се вашој квоти коју имате за смештање поште на овом серверу."
+msgstr ""
+"Приближавате се вашој квоти коју имате за смештање поште на овом серверу."
 
-#: ../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."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
 msgstr "Дозвоњено Вам је слање поруке у име само једног делегата одједном."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Не можете да себе делегирате"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Прекорачили сте квоту за смештај поште на овом серверу."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Можете само да подесите један Exchange налог."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "Тренутна искоришћеност је: {0} KB. Пробајте да ослободите простор брисањем неких порука."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
-msgstr "Тренутна искоришћеност је: {0} KB. Од овог тренутка нећете моћи ни да шаљете ни да примате пошту."
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+"Тренутна искоришћеност је: {0} KB. Пробајте да ослободите простор брисањем "
+"неких порука."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h: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 "Тренутна искоришћеност је: {0} KB. Нећете моћи да шаљете пошту док не ослободите простор брисањем неких порука."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+"Тренутна искоришћеност је: {0} KB. Од овог тренутка нећете моћи ни да шаљете "
+"ни да примате пошту."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h: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 ""
+"Тренутна искоришћеност је: {0} KB. Нећете моћи да шаљете пошту док не "
+"ослободите простор брисањем неких порука."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Лозинка је истекла."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не може бити додат на листу за контролу приступа"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} је већ делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} је већ не листи"
 
@@ -17324,8 +17963,12 @@ msgid "The default command that must be used as the editor."
 msgstr "Подразумевана наредба која се користи као уређивач."
 
 #: ../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 "Додатак за коришћење другог уређивача за састављање. Можете слати само поруке у обичном тексту."
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+"Додатак за коришћење другог уређивача за састављање. Можете слати само "
+"поруке у обичном тексту."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17341,12 +17984,20 @@ msgid "Editor not launchable"
 msgstr "Уређивач се не покреће"
 
 #: ../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 "Еволуција није могла да направи привремену датотеку за чување поште. Покушајте касније."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Еволуција није могла да направи привремену датотеку за чување поште. "
+"Покушајте касније."
 
 #: ../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 "Уређивач које сте навели у поставкама додатка није могуће покренути. Покушајте да наведете други уређивач."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Уређивач које сте навели у поставкама додатка није могуће покренути. "
+"Покушајте да наведете други уређивач."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17356,11 +18007,11 @@ msgstr "Састави у _другом уређивачу"
 msgid "Compose messages using an external editor"
 msgstr "Саставите поруке коришћењем другог уређивача"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Наредба за извршавање ради покретања уређивача:"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17381,12 +18032,14 @@ msgid "_Face"
 msgstr "_Лице"
 
 #: ../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 "Прилаже заглавље с лицем одлазним порукама. Потребно је први пут да корисник подеси 48*48 png слику. Она је шифрирана као base64  и смештена у ~/.evolution/faces Као таква ће бити коришћена у порукама које се надаље шаљу."
-
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Лице"
+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 ""
+"Прилаже заглавље с лицем одлазним порукама. Потребно је први пут да корисник "
+"подеси 48*48 png слику. Она је шифрирана као base64  и смештена у ~/."
+"evolution/faces Као таква ће бити коришћена у порукама које се надаље шаљу."
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -17394,8 +18047,10 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Одјава са фасцикле „%s“"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr "Дозвољава одјаву фасцикли за пошту у менију десним кликом на стабло фасцикли."
+#, fuzzy
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr ""
+"Дозвољава одјаву фасцикли за пошту у менију десним кликом на стабло фасцикли."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17407,22 +18062,19 @@ msgstr "_Одјави се"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Прво унесите корисничко име."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Унесите лозинку за корисника %s ради приступа листи пријављених календара."
+msgstr ""
+"Унесите лозинку за корисника %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"
@@ -17431,21 +18083,22 @@ msgstr ""
 "Није могуће прочитати податке са сервера Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "Кал_ендар:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "Довуци _листу"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Сервер</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+#, fuzzy
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Прикључак за постављање календара и контаката за google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17457,14 +18110,16 @@ msgid "Checklist"
 msgstr "Списак"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "Додатак за намештање извора групних календара и именика."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "Постављање Groupware налога"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17489,11 +18144,11 @@ msgstr ""
 "Кликните 'Напред' ради инсталације дељене фасцикле\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Инсталирај дељену фасциклу"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Инсталација дељене фасцикле"
 
@@ -17519,7 +18174,7 @@ msgid "Email:"
 msgstr "Е-пошта:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Онемогући"
 
@@ -17536,8 +18191,12 @@ msgid "Message Retract"
 msgstr "Повлачење поруке"
 
 #: ../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 "Повлачење поруке је може уклонити из сандучета примаоца. Желите ли ово да урадите? "
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Повлачење поруке је може уклонити из сандучета примаоца. Желите ли ово да "
+"урадите? "
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17548,15 +18207,18 @@ msgid "Retract Mail"
 msgstr "Повуци пошту"
 
 #: ../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 "Додај опције слања 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 "Додатак за могућности Groupwise налога."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Groupware могућности"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17575,22 +18237,26 @@ msgstr "Неисправан корисник"
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../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 "Кориснику &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 "Изаберите корисника"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Већ имате овлашћења за посредника за овог корисника."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr "Морате навести исправно корисничко име за давање права приступа посреднику."
+msgstr ""
+"Морате навести исправно корисничко име за давање права приступа посреднику."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
@@ -17601,27 +18267,35 @@ msgid "Account Already Exists"
 msgstr "Налог већ постоји"
 
 #: ../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 "Пријава на посредника као &quot;{0}&quot; није била успешна. Проверите адресу е-поште и покушајте поново."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Пријава на посредника као &quot;{0}&quot; није била успешна. Проверите "
+"адресу е-поште и покушајте поново."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Овај састанак се понавља"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Прихватате?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Одбијате?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &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 "Не можете поделити фасциклу са наведеним корисником &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 "Морате навести киме корисника којег желите да додате на листу"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17712,7 +18386,8 @@ msgstr "_Пиши"
 msgid "permission to read|_Read"
 msgstr "Дозвола за читање|_Читај"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Мрежни посредник"
 
@@ -17720,14 +18395,15 @@ msgstr "Мрежни посредник"
 msgid "<b>Account Name</b>"
 msgstr "<b>Име налога</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Пријава за мрежног посредника"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУнесите лозинку за %s (корисник %s)"
@@ -17735,20 +18411,29 @@ msgstr "%sУнесите лозинку за %s (корисник %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "Пријава за мрежног _посредника..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "Језичак за мрежног посредника ће бити доступан само када налог буде на мрежи."
+msgstr ""
+"Језичак за мрежног посредника ће бити доступан само када налог буде на мрежи."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "Језичак за мрежног посредника ће бити доступан само када налог буде омогућен."
+msgstr ""
+"Језичак за мрежног посредника ће бити доступан само када налог буде омогућен."
+
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Уметни напредне могућности слања"
 
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Корисници"
 
@@ -17764,68 +18449,68 @@ msgstr "Нова _дељена фасцикла..."
 msgid "Sharing"
 msgstr "Дељење"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Прилагођено обавештење"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Додај "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Измени"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Статус поруке"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Наслов:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "Шаље:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Датум прављења:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Прималац:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Испоручено:"
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Отворено:"
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Прихваћено:"
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Обрисано:"
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Одбијено:"
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Завршено:"
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Неиспоручено:"
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Прати статус поруке..."
 
@@ -17863,10 +18548,12 @@ msgstr "Прибави с_ва заглавља"
 
 #: ../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 ""
-"Показује додатна заглавља која је потребно преузети заједно са стандардним заглављима. \n"
+"Показује додатна заглавља која је потребно преузети заједно са стандардним "
+"заглављима. \n"
 "Избором \"Сва заглавља\" ово можете игнорисати."
 
 #: ../plugins/imap-features/imap-headers.glade.h:7
@@ -17927,30 +18614,41 @@ msgstr "Увези у календар"
 msgid "Imports ICS attachments to calendar."
 msgstr "Увози ICS прилоге у календар."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Слој хардверске апстракције није учитан"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
-msgstr "Сервис \"hald\"  је неопходан али није тренутно активан. Укључите сервис и поново покрените програм, или контактирајте администратора система."
+#: ../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 ""
+"Сервис \"hald\"  је неопходан али није тренутно активан. Укључите сервис и "
+"поново покрените програм, или контактирајте администратора система."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Тражење iPod уређаја није успело"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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 "Еволуција није пронашла iPod ради усклађивања. Уређај или није прикључен на систем или није укључен."
+#: ../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 ""
+"Еволуција није пронашла iPod ради усклађивања. Уређај или није прикључен на "
+"систем или није укључен."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "иКалендар облик (.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 "Усклађује изабрано задужење/белешку/календар/адресар са џепним уређајем Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr ""
+"Усклађује изабрано задужење/белешку/календар/адресар са џепним уређајем "
+"Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17960,236 +18658,246 @@ msgstr "Усклади са iPod џепним уређајем"
 msgid "iPod Synchronization"
 msgstr "_Усклађивање са iPod џепним уређајем"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Није могуће отварање календара „%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 "Један заказани састанак у календару „%s“ је у исто време кад и овај сусрет"
+msgstr ""
+"Један заказани састанак у календару „%s“ је у исто време кад и овај сусрет"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Заказани састанак је пронађен у календару „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу пронаћи овај сусрет у ниједном календару"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Не могу пронаћи ово задужење у ниједном списку задужења"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Ниједан списак белешки не садржи ову белешку"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага једне постојеће верзије овог састанка је у току"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Није могућа обрада предмета"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Није могуће слање предмета календару ’%s‘.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Послато календару ’%s‘ као прихваћено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару ’%s‘ уз резерву"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару ’%s‘ као одбијено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Није могуће послати обавештење о отказивању делегату"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Стање учесника није освежено због неисправног стања"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Није могуће освежавање за учесника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Стање учесника је освежено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Податак о састанку послат"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Податак о задужењу послат"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Податак о белешци послат"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Није могуће слање података о састанку, састанак не постоји"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Није могуће слање податка о задужењу, задужење не постоји"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Није могуће слање података о белешци, белешка не постоји"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Приложен календар није исправан"
 
-#: ../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:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "Порука пријављује календар, али тај календар није исправан иКалендар."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Предмет у календару није исправан"
 
-#: ../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 "Порука садржи календар, али он не садржи догађаје, задужења или слободно/заузето податке."
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Порука садржи календар, али он не садржи догађаје, задужења или слободно/"
+"заузето податке."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више предмета"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
-msgid "To process all of these items, the file should be saved and the calendar imported"
-msgstr "Ради обраде свих ових предмета, потребно је датотеку сачувати а календар увести"
+#: ../plugins/itip-formatter/itip-formatter.c:1584
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Ради обраде свих ових предмета, потребно је датотеку сачувати а календар "
+"увести"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Овај се састанак понавља"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Ово се задужењесе понавља"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Ова се белешка понавља"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Обриши поруку након радње"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Табела претраге за преклапањима"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Бира календаре за претрагу преклапања у састанцима"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189
-#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Данас"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Данас %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Данас %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Данас %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Сутра"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Сутра %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Сутра %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Сутра %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сутра %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -18199,69 +18907,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -18271,327 +18979,349 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Одговорите у име <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Примљено у име <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> преко %s објави следећи податак о састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> објави следећи податак о састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> Вам делегира следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> преко %s захтева Ваше присуство на следећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> захтева Ваше присуство на следећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> преко %s жели да дода постојећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> жели да дода постојећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> преко %s жели да прими најновије информације за следећи састанак:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+"<b>%s</b> преко %s жели да прими најновије информације за следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> жели да прими најновији податак за следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> преко %s шаље следећи одговор за састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> посла следећи одговор за састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> преко %s отказа следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> отказа следећи састанак."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> преко %s предлаже следеће промене састанка."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> предложи следеће промене састанка."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> преко %s одби следеће промене састанка:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> одби следеће промене састанка."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> преко %s објави следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> објави следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> захтева да %s преузме следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> преко %s Вам додели задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> Вам додели задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b преко %s жели да дода постојећем задужењу:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b жели да дода постојећем задужењу:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> преко %s жели да добије најновије информације за следеће додељено задужење:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+"<b>%s</b> преко %s жели да добије најновије информације за следеће додељено "
+"задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> жели да добије најновије информације за следеће додељено задужење:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"<b>%s</b> жели да добије најновије информације за следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> преко %s враћа следећи одговор на додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> посла назад следећи одговор на додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> преко %s отказа следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> отказа следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> преко %s предлаже следеће промене у додели задужења:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> предложи следеће промене у додели задужења:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> преко %s одби следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> одби следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> преко %s објави следећу белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> објави следећу белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> преко %s жели да дода постојећој белешци:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> жели да дода постојећој белешци:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> преко %s отказа следећу дељену белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> отказа следеће дељену белешку:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Отвори календар"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Одбиј"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Одбиј"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "При_хвати"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "П_рихвати све"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "Пошаљи подат_ке"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "Освежи стање учесни_ка"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "Ос_вежи"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Време почетка:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Време завршетка:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Напомена:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Пошаљи о_свежене податке учесницима"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "При_мени на све нивое"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Прикажи време као _слободно"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Подсетник на прилоге"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "За_дужења:"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Белешке :"
 
@@ -18604,18 +19334,23 @@ msgid "Itip Formatter"
 msgstr "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; делегира састанак. Желите ли да додате делегата &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; делегира састанак. Желите ли да додате делегата &quot;{1}"
+"&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Овај састанак је делегиран"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Овај одговор није послао присутан учесник. Додати га у присутне?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Одјава са мрежног посредника"
 
@@ -18648,8 +19383,12 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Ствара D-BUS поруку када стигне нова пошта."
 
 #: ../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 "Ако је „тачно“ свирне, иначе пушта звучну датотеку када стигне нова порука."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Свирне ако је постављено на „true“ (тачно), а иначе пушта звучну датотеку "
+"када стигне нова порука."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18665,7 +19404,8 @@ msgstr "Искачућа порука са иконом."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Приказује икону за нову пошту у обавештајној зони када стигне нова порука."
+msgstr ""
+"Приказује икону за нову пошту у обавештајној зони када стигне нова порука."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -18673,7 +19413,9 @@ msgstr "Име датотеке за пуштање."
 
 #: ../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 "Звучна датотека за пуштање када стигне нова порука, уколико није укључено обавештење сиреном."
+msgstr ""
+"Звучна датотека за пуштање када стигне нова порука, уколико није укључено "
+"обавештење сиреном."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
@@ -18691,20 +19433,20 @@ msgstr "Да ли да икона трепће или не."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Да ли да обавести о новој поруци само за пријемно сандуче."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Ствара _D-Bus поруку"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Еволуцијино обавештење о пошти"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Поставке обавештења о пошти"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18722,7 +19464,7 @@ msgstr[2] ""
 "Примили сте %d нових порука\n"
 "у %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18730,62 +19472,69 @@ msgstr[0] "Примили сте %d нову поруку."
 msgstr[1] "Примили сте %d нове поруке."
 msgstr[2] "Примили сте %d нових порука."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Приказује икону у _обавештајној зони"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "Тре_пери икона у обавештајној зони "
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Прикажи _поруку заједно са иконом"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "_Пусти звук када стигне нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Свирни"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Пусти _звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Пу_сти"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Обавести о новим порукама само за _пријемно сандуче"
 
 #: ../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 "Ствара D-Bus поруку или обавештава корисника иконом у обавештајној зони и обавештењем када стигне нова порука."
+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 ""
+"Ствара D-Bus поруку или обавештава корисника иконом у обавештајној зони и "
+"обавештењем када стигне нова порука."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Обавештење о пошти"
 
 #: ../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."
-msgstr "Додатак који омогућава прављење састанака из садржаја електронске поруке."
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+"Додатак који омогућава прављење састанака из садржаја електронске поруке."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -18801,12 +19550,19 @@ msgid "Cannot open calendar. %s"
 msgstr "Није могуће отворити календар. %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 "Изабрани извор је само за читање, стога не можете ту направити задужење. Изаберите други извор."
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Изабрани извор је само за читање, стога не можете ту направити задужење. "
+"Изаберите други извор."
 
 #: ../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."
-msgstr "Додатак који омогућава прављење задужења из садржаја електронске поруке."
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+"Додатак који омогућава прављење задужења из садржаја електронске поруке."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -18843,8 +19599,10 @@ msgid "Mailing _List"
 msgstr "Дописна _листа"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "Обезбеђује радње за опште наредбе дописних листи (пријава, одјава, ...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr ""
+"Обезбеђује радње за опште наредбе дописних листи (пријава, одјава, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -18864,11 +19622,14 @@ msgstr "Радња није доступна"
 
 #: ../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 ""
-"Електронска порука ће бити послата на адресу „{0}“. Можете поруку да пошаљете аутоматски, или је прво погледати и изменити.\n"
+"Електронска порука ће бити послата на адресу „{0}“. Можете поруку да "
+"пошаљете аутоматски, или је прво погледати и изменити.\n"
 "\n"
 "Требало би да добијете одговор са дописне листе убрзо након слања поруке."
 
@@ -18885,20 +19646,27 @@ msgid "Posting not allowed"
 msgstr "Слање није дозвољено"
 
 #: ../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 "Слање на ову дописну листу није дозвољено. Можда је ова листа само за читање. Обратите се власнику листе за детаље."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Слање на ову дописну листу није дозвољено. Можда је ова листа само за "
+"читање. Обратите се власнику листе за детаље."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Послати електронску поруку на дописну листу?"
 
 #: ../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 ""
-"Радњу није могуће извести. То значи да заглавље за ову радњу није садржало обрадиву радњу.\n"
+"Радњу није могуће извести. То значи да заглавље за ову радњу није садржало "
+"обрадиву радњу.\n"
 "\n"
 "Заглавље: {0}"
 
@@ -18913,7 +19681,9 @@ msgstr ""
 "Заглавље: {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."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "Ова порука не садржи потребне податке у заглављу за ову радњу."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18977,8 +19747,12 @@ msgid "Also mark messages in subfolders?"
 msgstr "Означити такође и поруке у подфасциклама?"
 
 #: ../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 "Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и оне у подфасциклама? "
+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 ""
+"Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и "
+"оне у подфасциклама? "
 
 #: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
@@ -19001,22 +19775,6 @@ msgstr "Означи по_руке као прочитане"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Користи се за обележавање свих порука у фасцикли да буду прочитане"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Означи календар за рад ван мреже"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Означава изабран календар за преглед ван мреже."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Онемогући да ово буде доступно ван мреже"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Омогући за рад ван мреже"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Додатак који уводи mono додатке."
@@ -19066,11 +19824,13 @@ msgstr "Додатак"
 
 #: ../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 ""
-"Пробни додатак који показује како додатак за обликовање омогућава искључивање HTML поште.\n"
+"Пробни додатак који показује како додатак за обликовање омогућава "
+"искључивање HTML поште.\n"
 "\n"
 "Овај додатак је само за потребе демонстрације.\n"
 
@@ -19083,19 +19843,19 @@ msgstr "Модел текста"
 msgid "Prefer plain-text"
 msgstr "Предност текст"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Прикажи HTML ако постоји"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Предност PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Искључиво приказуј PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML _режим"
 
@@ -19107,6 +19867,20 @@ msgstr "Еволуцијин испитивач"
 msgid "Writes a log of profiling data events."
 msgstr "Уписује дневник испитивачких догађаја."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Увози пошту из програма Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Outlook CSV и Tab увозник"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Дозвољава објављивање календара на Интернету"
@@ -19123,8 +19897,9 @@ msgstr "Места"
 msgid "_Publish Calendar Information"
 msgstr "Објави распоред из _календара"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Сигурно желите да уклоните ову адресу?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19162,8 +19937,9 @@ msgid "Publishing _Frequency:"
 msgstr "Учеста_лост објављивања"
 
 #: ../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"
@@ -19211,6 +19987,16 @@ msgstr ""
 "иКал\n"
 "Слободно/заузето"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+msgid "New Location"
+msgstr "Место"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+msgid "Edit Location"
+msgstr "Место"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Здраво Python"
@@ -19228,72 +20014,78 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Покретач тест прикључка за Python EPlugin."
 
 #: ../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 "Прикључак који учитава друге прикључке писаних језиком python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Покретач Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "Спам убица (уграђен)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Убица спама није пронађен, код: %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 "Није успело прављење цеви: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Грешка по издвајању: %s"
 
-#: ../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 "Зависан процес SpamAssassin није одговорио, убијам..."
 
-#: ../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 "Чекање на завистан процес Spamassassin ометено, прекидам..."
 
-#: ../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 "Цев ка Spamassassin је пукла, ознака грешке: %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 "Убица спама није доступан."
 
-#: ../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 "Ово ће учинити Убицу спама поузданијим, али споријим"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "У_кључи мрежне провере"
 
 #: ../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 "Филтрира нежељену пошту користећи Убицу спама. Овај додатак захтева његову поновну инсталацију."
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+"Филтрира нежељену пошту користећи Убицу спама. Овај додатак захтева његову "
+"поновну инсталацију."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Додатак за нежељену пошту Убице спама"
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Опције Убица спама"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Опције Убица спама"
+msgid "SpamAssassin junk plugin"
+msgstr "Додатак за нежељену пошту Убице спама"
 
 #: ../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."
@@ -19301,7 +20093,7 @@ msgstr "Додатак за чување свих прилога или дело
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Сачувај прилоге"
 
@@ -19313,15 +20105,15 @@ msgstr "Сачувај прилоге..."
 msgid "Save all attachments"
 msgstr "Сачувај све прилоге"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Изабери име за снимање базе"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Сачувај"
 
@@ -19329,79 +20121,79 @@ msgstr "Сачувај"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "ЈИБ"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Листа описа"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Листа категорија"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Листа коментара"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Направљено"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Контакт листа"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Почетак"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Крај"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "постотак завршеног"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "Адреса"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Списак учесника"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Измењено"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Напредне опције за CSV облик"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Прво укључи заглавље"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Граничник вредности:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Граничник записа:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Обавиј вредности са:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Зарезом одвојен облик вредности (.csv)"
 
@@ -19422,15 +20214,15 @@ msgstr "Сачувај на _диск"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF облик (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Изаберите одредишну датотеку"
 
@@ -19462,46 +20254,49 @@ msgstr "Води Вас кроз прво подешавање налога."
 msgid "Setup Assistant"
 msgstr "Помоћник подешавања"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Помоћник Еволуција подешавања"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Добро дошли"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"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 ""
-"Добро дошли у Еволуцију. Неколико наредних екрана ће омогућити да се Еволуција повеже на налоге елетронске поште и да увезе датотеке из других програма. \n"
+"Добро дошли у Еволуцију. Неколико наредних екрана ће омогућити да се "
+"Еволуција повеже на налоге елетронске поште и да увезе датотеке из других "
+"програма. \n"
 "\n"
 "Кликните „Напред“ да наставите. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Увожење датотека"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Изаберите податке које желите да увезете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Увожење података."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Сачекајте"
@@ -19524,18 +20319,22 @@ msgid "F_all back to threading messages by subject"
 msgstr "Вра_ти се на низање порука по наслову"
 
 #: ../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."
-msgstr "Списак парова кључна-реч/вредност које прикључак шаблона предмета замењује у телу поруке."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Списак парова кључна-реч/вредност које прикључак шаблона предмета замењује у "
+"телу поруке."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Без звања"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Сачувај као _шаблон"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
@@ -19544,7 +20343,8 @@ msgid "Drafts based template plugin"
 msgstr "Прикључак за образац за припреме"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "Једноставан додатак који користи ytnef за декодирање tnef прилога."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19570,7 +20370,8 @@ msgid "URL:"
 msgstr "Адреса :"
 
 #: ../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 "_Избегавај IfMatch (потребно на апачу < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19618,8 +20419,11 @@ msgid "Default window width"
 msgstr "Подразумевана ширина прозора"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Укључује подешавања посредника када приступа HTTP/безбедан HTTP преко интернета."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Укључује подешавања посредника када приступа HTTP/безбедан HTTP преко "
+"интернета."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -19642,15 +20446,24 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ИБ или алијас дела који се подразумевано приказује по покретању."
 
 #: ../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 "Ако је тачно, повезивање на посредника захтева аутентификацију. Корисничко име се чита из кључа GConf „/apps/evolution/shell/network_config/authentication_user“, а лозинка или из gnome-keyring, или датотеке лозинки ~/.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 ""
+"Ако је тачно, повезивање на посредника захтева аутентификацију. Корисничко "
+"име се чита из кључа GConf „/apps/evolution/shell/network_config/"
+"authentication_user“, а лозинка или из gnome-keyring, или датотеке лозинки "
+"~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Последња надограђена верзија подешавања"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Листа путања фасцикли за усклађивање на диску за рад ван мреже"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
@@ -19682,8 +20495,15 @@ msgid "Secure HTTP proxy port"
 msgstr "Порт безбедног посредника за 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 "Изаберите начин подешавања посредника. Подржане су вредности 0, 1, 2 и 3, које означавају „користи системске поставке“, „без посредника“, „користи ручна подешавања посредника“ и „користи подешавања посредника на адреси“, респективно."
+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 ""
+"Изаберите начин подешавања посредника. Подржане су вредности 0 (користи "
+"системске поставке), 1 (без посредника), 2 (користи ручна подешавања "
+"посредника) и 3 (користи подешавања посредника на адреси)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -19693,8 +20513,7 @@ msgstr "Бочна област је видљива"
 msgid "Skip development warning dialog"
 msgstr "Прескочи прозорче са упозорењем о развоју"
 
-#: ../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 "Почни рад ван мреже"
 
@@ -19703,8 +20522,12 @@ msgid "Statusbar is visible"
 msgstr "Линија са стањем је видљива"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Верзија подешавања Еволуције, са главним/споредним/нивоом подешавања — нпр. „2.6.0“."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Верзија подешавања Еволуције, са главним/споредним/нивоом подешавања — нпр. "
+"„2.6.0“."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
@@ -19719,8 +20542,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Подразумевана ширина помоћне линије, у пикселима."
 
 #: ../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 "Последња надограђена верзија подешавања Еволуције, са главним/споредним/нивоом подешавања (нпр. „2.6.0“)."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Последња надограђена верзија подешавања Еволуције, са главним/споредним/"
+"нивоом подешавања (нпр. „2.6.0“)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
@@ -19735,24 +20562,50 @@ msgid "The machine name to proxy socks through."
 msgstr "Назив машине за пуштање 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 "Порт на машини одређен у „/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 ""
+"Порт на машини одређен у „/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 "Порт на машини одређен у „/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 ""
+"Порт на машини одређен у „/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 "Порт на машини одређен у „/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 ""
+"Порт на машини одређен у „/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 "Стил дугмади прозора. Може бити „текст“, „иконе“, „обоје“, „палета алата“. Ако је постављено „палета алата“, Гномово подешавање палете алата утврђује стил дугмади."
+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 ""
+"Стил дугмади прозора. Може бити „text“ (текст), „icons“ (иконице), "
+"„both“ (обоје), „toolbar“ (палета алата). Ако је постављено „toolbar“, "
+"Гномово подешавање палете алата утврђује стил дугмади."
 
 #: ../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 "Овај кључ садржи списак домаћина који су директно повезани, без коришћења посредника (уколико је активан). Вредности могу бити домаћини, домени (употребом џокера попут *.foo.com), IP адресе домаћина (IPv4 и IPv6) и мрежне адресе са маском (нешто као 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 ""
+"Овај кључ садржи списак домаћина који су директно повезани, без коришћења "
+"посредника (уколико је активан). Вредности могу бити домаћини, домени "
+"(употребом џокера попут *.foo.com), IP адресе домаћина (IPv4 и IPv6) и "
+"мрежне адресе са маском (нешто као 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
@@ -19791,8 +20644,11 @@ msgid "Whether the toolbar should be visible."
 msgstr "Да ли да палета алата буде видљива."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Да ли ће прозорче са упозорењем у развојним верзијама Еволуције бити приказано."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Да ли ће прозорче са упозорењем у развојним верзијама Еволуције бити "
+"приказано."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
@@ -19823,8 +20679,12 @@ msgid "Choose the type of importer to run:"
 msgstr "Изаберите тип увозника:"
 
 #: ../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 "Изаберите датотеку коју желите да увезете у Еволуцију и изаберите којег је типа та датотека из листе."
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Изаберите датотеку коју желите да увезете у Еволуцију и изаберите којег је "
+"типа та датотека из листе."
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -19868,8 +20728,7 @@ msgstr "Еволуцијине поставке"
 
 #. 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 - Еволуција"
@@ -19894,7 +20753,7 @@ msgstr "Бубаждајин помоћник не може бити покре�
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Игор Несторовић <igor@prevod.org>\n"
@@ -19902,28 +20761,23 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Веб страница Еволуције"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "Грешка при отварању странице за помоћ."
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: ../shell/e-shell-window-commands.c:968
-#: ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ра_д ван мреже"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Рад ван мреже"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -19931,11 +20785,11 @@ msgstr ""
 "Еволуција је тренутно на мрежи.\n"
 "Кликните на ово дугме за рад ван мреже."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Еволуција је у процесу искључивања са мреже."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -19943,35 +20797,33 @@ msgstr ""
 "Еволуција тренутно није на мрежи.\n"
 "Кликните на ово дугме да се повежете."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Непозната системска грешка."
 
-#: ../shell/e-shell.c:839
-#: ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld 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 "У реду"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Неисправни аргументи"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Није могућа регистрација на OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "База са подешавањима није нађена"
 
@@ -20015,8 +20867,9 @@ msgid "Importer Type"
 msgstr "Тип увозника"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Изаберите увознике"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Изаберите фасциклу за увоз"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20033,7 +20886,7 @@ msgstr ""
 "увоза спољних датотека у Еволуцију."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20068,7 +20921,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо Ваш допринос!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20076,43 +20929,43 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Немој ми поново рећи"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Покрени Еволуцију уз наведени део"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Силом гаси све делове Еволуције"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Приморај понован пренос података из Еволуције 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Искључује учитавање свих додатака."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Искључује окно за преглед поште, контаката и задужења."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "Еволуција - Лични уредник података и програм за е-пошту"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20125,72 +20978,98 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Сигурно желите да све запамћене лозинке буду заборављене?"
 
+# shell:noshell-reason title
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Поново покреће Еволуцију"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Настави"
 
 # shell:upgrade-remove-1-4 primary
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Обрисати старе податке из верзије {0}?"
 
 # shell:noshell-reason primary
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Еволуција се не може покренути."
 
-#: ../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 "Заборављање лозинки ће очистити све запамћене лозинке. Поново ћете бити упитани када следећи пут буду биле потребне."
+#: ../shell/shell.error.xml.h:6
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"Заборављање лозинки ће очистити све запамћене лозинке. Поново ћете бити "
+"упитани када следећи пут буду биле потребне."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Недовољно места на диску за дограђивање."
 
 # shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Заиста обрисати старе податке?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"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 ""
 "Цео садржај фасцикле &quot;evolution&quot; ће бити трајно обрисан.\n"
 "\n"
-"Саветујемо да проверите да ли постоје пошта, контакти и календар, и да ли ова верзија Еволуције исправно ради пре брисања старих података.\n"
+"Саветујемо да проверите да ли постоје пошта, контакти и календар, и да ли "
+"ова верзија Еволуције исправно ради пре брисања старих података.\n"
 "\n"
-"После брисања, не можете да се вратите на претходну верзију Еволуције без ручне интервенције.\n"
+"После брисања, не можете да се вратите на претходну верзију Еволуције без "
+"ручне интервенције.\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 ""
 "Претходна верзија еволуције је смештала своје податке на друго место.\n"
 "\n"
-"Уколико одлучите да уклоните ове податке, цео садржај фасцикле &quot;evolution&quot; биће трајно обрисан. Уколико се одлучите да задржите ове податке, мораћете ручно да уклоните садржај из &quot;evolution&quot;када Вам одговара.\n"
+"Уколико одлучите да уклоните ове податке, цео садржај фасцикле &quot;"
+"evolution&quot; биће трајно обрисан. Уколико се одлучите да задржите ове "
+"податке, мораћете ручно да уклоните садржај из &quot;evolution&quot;када Вам "
+"одговара.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Неуспела надоградња са претходне верзије: {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 ""
-"Надоградња података и подешавања ће захтевати до {0} простора на диску, али имате на располагању само {1}.\n"
+"Надоградња података и подешавања ће захтевати до {0} простора на диску, али "
+"имате на располагању само {1}.\n"
 "\n"
 "Мораћете да ослободите више места у личној фасцикли пре него што наставите."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20200,7 +21079,7 @@ msgstr ""
 "\n"
 "Кликните на помоћ за детаље"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20214,27 +21093,29 @@ msgstr ""
 "\n"
 "Притисните на помоћ за детаље."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "За_борави"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Задржи податке"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Подсети ме касније"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
-"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"
-"Уколико одлучите да наставите, можда нећете моћи да приступите неким старим подацима.\n"
+"Уколико одлучите да наставите, можда нећете моћи да приступите неким старим "
+"подацима.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20248,12 +21129,22 @@ msgstr ""
 "Уредите подешавања поверења:"
 
 #: ../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 "Пошто верујете издаваоцу овог сертификата, онда верујете и у аутентичност овог сертификата осим ако овде не назначите другачије"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Пошто верујете издаваоцу овог сертификата, онда верујете и у аутентичност "
+"овог сертификата осим ако овде не назначите другачије"
 
 #: ../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 "Пошто не верујете издаваоцу овог сертификата, онда не верујете ни у аутентичност овог сертификата осим ако овде не назначите другачије"
+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 ""
+"Пошто не верујете издаваоцу овог сертификата, онда не верујете ни у "
+"аутентичност овог сертификата осим ако овде не назначите другачије"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -20282,9 +21173,8 @@ msgstr "Име сертификата"
 msgid "Purposes"
 msgstr "Намене"
 
-#: ../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 "Серијски број"
 
@@ -20395,11 +21285,14 @@ msgid "Backup All"
 msgstr "Резерва свега"
 
 #: ../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 "Пре веровања овом издаваоцу сертификата, прво прегледајте његов сертификат, политику и процедуре (ако су доступни)."
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Пре веровања овом издаваоцу сертификата, прво прегледајте његов сертификат, "
+"политику и процедуре (ако су доступни)."
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Сертификат"
 
@@ -20475,13 +21368,11 @@ msgstr "Организациона јединица (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 отисак"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Сертификат SSL клијента"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Сертификат SSL сервера"
 
@@ -20510,7 +21401,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Имате сертификате ових организација који вас одређују:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Држите сертификате који одређују ове издаваоце сертификата:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -20526,187 +21418,182 @@ msgid "_Edit CA Trust"
 msgstr "_Уреди поверење у 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 "Сертификат већ постоји"
 
-#: ../smime/lib/e-cert.c:239
-#: ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d./%m/%Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Потпиши"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Верзија"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Верзија 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Верзија 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 са RSA шифровањем"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 са RSA шифровањем"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 са RSA шифровањем"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA шифровање"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Употреба кључа сертификата"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape тип сертификата"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Одређивач кључа издаваоца сертификата"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Одређивач предмета (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Одређивач алгоритма"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Параметри алгоритма"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Подаци о јавном кључу субјекта"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Алгоритам јавног кључа субјекта"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Јавни кључ субјекта"
 
-#: ../smime/lib/e-cert.c:810
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Грешка: није могућа обрада проширења"
 
-#: ../smime/lib/e-cert.c:831
-#: ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Потписник предмета"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL издавач сертификата"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Издавач сертификата е-поште"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Потписивање"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Без одрицања"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Замућивање кључа"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Замућивање података"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Сагласност кључа"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Потписник сертификата"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL потписник"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Критично"
 
-#: ../smime/lib/e-cert.c:941
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Није критично"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Проширења"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092
-#: ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритам потписа сертификата"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Издавалац"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Јединствени ИБ издавача"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Јединствени ИБ субјекта"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа сертификата"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 лозинка датотеке"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Унесите лозинку за PKCS12 датотеку:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Увежен сертификат"
 
@@ -20740,22 +21627,21 @@ msgstr "Умножи _све контакте у..."
 msgid "Contact _Preview"
 msgstr "Пред-преглед ко_нтакта"
 
-#: ../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 "Умножи"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Copy selected contacts to another folder"
 msgstr "Умножи изабране контакте у другу фасциклу..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Умножи контакте изабране фасцикле у неку другу фасциклу"
 
-#: ../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 "Умножи изабрано"
 
@@ -20767,14 +21653,12 @@ msgstr "Умножи у фасциклу..."
 msgid "Create a new address book folder"
 msgstr "Прави нову фасциклу адресара"
 
-#: ../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 "Исеци"
 
-#: ../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 "Исеци изабрано"
 
@@ -20799,7 +21683,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Премести _све контакте у..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Move selected contacts to another folder"
 msgstr "Премести изабране контакте у другу фасциклу..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -20810,14 +21695,12 @@ msgstr "Премести контакте изабране фасцикле у �
 msgid "Move to Folder..."
 msgstr "Премести у фасциклу..."
 
-#: ../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 "Убаци"
 
-#: ../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 "Убаци из списка исечака"
 
@@ -20842,15 +21725,15 @@ msgid "Save as VCard..."
 msgstr "Сачувај као ВКарту..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+msgid "Save selected contacts as a VCard"
 msgstr "Чува изабране контакте као ВКарту."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Чува контакте изабране фасцикле као ВКарту."
 
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Изабери све"
 
@@ -20863,7 +21746,8 @@ msgid "Select all contacts"
 msgstr "Изабери све контакте"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts"
 msgstr "Шаље поруку изабраним контактима."
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -20871,7 +21755,8 @@ msgid "Send message to contact"
 msgstr "Шаље поруку контакту"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+msgid "Send selected contacts to another person"
 msgstr "Шаље изабране контакте другој особи."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -20894,8 +21779,7 @@ msgstr "Прекини учитавање"
 msgid "View the current contact"
 msgstr "Прегледај текући контакт"
 
-#: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Радње"
@@ -20924,8 +21808,7 @@ msgstr "Премес_ти контакт у..."
 msgid "_Move Folder Contacts To"
 msgstr "_Премести контакте из фасцикле у"
 
-#: ../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 "_Ново"
 
@@ -20985,9 +21868,8 @@ msgstr "Списак"
 msgid "Month"
 msgstr "Месец"
 
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Следеће"
 
@@ -20995,9 +21877,8 @@ msgstr "Следеће"
 msgid "Previews the calendar to be printed"
 msgstr "Прегледа календар за штампу"
 
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Претходно"
 
@@ -21005,8 +21886,7 @@ msgstr "Претходно"
 msgid "Print this calendar"
 msgstr "Штампа овај календар"
 
-#: ../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 "Изба_ци"
 
@@ -21054,15 +21934,23 @@ msgstr "Прикажи радну недељу"
 msgid "View the current appointment"
 msgstr "Прегледај текући састанак"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Прегледа поруке у конзоли за дијагнозу квара"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Недеља"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Радна недеља"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "Дневници _дијагнозе квара"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
@@ -21094,8 +21982,7 @@ msgstr "Преузима поруке за налоге/фасцикле кој�
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../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 "Фас_цикла"
 
@@ -21132,10 +22019,6 @@ msgstr "Прикажи прозор за преглед поруке"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријави се или одјави на фасцикле на мрежним серверима"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Прегледа поруке у конзоли за дијагнозу квара"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Класични приказ"
@@ -21144,10 +22027,6 @@ msgstr "_Класични приказ"
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Дневници _дијагнозе квара"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Преузима поруке за рад ван мреже"
@@ -21172,7 +22051,8 @@ msgstr "_Преглед"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+#, fuzzy
+msgid "_Subscriptions..."
 msgstr "_Пријаве"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21229,7 +22109,8 @@ msgid "Hide _Read Messages"
 msgstr "Сакриј про_читане поруке"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Сакриј обрисане поруке уместо њиховог прецртавања"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21252,10 +22133,6 @@ msgstr "Трајно уклони све обрисане поруке из ов
 msgid "Permanently remove this folder"
 msgstr "Трајно уклони ову фасциклу"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "О_свежи..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Освежава фасциклу"
@@ -21313,8 +22190,7 @@ msgstr "Поруке по расправама"
 msgid "_Group By Threads"
 msgstr "Групиши по расправама"
 
-#: ../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 "_Порука"
@@ -21640,8 +22516,7 @@ msgstr "Изабери _сав текст"
 msgid "Select all the text in a message"
 msgstr "Изабери сав текст у поруци"
 
-#: ../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 "Подеси страну за текући штампач"
 
@@ -21770,8 +22645,7 @@ msgstr "Ув_ећај"
 msgid "Close"
 msgstr "Затвори"
 
-#: ../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 "Главна палета алата"
 
@@ -21877,7 +22751,8 @@ msgstr "Отвара нов прозор за приказ ове фасцикл
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Приказује дугмад прозора коришћењем подешавања палете алата радне површине"
+msgstr ""
+"Приказује дугмад прозора коришћењем подешавања палете алата радне површине"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -22059,8 +22934,7 @@ msgstr "Према _предузећу"
 msgid "_Address Cards"
 msgstr "_Карте именика"
 
-#: ../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 "Преглед _списка"
 
@@ -22153,7 +23027,8 @@ msgstr "Мени за подешавање временске зоне"
 
 #: ../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 ""
 "Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
@@ -22181,18 +23056,18 @@ msgid "Define Views for \"%s\""
 msgstr "Одреди прегледе за „%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Табела"
 
 # bug(slobo): инстанца, примерак, погледај...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Структура"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Сачувај тренутни преглед"
 
@@ -22205,42 +23080,42 @@ msgid "_Replace existing view"
 msgstr "_Замени постојећи преглед"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Чува прилагођен преглед"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Одреди прегледе..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Т_ренутни преглед"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Бира преглед: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Тренутан преглед је корисник подесио"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Чува тренутни кориснички преглед"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Прави или мења прегледе"
 
@@ -22264,20 +23139,17 @@ msgstr "Тип прегледа"
 msgid "Type of view:"
 msgstr "Тип прегледа:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Линија прилога"
 
-#: ../widgets/misc/e-attachment.c:291
-#: ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591
-#: ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Није могуће прилагање датотеке %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299
-#: ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Није могуће прилагање датотеке %s: није регуларна датотека"
@@ -22303,87 +23175,80 @@ msgstr "Предложи аутоматски приказ прилога"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Месечни календар"
 
-#: ../widgets/misc/e-canvas-background.c:453
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Боја испуњавања"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c: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 "GDK боја испуњавања"
 
-#: ../widgets/misc/e-canvas-background.c:474
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Истачкај"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "Х1"
 
-#: ../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 "Најмања ширина"
 
-#: ../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 "Најмања ширина"
 
-#: ../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 "Размак"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Сада"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Време мора бити у формату: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Вредност постотка мора бити између 0 и 100"
 
@@ -22443,16 +23308,13 @@ msgstr "Западноевропска"
 msgid "Western European, New"
 msgstr "Западноевропска, нова"
 
-#: ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Традиционална"
 
-#: ../widgets/misc/e-charset-picker.c: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 "Поједностављена"
 
@@ -22485,93 +23347,93 @@ msgstr "Друго..."
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Део текста за унос датума"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Притисните на ово дугме за приказ календара"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Оквир за избор времена"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "_Сада"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_Данас"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Неисправан датум"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Неисправно време"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Разгранато"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Да ли је стабло разгранато или не"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Текст ознаке стабла"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Користи подвлачење"
 
-#: ../widgets/misc/e-expander.c:197
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
-msgstr "Ако је постављено, подвлачење у тексту означава знак који ће се користити као пречица на тастатури"
+#: ../widgets/misc/e-expander.c:199
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+"Ако је постављено, подвлачење у тексту означава знак који ће се користити "
+"као пречица на тастатури"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Размак између ознаке и садржаног елемента"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Елемент ознаке"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "Елемент који се приказује уместо обичне ознаке стабла"
 
-#: ../widgets/misc/e-expander.c:221
-#: ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Величина стабла"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Величина стрелице стабла"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Размак показивача"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Размак око стрелице стабла"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c: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 "Напредна претрага"
 
@@ -22588,18 +23450,15 @@ msgstr "_Претраге"
 msgid "Searches"
 msgstr "Претраге"
 
-#: ../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 "_Сачувај претрагу..."
 
-#: ../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 "_Уреди сачуване претраге..."
 
-#: ../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 "_Напредна претрага..."
 
@@ -22632,14 +23491,18 @@ msgid "World Map"
 msgstr "Карта света"
 
 #: ../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 "Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне врши из доњег оквира."
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
+"врши из доњег оквира."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "На мрежи"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Стање дугмета је на мрежи"
 
@@ -22655,80 +23518,74 @@ msgstr "Усклади личне записе:"
 msgid "Sync Categories:"
 msgstr "Усклади категорије:"
 
-#: ../widgets/misc/e-reflow.c:1448
-#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Празна порука"
 
-#: ../widgets/misc/e-reflow.c:1455
-#: ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Модел преиспуњавања"
 
-#: ../widgets/misc/e-reflow.c:1462
-#: ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Ширина колоне"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Претрага"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Кликните овде да промените врсту претраге"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Претражи"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "Про_нађи сада"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ИБ предмета"
 
-#: ../widgets/misc/e-search-bar.c:875
-#: ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Текст"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Прика_жи: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "П_ретражи"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " _у "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Ред курсора"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Колона курсора"
 
@@ -22875,19 +23732,19 @@ msgid "_When opened:"
 msgstr "_Када је отворено:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Притисните овде да посетите адресу"
 
@@ -22927,23 +23784,23 @@ msgstr "Фокусирана колона"
 msgid "Unselected Column"
 msgstr "Неизабрана колона"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Прецртана колона"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Подвучена колона"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Подебљана колона"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Колона у боји"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Колона боја у позадини"
 
@@ -22951,13 +23808,11 @@ msgstr "Колона боја у позадини"
 msgid "State"
 msgstr "Стање"
 
-#: ../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 "(Растуће)"
 
-#: ../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 "(Опадајуће)"
 
@@ -22983,7 +23838,7 @@ msgid "A_vailable Fields:"
 msgstr "До_ступна поља:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Растуће"
 
@@ -22996,7 +23851,7 @@ msgid "Clear _All"
 msgstr "Очисти _све"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Опадајуће"
 
@@ -23058,16 +23913,16 @@ msgstr "_Разврстај..."
 
 # Превуци-и-Пусти
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "ПиП код"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Пуно заглавље"
 
@@ -23107,8 +23962,7 @@ msgstr[2] "%s (%d ставки)"
 #: ../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 "Редови наизменичних боја"
 
@@ -23116,10 +23970,8 @@ msgstr "Редови наизменичних боја"
 #: ../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:3344
-#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Положене линије за цртање"
 
@@ -23127,10 +23979,8 @@ msgstr "Положене линије за цртање"
 #: ../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:3350
-#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Усправне линије за цртање"
 
@@ -23138,10 +23988,8 @@ msgstr "Усправне линије за цртање"
 #: ../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:3356
-#: ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Средиште цртања"
 
@@ -23149,8 +23997,7 @@ msgstr "Средиште цртања"
 #: ../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 "Режим курсора"
 
@@ -23158,8 +24005,7 @@ msgstr "Режим курсора"
 #: ../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 "Модел за избор"
 
@@ -23167,11 +24013,9 @@ msgstr "Модел за избор"
 #: ../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-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
-#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Највећа дужина"
 
@@ -23179,11 +24023,9 @@ msgstr "Највећа дужина"
 #: ../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-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
-#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Уједначена висина редова"
 
@@ -23194,654 +24036,907 @@ msgstr "Уједначена висина редова"
 msgid "Frozen"
 msgstr "Замрзнуто"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Прилагодите тренутни преглед"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Разврстај _растуће"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Разврстај _опадајуће"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Не разврставај"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Групиши по овоме _пољу"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Групиши по _оквиру"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Уклони ову _колону"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Додај ко_лону..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "По_равнање"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "На_јбоље уклапање"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Обликуј коло_не..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Прила_годи тренутни преглед..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Поређај по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Прилагођено"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Опис фонта"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Детаљи разврставања"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Стабло"
 
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Заглавље табеле"
 
-#: ../widgets/table/e-table-item.c:3018
-#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Модел табеле"
 
-#: ../widgets/table/e-table-item.c:3094
-#: ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Ред курсора"
 
-#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Увек претражи"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Користите клик да додате"
 
-#: ../widgets/table/e-tree.c:3363
-#: ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ETree прилагођивач табеле"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Старински изглед"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Исцртава линије и +/- граничнике."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Методи уноса"
 
-#: ../widgets/text/e-text.c:3558
-#: ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Обрађивач догађаја"
 
-#: ../widgets/text/e-text.c:3572
-#: ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Подебљано"
 
-#: ../widgets/text/e-text.c:3579
-#: ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Прецртано"
 
-#: ../widgets/text/e-text.c:3586
-#: ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Веза"
 
-#: ../widgets/text/e-text.c:3594
-#: ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Обострано"
 
-#: ../widgets/text/e-text.c:3601
-#: ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Исеци ширину"
 
-#: ../widgets/text/e-text.c:3608
-#: ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Исеци висину"
 
-#: ../widgets/text/e-text.c:3615
-#: ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Исеци"
 
-#: ../widgets/text/e-text.c:3622
-#: ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Испуни правоугаоник исечка"
 
-#: ../widgets/text/e-text.c:3629
-#: ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "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 "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 "Ширина текста"
 
-#: ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Висина текста"
 
-#: ../widgets/text/e-text.c:3694
-#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Користи три тачке"
 
-#: ../widgets/text/e-text.c:3701
-#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Три тачке"
 
-#: ../widgets/text/e-text.c:3708
-#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Прелом реда"
 
-#: ../widgets/text/e-text.c:3715
-#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Знаци за прелом"
 
-#: ../widgets/text/e-text.c:3722
-#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Највише линија"
 
-#: ../widgets/text/e-text.c:3744
-#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Исцртај ивице"
 
-#: ../widgets/text/e-text.c:3751
-#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Дозволи нове линије"
 
-#: ../widgets/text/e-text.c:3758
-#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Исцртај позадину"
 
-#: ../widgets/text/e-text.c:3765
-#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Исцртај дугме"
 
-#: ../widgets/text/e-text.c:3772
-#: ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Позиција курзора"
 
-#: ../widgets/text/e-text.c:3779
-#: ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "Контекст метода уноса"
 
-#: ../widgets/text/e-text.c:3786
-#: ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Управљај искачућим прозором"
 
+#~ msgid ""
+#~ "We were unable to open this address book.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "Отварање овог адресара није могуће.  То значи да сте или унели погрешну "
+#~ "адресу, или је LDAP сервер недоступан."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Проба уређивача стила за штампање контакта"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Ауторско право (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Ово испробава елемент уређивача стила за штампање контакта"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Проба штампе контакта"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Ово испробава код за штампу контакта"
+
+#~ msgid "Business"
+#~ msgstr "Пословно"
+
+#~ msgid "Competition"
+#~ msgstr "Такмичење"
+
+#~ msgid "Favourites"
+#~ msgstr "Омиљено"
+
+#~ msgid "Gifts"
+#~ msgstr "Поклони"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Циљеви/задаци"
+
+#~ msgid "Holiday"
+#~ msgstr "Празник"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Честитке"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Важни контакти"
+
+#~ msgid "Ideas"
+#~ msgstr "Идеје"
+
+#~ msgid "International"
+#~ msgstr "Међународно"
+
+#~ msgid "Key Customer"
+#~ msgstr "Важан клијент"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Разно"
+
+#~ msgid "Next 7 days"
+#~ msgstr "Следећих 7 дана"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Телефонски позиви"
+
+#~ msgid "Strategies"
+#~ msgstr "Стратегије"
+
+#~ msgid "Suppliers"
+#~ msgstr "Снабдевачи"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Праћење у времену; издаци"
+
+#~ msgid "VIP"
+#~ msgstr "ВИП"
+
+#~ msgid "Waiting"
+#~ msgstr "Чекам"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Следећих 7 дана"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "До_дај критеријум филтрирања"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Време: местимично облачно"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Прво унесите корисничко име."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Означи календар за рад ван мреже"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Означава изабран календар за преглед ван мреже."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Грешка при отварању странице за помоћ."
+
+#~ msgid "Select Importers"
+#~ msgstr "Изаберите увознике"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "О_свежи..."
+
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #~ msgid "Permission Denied."
 #~ msgstr "Забрањен приступ."
+
 #~ msgid "_Properties..."
 #~ msgstr "По_дешавања..."
+
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Приказ</b>"
+
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Подаци сервера</b>"
+
 #~ msgid "_Categories..."
 #~ msgstr "Ка_тегорије..."
+
 #~ msgid "\n"
 #~ msgstr "\n"
+
 #~ msgid "Add an email to the List"
 #~ msgstr "Додај е-пошту на листу"
+
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Уметните електронске адресе из именика"
+
 #~ msgid "Members"
 #~ msgstr "Чланови"
+
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Уклони електронску адресу са листе"
+
 #~ msgid "_Select"
 #~ msgstr "_Изабери"
+
 #~ msgid "D_escription:"
 #~ msgstr "_Опис:"
+
 #~ msgid "De_scription:"
 #~ msgstr "О_пис:"
+
 #~ msgid "Or_ganiser:"
 #~ msgstr "Ор_ганизатор:"
+
 #~ msgid "Task sort"
 #~ msgstr "Разврставање задужења"
+
 #~ msgid "Memo sort"
 #~ msgstr "Разврставање белешки"
+
 #~ msgid "Updating query"
 #~ msgstr "Освежавање упита"
+
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Наступајући састанци"
+
 #~ msgid "SMTWTFS"
 #~ msgstr "НПУСЧПС"
+
 #~ msgid "Post To:"
 #~ msgstr "Слање на:"
+
 #~ msgid "Unknown reason"
 #~ msgstr "Непознат разлог"
+
 #~ msgid "Open File"
 #~ msgstr "Отвара датотеку"
+
 #~ msgid "_Save Message"
 #~ msgstr "Сач_увај поруку"
+
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "Пословни и програм за е-пошту — Еволуција"
+
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Није могуће отварање датотеке &quot;{0}&quot;."
+
 #~ msgid "_Search name:"
 #~ msgstr "Основа за _претрагу:"
+
 #~ msgid "Di_sable"
 #~ msgstr "И_скључи"
+
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
+
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "Звучна датотека за обавештење о новој пошти"
+
 #~ msgid "New Mail Notify type"
 #~ msgstr "Тип обавештења о новој пошти"
+
 #~ msgid "Specifies the type of New Mail Notification the user wishes to use."
 #~ msgstr "Наводи тип обавештења о новој пошти које корисник жели да користи."
+
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">Ознаке и боје</span>"
+
 #~ msgid "<span weight=\"bold\">New Mail Notification</span>"
 #~ msgstr "<span weight=\"bold\">Обавештавање о новој пошти</span>"
+
 #~ msgid "Attach original message"
 #~ msgstr "Приложи оригиналну поруку"
+
 #~ msgid "Do not quote original message"
 #~ msgstr "Не цитирај оригиналну поруку"
+
 #~ msgid "HTML Mail"
 #~ msgstr "HTML пошта"
+
 #~ msgid "Quote original message"
 #~ msgstr "Цитирај оригиналну поруку"
+
 #~ msgid "Se_lect..."
 #~ msgstr "Иза_бери..."
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Одабира фасциклу Припрема"
-#~ msgid "Select Sent Folder"
-#~ msgstr "Одабира фасциклу Послато"
+
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "С_вирни када стигне нова пошта"
+
 #~ msgid "_Do not notify me when new mail arrives"
 #~ msgstr "_Немој да ме обавештаваш када стигне нова пошта"
+
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Унесите име за овај потпис."
+
 #~ msgid "Name:"
 #~ msgstr "Име:"
+
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "Сигурно желите трајно да уклоните све обрисане поруке у фасцикли &quot;{0}"
 #~ "&quot;?"
+
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "Обрисати &quot;{0}&quot;?"
+
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Да ли желите да ову радњу такође примените на све подфасцикле?"
+
 # bug: requires a comment on usage
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Само на _текућој фасцикли"
+
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "Укључује додатак за подсетник за прилоге"
+
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "Својства подсетника за прилоге"
+
 #~ msgid "Remind _missing attachments"
 #~ msgstr "Подсети за _недостајуће прилоге"
+
 #~ msgid "_Refresh:"
 #~ msgstr "О_свежи:"
+
 # Нејасно. "Чему ово служи, а уз то и не ради?".
 # http://bugzilla.gnome.org/show_bug.cgi?id=458512
 #, fuzzy
 #~ msgid "button-user"
 #~ msgstr "дугме-корисник"
+
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "Изаберите (48*48) png величине < 720бајта"
+
 #~ msgid "_Contacts..."
 #~ msgstr "_Контакти..."
+
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr ""
 #~ "Сваки пут када стигне нова пошта, прикажи прозорче са libnotify "
 #~ "обавештењем."
+
 #~ msgid "Make the status icon blink"
 #~ msgstr "Чини да икона статуса трепће"
+
 #~ msgid "When the new-mail status icon is visible, make it blink."
 #~ msgstr "Када је икона за нову пошту видљива, нека трепће."
+
 #~ msgid "System error: %s"
 #~ msgstr "Системска грешка: %s"
+
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Налог не може да шаље пошту"
+
 #~ msgid "No store available"
 #~ msgstr "Нема доступне оставе"
+
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
 #~ msgstr "Додатак који уводи CORBA сучеље за мрежно приступање пошти."
+
 #~ msgid "Mail Remote"
 #~ msgstr "Мрежна пошта"
+
 #~ msgid "New Mail Notification"
 #~ msgstr "Обавештење о новој пошти"
+
 #~ msgid "Configure"
 #~ msgstr "Подешава"
+
 #~ msgid "Gives an option to print mail from composer"
 #~ msgstr "Даје могућност штампе поруке из састављача"
+
 #~ msgid "Print Message"
 #~ msgstr "Штампај поруку"
+
 #~ msgid "Prints the message"
 #~ msgstr "Штампа поруку"
+
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Додатак који рукује уводним чаробњаком"
+
 #~ msgid "Startup wizard"
 #~ msgstr "Чаробњак за почетак"
+
 #~ msgid "A string description of the current printer settings"
 #~ msgstr "Описни низ тренутних подешавања штампача"
+
 #~ msgid "No folder name specified."
 #~ msgstr "Није наведено име фасцикле."
+
 #~ msgid "Folder name cannot contain the Return character."
 #~ msgstr "Име фасцикле не може да садржи Return знак."
+
 #~ msgid "Folder name cannot contain the character \"/\"."
 #~ msgstr "Име фасцикле не може да садржи знак „/“."
+
 #~ msgid "Folder name cannot contain the character \"#\"."
 #~ msgstr "Име фасцикле не може да садржи знак „#“."
+
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "’.‘ и ’..‘ су заузети за имена фасцикли."
+
 #~ msgid "Copy selection to clipboard"
 #~ msgstr "Умножи изабрано у списак исечака"
+
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "Сече изабрано у списак исечака"
+
 #~ msgid "Paste from clipboard"
 #~ msgstr "Убаци са списка исечака"
+
 #~ msgid "All Day Event"
 #~ msgstr "Целодневни догађај"
+
 #~ msgid "Send _Options"
 #~ msgstr "_Опције слања"
+
 #~ msgid "Download messages for offline"
 #~ msgstr "Преузима поруке за рад ван мреже"
+
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Прикажи поруку у нормалном стилу"
+
 #~ msgid "Delete all but signature"
 #~ msgstr "Брише све осим потписа"
+
 #~ msgid "For_mat"
 #~ msgstr "_Облик"
+
 #~ msgid "HT_ML"
 #~ msgstr "HT_ML"
+
 #~ msgid "Open a file"
 #~ msgstr "Отвори датотеку"
+
 #~ msgid "PGP Encrypt"
 #~ msgstr "PGP шифруј"
+
 #~ msgid "PGP Sign"
 #~ msgstr "PGP потпис"
+
 #~ msgid "S/MIME Encrypt"
 #~ msgstr "S/MIME шифруј"
+
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME потпис"
-#~ msgid "Save As"
-#~ msgstr "Сачувај као"
+
 #~ msgid "Save in folder..."
 #~ msgstr "Сачувај у фасциклу..."
+
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "Сачувај поруку у наведеној фасцикли"
+
 #~ msgid "Send"
 #~ msgstr "Пошаљи"
+
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Пошаљи поруку у HTML формату"
+
 #~ msgid "_Delete all"
 #~ msgstr "Обри_ши све"
+
 #~ msgid "_Open..."
 #~ msgstr "_Отвори..."
+
 #~ msgid "C_lose"
 #~ msgstr "_Затвори"
+
 #~ msgid "H_TML"
 #~ msgstr "H_TML"
+
 #~ msgid "Save and _Close"
 #~ msgstr "Сачувај и _затвори"
+
 #~ msgid "Save the current file and close the window"
 #~ msgstr "Сачувај текућу датотеку и затвори прозор"
+
 #~ msgid "Refresh List"
 #~ msgstr "Освежи списак"
+
 #~ msgid "Refresh List of Folders"
 #~ msgstr "Освежи списак фасцикли"
+
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Уклони фасциклу са списка пријављених фасцикли"
+
 #~ msgid "Subscribe"
 #~ msgstr "Пријави се"
+
 #~ msgid "Unsubscribe"
 #~ msgstr "Одјави се"
+
 #~ msgid "_Invert Selection"
 #~ msgstr "_Обрни избор"
+
 #~ msgid "Status Details"
 #~ msgstr "Детаљи стања"
+
 #~ msgid "Time Zone"
 #~ msgstr "Временска зона"
+
 #~ msgid "TimeZone Combobox"
 #~ msgstr "Оквир за временску зону"
 
 # week, 'M' for 'Monday', 'T' for Tuesday etc.
 #~ msgid "MTWTFSS"
 #~ msgstr "ПУСЧПСН"
+
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Уклони"
+
 #~ msgid "Sh_ow these fields in order:"
 #~ msgstr "При_кажи ова поља редом:"
+
 #~ msgid "_Add ->"
 #~ msgstr "_Додај ->"
+
 #~ msgid "Emulate label resize"
 #~ msgstr "Опонашај промену величине ознаке"
+
 #~ msgid "A Folder with this name already exists"
 #~ msgstr "Једна фасцикла са тим именом већ постоји"
+
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
 #~ "Промењена електронска адреса или име овог контакта\n"
 #~ "већ постоји у овој фасцикли.  Желите ли ипак да додате?"
+
 #~ msgid ""
 #~ "All information in these journal entries will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Сви подаци у овим уносима у дневник ће бити обрисани и неће се моћи "
 #~ "повратити."
+
 #~ msgid ""
 #~ "All information on this journal entry will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Сви подаци о овом уносу у дневник ће бити обрисани и неће се моћи "
 #~ "повратити."
+
 #~ msgid "Are you sure you want to delete the journal entry '{0}'?"
 #~ msgstr "Сигурно желите да обришете унос у дневник ’{0}‘?"
+
 # bug: plural-forms
 #~ msgid "Are you sure you want to delete these {0} journal entries?"
 #~ msgstr "Сигурно желите да обришете ове {0} уносе у дневник?"
+
 #~ msgid "Are you sure you want to delete this journal entry?"
 #~ msgstr "Сигурно желите да обришете овај унос у дневник?"
+
 #~ msgid ""
 #~ "If you do not send a cancelation notice, the other participants may not "
 #~ "know the journal has been deleted."
 #~ msgstr ""
 #~ "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 #~ "знати да је дневник обрисан."
+
 #~ msgid "This journal entry has been deleted."
 #~ msgstr "Овај унос у дневник је обрисан."
+
 #~ msgid "This journal entry has been changed."
 #~ msgstr "Овај унос у дневник је промењен."
+
 #~ msgid "Journal entry - %s"
 #~ msgstr "Унос у дневник - %s"
+
 #~ msgid "The journal entry could not be deleted due to a corba error"
 #~ msgstr "Унос у дневник није могао бити обрисан због corba грешке"
+
 #~ msgid "The journal entry could not be deleted because permission was denied"
 #~ msgstr "Унос у дневник није могао бити обрисан јер приступ није дозвољен"
+
 #~ msgid "The journal entry could not be deleted due to an error"
 #~ msgstr "Унос у дневник није могао бити обрисан услед грешке"
+
 # повратни > редовни
 #~ msgid ""
 #~ "You are modifying a recurring journal entry. What would you like to "
 #~ "modify?"
 #~ msgstr "Мењате повратни унос у дневник, шта желите да измените?"
+
 #~ msgid "Journal information"
 #~ msgstr "Податак о дневнику"
+
 #~ msgid "<b>Then</b>"
 #~ msgstr "<b>Онда</b>"
+
 #~ msgid "Valid signature, cannot verify sender"
 #~ msgstr "Исправан потпис, није могућа провера пошиљаоца"
+
 #~ msgid "Mark as _Read"
 #~ msgstr "О_значи као прочитано"
+
 #~ msgid "_Do not Mark as Read"
 #~ msgstr "Ос_тави непрочитано"
+
 #~ msgid "Check Evolution archive"
 #~ msgstr "Проверава архиву Еволуције"
+
 #, fuzzy
 #~ msgid "With GUI"
 #~ msgstr "Ширина"
+
 #~ msgid "<b>Junk Mail Settings</b>"
 #~ msgstr "<b>Подешавања поште за ђубре</b>"
+
 #~ msgid "<b>Subject</b> :"
 #~ msgstr "<b>Наслов</b>"
+
 #~ msgid "<b>From</b> :"
 #~ msgstr "<b>Шаље</b>"
+
 #~ msgid "Unable to find this journal entry in any journal"
 #~ msgstr "Не могу да пронађем овај унос у ниједном дневнику"
+
 #~ msgid "_Address: "
 #~ msgstr "_Адреса:"
+
 #~ msgid "Print cards"
 #~ msgstr "Штампај карте"
+
 #~ msgid "Organization"
 #~ msgstr "Организација"
+
 #~ msgid "E-mail"
 #~ msgstr "Е-пошта"
+
 #~ msgid "GTK Tree View"
 #~ msgstr "Преглед GTK стабла"
+
 #~ msgid "Print envelope"
 #~ msgstr "Штампај коверту"
+
 #~ msgid "Print contacts"
 #~ msgstr "Штампај контакте"
+
 #~ msgid "Print contact"
 #~ msgstr "Штампај контакт"
+
 #~ msgid "Error loading default addressbook."
 #~ msgstr "Грешка при учитавању подразумеваног именика."
+
 #~ msgid "Input File"
 #~ msgstr "Улазна датотека"
+
 #~ msgid "Add Calendar"
 #~ msgstr "Додаје календар"
+
 #~ msgid "Add Task List"
 #~ msgstr "Додаје листу задужења"
+
 #~ msgid "_Add Calendar"
 #~ msgstr "_Додај календар"
+
 #~ msgid "_Add Task List"
 #~ msgstr "_Додај листу задужења"
+
 #~ msgid "Add New Calendar"
 #~ msgstr "Додај нови календар"
+
 #~ msgid "Calendar Group"
 #~ msgstr "Група календара"
+
 #~ msgid "Calendar Location"
 #~ msgstr "Место календара"
+
 #~ msgid "Calendar Name"
 #~ msgstr "Име календара"
+
 #~ msgid "<b>Task List Options</b>"
 #~ msgstr "<b>Опције листе задужења</b>"
+
 #~ msgid "Add New Task List"
 #~ msgstr "Додај нову листу задужења"
+
 #~ msgid "Task List Group"
 #~ msgstr "Група за листе задужења"
+
 #~ msgid "Task List Name"
 #~ msgstr "Име листе задужења"
+
 #~ msgid "<b>Free/Busy C_alendars</b>"
 #~ msgstr "<b>К_алендари за слободно/заузето</b>"
+
 #~ msgid "<b>Publishing Frequency</b>"
 #~ msgstr "<b>Учесталост објављивања</b>"
+
 #~ msgid "<b>Publishing _Location</b>"
 #~ msgstr "<b>_Место објављивања</b>"
+
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "Подешавања објављивања слободно/заузето"
+
 #~ msgid "_Daily"
 #~ msgstr "_Дневно"
+
 #~ msgid "_Manual"
 #~ msgstr "_Ручно"
+
 #~ msgid "_Weekly"
 #~ msgstr "_Недељно"
+
 #~ msgid "Enter the password for %s"
 #~ msgstr "Унесите лозинку за %s"
+
 #~ msgid "Selected day (%a %b %d %Y)"
 #~ msgstr "Изабрани дан (%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 "Изабрана недеља (%s - %s)"
+
 #~ msgid "Selected month (%b %Y)"
 #~ msgstr "Изабрани месец (%b %Y)"
+
 #~ msgid "Selected year (%Y)"
 #~ msgstr "Изабрана година (%Y)"
+
 #~ msgid "Print Item"
 #~ msgstr "Штампај предмет"
+
 #~ msgid "%.0fK"
 #~ msgstr "%.0fK"
+
 #~ msgid "%.0fM"
 #~ msgstr "%.0fM"
+
 #~ msgid "%.0fG"
 #~ msgstr "%.0fG"
+
 #~ msgid "No, Do not Change Status"
 #~ msgstr "Не, не мењај стање"
+
 #~ msgid "<b>Receiving Email</b>"
 #~ msgstr "<b>Примање поште</b>"
+
 #~ msgid "<b>Sending Email:</b>"
 #~ msgstr "<b>Слање поште:</b>"
+
 #~ msgid ""
 #~ "<small>This page allows you to choose if you want to be notified via a "
 #~ "read receipt when a message you\n"
@@ -23852,27 +24947,37 @@ msgstr "Управљај искачућим прозором"
 #~ "признаницу уз своју\n"
 #~ "поруку ради обавештења када буде прочитана, и да одредите шта Еволуција "
 #~ "да ради када неко Вама пошаље признаницу.</small>"
+
 #~ msgid "Ask me if I want to send back a read receipt"
 #~ msgstr "Питај ме желим ли да вратим признаницу"
+
 #~ msgid "Never send back a read receipt"
 #~ msgstr "Никада не враћај признаницу"
+
 #~ msgid "Read Receipts"
 #~ msgstr "Признанице"
+
 #~ msgid "Request a read receipt for all messages I send"
 #~ msgstr "Затражи повраћај признанице за све поруке које пошаљем"
+
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
 #~ msgstr "Осим ако је порука послата дописној листи, а не мени лично"
+
 #~ msgid ""
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 #~ msgstr "Када примите поруку са признаницом, шта Еволуција да ради?"
+
 #~ msgid "The orientation of the tray."
 #~ msgstr "Положај зоне."
+
 #~ msgid "Enable"
 #~ msgstr "Омогући"
+
 #~ msgid "Priority Filter \"%s\""
 #~ msgstr "Филтер важности „%s“"
+
 #~ msgid ""
 #~ "Some of your Netscape email filters are based on\n"
 #~ "email priorities, which are not used in Evolution.\n"
@@ -23897,6 +25002,7 @@ msgstr "Управљај искачућим прозором"
 #~ "резултате Еволуције, а промењени филтери користе резултате уместо\n"
 #~ "приоритета. Проверите увежене филтере да се уверите\n"
 #~ "да ли све ради као што би требало."
+
 #~ msgid ""
 #~ "Some of your Netscape email filters use\n"
 #~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -23907,6 +25013,7 @@ msgstr "Управљај искачућим прозором"
 #~ "могућност „Занемари расправу“ или „Прати расправу“\n"
 #~ "коју Еволуција не подржава.\n"
 #~ "Ови филтери ће бити изостављени."
+
 #~ msgid ""
 #~ "Some of your Netscape email filters test the\n"
 #~ "body of emails for (in)equality to a given string,\n"
@@ -23919,64 +25026,88 @@ msgstr "Управљај искачућим прозором"
 #~ "што Еволуција не подржава. Ови филтери\n"
 #~ "су промењени да проверавају да ли тај низ јесте\n"
 #~ "или није садржан у телу поруке."
+
 #~ msgid "Evolution is importing your old Netscape data"
 #~ msgstr "Еволуција увози старе Netscape податке"
+
 #~ msgid "Importing Netscape data"
 #~ msgstr "Увожење Netscape података"
+
 #~ msgid "Settings"
 #~ msgstr "Подешавања"
+
 #~ msgid "Mail Filters"
 #~ msgstr "Филтери поште"
+
 #~ msgid ""
 #~ "Evolution has found Netscape mail files.\n"
 #~ "Would you like them to be imported into Evolution?"
 #~ msgstr ""
 #~ "Еволуција је пронашла Netscape датотеке поште.\n"
 #~ "Желите ли да буду увежене у Еволуцију?"
+
 #~ msgid "<span weight=\"bold\">Filter Options</span>"
 #~ msgstr "<span weight=\"bold\">Могућности филтера</span>"
+
 #~ msgid "<b>Recipients </b>"
 #~ msgstr "<b>Примаоци</b>"
+
 #~ msgid "<b>Action</b>"
 #~ msgstr "<b>Радња</b>"
+
 #~ msgid "<b>Date and Time</b>"
 #~ msgstr "<b>Датум и време</b>"
+
 #~ msgid ""
 #~ "The output directory was not found on iPod! Please ensure that iPod has "
 #~ "been correctly set up and try again."
 #~ msgstr ""
 #~ "Излазна фасцикла није пронађена на iPod уређају! Молим проверите да ли је "
 #~ "џепни уређај правилно подешен и покушајте поново."
+
 #~ msgid "Could not export data!"
 #~ msgstr "Није могућ извоз података!"
+
 #~ msgid "Exporting data failed."
 #~ msgstr "Неуспешан извоз података."
+
 #~ msgid "Could not open addressbook!"
 #~ msgstr "Није могуће отворити именик!"
+
 #~ msgid "Could not open the Evolution addressbook to export data."
 #~ msgstr "Не могу да отворим Еволуцијин именик како би извезао податке."
+
 #~ msgid "Could not open calendar/todo!"
 #~ msgstr "Не могу отворити календар/списак обавеза"
+
 #~ msgid "Could not open the Evolution calendar/todo list to export data."
 #~ msgstr ""
 #~ "Не могу отворити Еволуцијин календар/списак за урадити да би извезао "
 #~ "податке."
+
 #~ msgid "New mail notify"
 #~ msgstr "Обавештење о новој пошти"
+
 #~ msgid "(Untitled)"
 #~ msgstr "(Неименовано)"
+
 #~ msgid "An attachment to add."
 #~ msgstr "Прилог за додавање."
+
 #~ msgid "Content type of the attachment."
 #~ msgstr "Тип садржаја прилога."
+
 #~ msgid "The filename to display in the mail."
 #~ msgstr "Име датотеке које се приказује у поруци."
+
 #~ msgid "Description of the attachment."
 #~ msgstr "Опис прилога."
+
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr "Означи да се прилог подразумевано приказује унутар поруке."
+
 #~ msgid "_Edit..."
 #~ msgstr "_Уреди..."
+
 #~ msgid "..."
 #~ msgstr "..."
-
diff --git a/po/sr@latin.po b/po/sr@latin.po
index b14b073b81..76ab5deae3 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -6,18 +6,20 @@
 # Maintainer: Igor Nestorović <jung@one.ekof.bg.ac.yu>
 # Reviewed on 2005-08-22 by Igor Nestorović <igor@prevod.org>
 #
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:13+0000\n"
+"POT-Creation-Date: 2009-01-28 22:19+0100\n"
 "PO-Revision-Date: 2008-09-19 21:31+0100\n"
 "Last-Translator: Igor Nestorović <igor@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # note(slobo): message thread, niz --> bolji prevod je rasprava
 # note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
@@ -29,21 +31,21 @@ msgstr ""
 # note(slobo): spam , Đubre --> Neželjena pošta
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "evolucijin adresar"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -123,8 +125,7 @@ msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
 #. 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."
@@ -134,8 +135,7 @@ msgstr[2] "Ima %d događaja."
 
 #. 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 "Nema događaja."
 
@@ -164,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili više dana"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -180,9 +180,8 @@ msgstr "%A, %d. %b %Y."
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -190,9 +189,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:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -200,10 +199,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:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -217,16 +216,15 @@ msgstr "%d. %b %Y."
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%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 "Gnomov kalendar"
 
@@ -273,11 +271,11 @@ msgstr "iskačuće"
 msgid "popup a child"
 msgstr "iskačuće izvedeno"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "uređivanje"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "počinje uređivanjem ove ćelije"
 
@@ -290,19 +288,19 @@ msgstr "biranje"
 msgid "toggle the cell"
 msgstr "biranje ćelije"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "razgranava"
 
-#: ../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 "razgranava red u ETree gde se ćelija nalazi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "skuplja"
 
-#: ../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 "skuplja red u ETree gde se ćelija nalazi"
 
@@ -360,12 +358,20 @@ msgstr "aktivirati"
 
 #. 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 "Adresar „{0}“ je samo za čitanjeje i nije podložan izmenama. Izaberite drugi adresar sa bočne trake u pogledu Kontakti."
+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 ""
+"Adresar „{0}“ je samo za čitanjeje i nije podložan izmenama. Izaberite drugi "
+"adresar sa bočne trake u pogledu Kontakti."
 
 #: ../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 "Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa istom adresom?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa "
+"istom adresom?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -384,8 +390,14 @@ msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
 #: ../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 "Proverite da je lozinka ispravno uneta i da koristite podržani način prijave. Ne zaboravite da je veličina slova bitna u lozinkama; možda su velika slova uključena."
+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 ""
+"Proverite da je lozinka ispravno uneta i da koristite podržani način "
+"prijave. Ne zaboravite da je veličina slova bitna u lozinkama; možda su "
+"velika slova uključena."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -396,8 +408,14 @@ msgid "Could not remove address book."
 msgstr "Nije moguće ukloniti adresar."
 
 #: ../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 "Trenutno iz Evolucije možete pristupiti samo sistemskom adresaru GroupWise. Koristite neki drugi GroupWise program za elektronsku poštu kako bi mogli dobiti GroupWise česte kontakte i fascikle sa ličnim kontaktima."
+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 ""
+"Trenutno iz Evolucije možete pristupiti samo sistemskom adresaru GroupWise. "
+"Koristite neki drugi GroupWise program za elektronsku poštu kako bi mogli "
+"dobiti GroupWise česte kontakte i fascikle sa ličnim kontaktima."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -417,7 +435,7 @@ msgstr "Neuspela autentifikacija na LDAP server."
 
 #. 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 "Neuspelo brisanje kontakta"
 
@@ -430,6 +448,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server nije odgovorio ispravnom šemom podataka."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Verzija servera"
 
@@ -442,12 +461,21 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolucijin adresar je neočekivano prestao da radi."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Slika koju ste izabrali je prevelika. Da li želite da joj promenite veličinu i sačuvate?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Slika koju ste izabrali je prevelika. Da li želite da joj promenite veličinu "
+"i sačuvate?"
 
 #: ../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 "Ovaj LDAP server možda koristi stariju verziju LDAP-a koja ne podržava ovu mogućnost, ili je loše podešen. Pitajte administratora za podržane osnove za pretragu."
+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 ""
+"Ovaj LDAP server možda koristi stariju verziju LDAP-a koja ne podržava ovu "
+"mogućnost, ili je loše podešen. Pitajte administratora za podržane osnove za "
+"pretragu."
 
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:24
@@ -459,8 +487,12 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "Server ovog adresara ne sadrži predložene osnove za pretragu."
 
 #: ../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 "Server ovog adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili je mreža nedostupna."
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Server ovog adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili "
+"je mreža nedostupna."
 
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:27
@@ -488,27 +520,39 @@ msgid "Would you like to save your changes?"
 msgstr "Želite li da sačuvate promene?"
 
 #: ../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 "Pokušavate da premestite kontakt iz jednog adresara u drugi ali se on ne može ukloniti iz izvora. Želite li da sačuvate umnožak umesto toga?"
+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 ""
+"Pokušavate da premestite kontakt iz jednog adresara u drugi ali se on ne "
+"može ukloniti iz izvora. Želite li da sačuvate umnožak umesto toga?"
 
 #: ../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 "Povezujete se na nepodržan GroupWise server što može da dovede do problema u radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju"
+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 ""
+"Povezujete se na nepodržan GroupWise server što može da dovede do problema u "
+"radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemate dovoljna ovlašćenja da brišete kontakte iz ovog adresara."
 
 #: ../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 "Izmenili ste ovaj kontakt. Želite li da sačuvate ove promene?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Vaši kontakti za {0} neće biti dostupni dok se Evolucija ponovo ne pokrene."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Vaši kontakti za {0} neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../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
@@ -533,9 +577,8 @@ msgstr "_Koristi tako kako je"
 
 # bug: we don't want this translated
 #. 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}"
 
@@ -545,21 +588,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za usklađivanje:"
 
-#: ../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 "Nije moguće učitati adresar"
 
-#: ../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 "Nije moguće čitanje programskog bloka adresa pilota"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Samodopunjavanje"
 
@@ -575,12 +619,13 @@ msgstr "Sertifikati"
 msgid "Configure autocomplete here"
 msgstr "Podesite samodopunjavanje ovde"
 
+#. ensure the group name is in current locale, not read from configuration
 #. 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:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakti"
@@ -618,184 +663,193 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Upravljajte S/MIME sertifikatima ovde"
 
 # On This Computer is always first and VFolders is always last
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199
-#: ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195
-#: ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202
-#: ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312
-#: ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198 ../calendar/gui/memos-component.c:202
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../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 ovom računaru"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208
-#: ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35
-#: ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210 ../calendar/gui/memos-component.c:214
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Lično"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Napravi novi kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt li_sta"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:253
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Novi imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Napravi novi imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Neuspela nadogradnja podešavanja imenika ili njegovih fascikli."
 
-#: ../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 "_Tip:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Umnoži sadržaj _knjige lokalno za rad van mreže"
 
-#: ../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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Opšte"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Autentifikacija"
 
-#: ../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 "Detalji"
 
-#: ../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 "Pretraživanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../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 "Podešavanja imenika"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1207
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Prenošenje..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1247
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Prenošenje „%s“:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Podešavanja samodopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"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 ""
-"Putanja i hijerarhija fascikli za kontakte u Evoluciji je izmenjena od Evolucije 1.x.\n"
+"Putanja i hijerarhija fascikli za kontakte u Evoluciji je izmenjena od "
+"Evolucije 1.x.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -805,7 +859,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -815,7 +869,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -825,61 +879,60 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi podatke sa Pilot Sync uređaja..."
 
-#: ../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 "Preimenuj fasciklu „%s“ u:"
 
-#: ../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 "Preimenuj fasciklu"
 
-#: ../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 "Imena fascikli ne mogu da sadrže ’/‘"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Novi imenik"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Čuva kao vKartu..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Preimenuj..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693
-#: ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468
-#: ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:504
+#: ../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 "_Obriši"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046
-#: ../mail/em-folder-tree.c:2120
-#: ../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:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518 ../calendar/gui/tasks-component.c:509
+#: ../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 "O_sobine"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Birač izvora za kontakte"
 
@@ -900,8 +953,8 @@ msgstr "Unesite lozinku za %s (korisnik %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 "Unesite lozinku"
@@ -919,34 +972,61 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML za listu adresa za dopunjavanje."
 
 #: ../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 "Položaj uspravne površi, između karte i liste pregleda i panela za pregled, u pikselima."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"Položaj uspravne površi, između karte i liste pregleda i panela za pregled, "
+"u pikselima."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show preview pane"
-msgstr "Prikaži površ za pregled"
+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 "Broj znakova koji se moraju ukucati pre nego što Evolucija pokuša da samodopuni."
+msgid "Show preview pane"
+msgstr "Prikaži površ za pregled"
 
 #: ../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 ""
+"Broj znakova koji se moraju ukucati pre nego što Evolucija pokuša da "
+"samodopuni."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa za poslednju korišćenu fasciklu u prozorčetu za izbor imena"
 
-#: ../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 "Adresa za poslednju korišćenu fasciklu u prozorčetu za izbor imena."
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "Položaj uspravne površi"
 
-#: ../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 "Da li se prikazuje površ za pregled."
 
+#: ../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 "_Potraži samo u lokalnom adresaru"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -988,7 +1068,7 @@ msgid "Add Address Book"
 msgstr "Dodaj imenik"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Uvek"
 
@@ -1014,8 +1094,10 @@ msgid "Email address"
 msgstr "Elektronska adresa"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolucija će koristiti ovu elektronsku adresu da Vas autentifikuje na server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolucija će koristiti ovu elektronsku adresu da Vas autentifikuje na server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1026,14 +1108,14 @@ msgid "Lo_gin:"
 msgstr "Pri_java:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Nikada"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Ne koristi se šifrovanje"
 
@@ -1045,7 +1127,7 @@ msgstr "Jedan"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -1066,20 +1148,39 @@ msgid "Search filter"
 msgstr "Propusnik pretrage"
 
 #: ../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 "Propusnik pretrage je vrsta objekta koji se pretražuje. Ako se ovo ne izmeni podrazumevana pretraga će biti obavljena na klasi objekta „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 ""
+"Propusnik pretrage je vrsta objekta koji se pretražuje. Ako se ovo ne izmeni "
+"podrazumevana pretraga će biti obavljena na klasi objekta „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 "Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo ako on podržava SSL šifrovanje."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo "
+"ako on podržava SSL šifrovanje."
 
 #: ../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 "Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo ako on podržava TLS šifrovanje."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo "
+"ako on podržava TLS šifrovanje."
 
 #: ../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 "Odabir ove mogućnosti znači da server ne podržava ni SSL ni TLS šifrovanje. To znači da Vaša veza neće biti sigurna, i da ćete biti ranjivi na sigurnosne napade. "
+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 ""
+"Odabir ove mogućnosti znači da server ne podržava ni SSL ni TLS šifrovanje. "
+"To znači da Vaša veza neće biti sigurna, i da ćete biti ranjivi na sigurnosne "
+"napade. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1093,37 +1194,75 @@ msgstr "Podržane baze za pretragu"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
 #: ../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 "Baza za pretragu je posebno ime (DN) unosa odakle će Vaša pretraga početi. Ako ovo ostavite prazno, pretraga će početi iz korena stabla direktorijuma."
+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 ""
+"Baza za pretragu je posebno ime (DN) unosa odakle će Vaša pretraga početi. "
+"Ako ovo ostavite prazno, pretraga će početi iz korena stabla direktorijuma."
 
 #: ../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 "Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo direktorijuma. Obim pretrage „pod“ će uključiti sve unose ispod baze za pretragu. Obim pretrage „jedan“ će uključiti samo unose jedan nivo ispod Vaše baze."
+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 ""
+"Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
+"direktorijuma. Obim pretrage „pod“ će uključiti sve unose ispod baze za "
+"pretragu. Obim pretrage „jedan“ će uključiti samo unose jedan nivo ispod Vaše "
+"baze."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
-msgstr "Ovo je puno ime Vašeg ldap servera. Na primer, „ldap.mojepreduzece.com “."
+#, fuzzy
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Ovo je puno ime Vašeg ldap servera. Na primer, „ldap.mojepreduzece.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 "Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki broj usporićete imenik."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki broj "
+"usporićete imenik."
 
 #: ../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 "Ovo je metod koji će Evolucija koristiti da Vas prijavi.  Primetite da njegovo uključivanje na „Elektronska adresa“ zahteva anonimni pristup na ldap server."
+#, fuzzy
+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 ""
+"Ovo je metod koji će Evolucija koristiti da Vas prijavi.  Primetite da "
+"njegovo uključivanje na „Elektronska adresa“ zahteva anonimni pristup na ldap "
+"server."
 
 #: ../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 "Ovo je ime servera koje će se pojaviti u listi fascikli Evolucije. To je samo za potrebe prikazivanja. "
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Ovo je ime servera koje će se pojaviti u listi fascikli Evolucije. To je "
+"samo za potrebe prikazivanja. "
 
 #: ../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 "Ovo je port LDAP servera na koji će Evolucija pokušati da se poveže. Ponuđena je lista standardnih portova. Pitajte svog administratora sistema koji port da navedete."
+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 ""
+"Ovo je port LDAP servera na koji će Evolucija pokušati da se poveže. "
+"Ponuđena je lista standardnih portova. Pitajte svog administratora sistema "
+"koji port da navedete."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
@@ -1155,7 +1294,7 @@ msgstr "Metod _prijave:"
 
 #: ../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:"
@@ -1170,7 +1309,7 @@ msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
 #: ../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 "S_erver:"
@@ -1189,14 +1328,14 @@ msgstr "karte"
 
 # bug: plural-forms
 #: ../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 "minuta"
 
@@ -1237,8 +1376,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Posao</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"
 
@@ -1249,16 +1388,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
 #: ../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 "Uređivač za kontakte"
 
@@ -1267,11 +1406,12 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Slika"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN glasnik"
 
@@ -1284,1254 +1424,1265 @@ msgid "Nic_kname:"
 msgstr "Na_dimak:"
 
 #: ../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
+#, fuzzy
+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 "Lični podaci"
 
-#: ../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 "Posao"
 
-#: ../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 "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Pomoćnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Rođendan:"
 
-#: ../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:1893
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Grad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "Pr_eduzeće:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Država:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Smesti _pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Lična strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Upravnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Beleške:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kancelarija:"
 
-#: ../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 "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "S_upružnik:"
 
-#: ../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 "_Republika/pokrajina:"
 
-#: ../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 "_Titula:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video razgovor:"
 
-#: ../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 "_Želi da prima HTML poštu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Veb log:"
 
-#: ../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 "_Gde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Poš_tanski broj:"
 
-#: ../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 "Adresa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836
-#: ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Izmenljivo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Sjedinjene Države"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Avganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Alžir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Američka Samoa"
 
-#: ../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 "Angila"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktik"
 
-#: ../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 "Antiga i Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Jermenija"
 
-#: ../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 "Australija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../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 "Bahami"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: ../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 "Belorusija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Butan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivija"
 
-#: ../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 "Bosna i Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Buve Ostrvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../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 "Britanska Teritorija Indijskog Okeana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunej Darusalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bugarska"
 
-#: ../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 "Zelenortska Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Kajmanska Ostrva"
 
-#: ../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 "Centralnoafrička Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Čad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Čile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Božićno Ostrvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos (Kiling) Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komori"
 
-#: ../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 "Kongo, Demokratska Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Kuk Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../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 "Obala Slonovače"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Hrvatska"
 
-#: ../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 "Kipar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Češka Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../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 "Dominikanska Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egipat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatorijalna Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Foklandska Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Farska Ostrva"
 
-#: ../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 "Finska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Francuska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Francuska Gijana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Francuska Polinezija"
 
-#: ../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 "Francuske Južne Teritorije"
 
-#: ../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 "Gambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Nemačka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grenland"
 
-#: ../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 "Gvadalup"
 
-#: ../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 "Gvatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Gvirnzi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Gvineja-Bisao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: ../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 "Herd i Mekdonald Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Sveta Stolica"
 
-#: ../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 "Mađarska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Indija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../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 "Irska"
 
-#: ../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 "Čovekovo Ostrvo"
 
-#: ../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 "Italija"
 
-#: ../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 "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Džersi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../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 "Koreja, Demokratska Narodna Republika"
 
-#: ../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 "Koreja, Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../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 "Latvija"
 
-#: ../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 "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Lihtenštajn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litvanija"
 
-#: ../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 "Makedonija"
 
-#: ../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 "Malavi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: ../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 "Maršalova Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritanija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mejot"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: ../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 "Moldavija, 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 "Mongolija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Monserat"
 
-#: ../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 "Mianmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibija"
 
-#: ../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 "Holandija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Holandski Antili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Novi Zeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../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 "Nigerija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolk Ostrva"
 
-#: ../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 "Ostrva Severna Mariana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../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 "Palestinska Teritorija"
 
-#: ../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 Nova Gvineja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paragvaj"
 
-#: ../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 "Filipini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitkern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Katar"
 
 # Za ovu državu nisam čuo ni u snu, tako da sam ostavio u originalu. -- Pa kada si neobrazovan. :)
-#: ../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 "Rumunija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Ruska Federacija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Sveti Kits 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 "Sveta Lucija"
 
-#: ../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 "Sveti Vinsent i Grenadini"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome i Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudijska Arabija"
 
-#: ../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 "Srbija i Crna Gora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sijera 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 "Slovačka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Solomonska Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Južna Afrika"
 
-#: ../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 "Južna Džordžija i Južna Sendvič Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Španija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Šri 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 "Sv. Jelena"
 
-#: ../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 "Sv. Pjer i Mikelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard i Jan Majen Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Svazilend"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Švajcarska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Sirija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: ../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 "Tanzanija, Ujedinjena Republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tajland"
 
-#: ../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-Lest"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad 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 "Tunis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Kokos Ostrva"
 
-#: ../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 "Ukrajina"
 
-#: ../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 "Ujedinjeni Arapski Emirati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: ../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 "Rubna Ostrva SAD"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: ../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 "Venecuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vijetnam"
 
-#: ../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 "Britanska Devičanska Ostrva"
 
-#: ../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 "Američka Devičanska Ostrva"
 
-#: ../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 "Volis i Futuna Ostrva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
-#: ../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 "Zambija"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL brzi glasnik"
 
-#: ../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 "Džaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo glasnik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu'Gadu glasnik"
 
-#: ../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
+#, fuzzy
+msgid "Skype"
+msgstr "Tip"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Servis"
 
-#: ../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
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../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 "Mesto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: ../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 "Kuća"
 
-#: ../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:2259
 msgid "Other"
 msgstr "Drugo"
 
-#: ../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 "Izvorna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Obavezna polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Promenjeno"
 
-#: ../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 "Uređivač za kontakte - %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 "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../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"
@@ -2539,47 +2690,47 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima nevažeći format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima nevažeći format"
 
-#: ../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“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Neispravan 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 "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../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-_pošta"
 
-#: ../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 "_Izaberi imenik"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2588,7 +2739,7 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete kontakt listu (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2596,7 +2747,7 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete ove kontakt liste?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2605,7 +2756,7 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete kontakt (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2712,9 +2863,9 @@ msgstr "Usluga _brzog glasnika:"
 
 #: ../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 "_Mesto:"
 
@@ -2728,6 +2879,9 @@ msgid "Contact List Editor"
 msgstr "Uređivač kontakt liste"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Izaberi..."
 
@@ -2753,9 +2907,9 @@ msgid "_Members"
 msgstr "_Članovi"
 
 #: ../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"
@@ -2779,8 +2933,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli 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?"
-msgstr "Ime ili elektronska adresa ovog kontakta već postoji u ovoj fascikli.  Želite li ipak da ga dodate?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"Ime ili elektronska adresa ovog kontakta već postoji u ovoj fascikli.  "
+"Želite li ipak da ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2809,26 +2967,23 @@ msgstr "Pripoji 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:415
-#: ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-pošta"
 
 #: ../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 "Polje koje sadrži"
 
 #: ../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-pošta počinje sa"
 
@@ -2836,11 +2991,11 @@ msgstr "E-pošta počinje sa"
 msgid "Name contains"
 msgstr "Ime sadrži"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../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"
@@ -2848,25 +3003,24 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 
-#: ../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 "Upit"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
 
@@ -2874,32 +3028,31 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Izvor"
 
-#: ../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 "Tip"
 
 #: ../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 "Čuva kao vKartu..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671
-#: ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
@@ -2953,18 +3106,13 @@ msgid "Cu_t"
 msgstr "_Iseci"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678
-#: ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39
-#: ../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:1595
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
+#: ../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 "_Umnoži"
@@ -2974,15 +3122,20 @@ msgid "P_aste"
 msgstr "_Ubaci"
 
 #. 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 "Bilo koja kategorija"
 
+#: ../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 "Ne odgovara"
+
 #: ../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 "Pomoćnik"
 
@@ -3012,7 +3165,7 @@ msgstr "Telefon u kolima"
 
 #: ../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
@@ -3020,7 +3173,7 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #: ../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 "Preduzeće"
 
@@ -3069,22 +3222,22 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #: ../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 "Upravnik"
 
 #: ../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 "Mobilni telefon"
 
 #: ../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 "Nadimak"
 
 #: ../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 "Napomena"
 
@@ -3113,14 +3266,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 "Uloga"
 
 #: ../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 "Supružnik"
 
@@ -3150,63 +3303,55 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Veb strana"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../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-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729
-#: ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Širina"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../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-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087
-#: ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Visina"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Ima fokus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Polje"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Ime polja"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Model teksta"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
@@ -3276,85 +3421,83 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Poslobna e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Kućna e-pošta"
 
-#: ../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 "Druga e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Ima 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 "_Otvori vezu u čitaču"
 
-#: ../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 "_Umnoži mesto veze"
 
-#: ../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 "_Pošalji poruku za..."
 
-#: ../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 "Umnoži elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "_Video razgovor:"
 
-#: ../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:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3365,81 +3508,75 @@ msgstr "_Video razgovor:"
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../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 "Slobodno/zauzeto"
 
-#: ../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 "_Lična strana:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "_Veb log:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "_Rođendan:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "_Godišnjica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Titula na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Lična stranica"
 
-#: ../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 "Uspeh"
 
 # E_BOOK_ERROR_BUSY
 #. 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 "Osnovni proces je zauzet"
 
 #. 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 "Arhiva van mreže"
 
 #. 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 "Imenik ne postoji"
 
 #. 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 "Lični kontakt nije definisan"
 
@@ -3448,112 +3585,131 @@ msgstr "Lični kontakt nije definisan"
 #. 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 "Zabranjen pristup"
 
 #. 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 "Kontakt nije pronađen"
 
 #. 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 "IB kontakta već postoji"
 
 #. 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 "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Otkazano"
 
 #. 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 "Nije moguće odustati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Autentifikacija obavezna"
 
 #. 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 nije dostupan"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. 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 "Nema takvog izvora"
 
 #. 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 "Nije dostupno u režimu van mreže"
 
 #. 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 "Druga greška"
 
 #. 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 "Neispravna verzija servera"
 
 #. 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 "Metod autentifikacije nije podržan"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
-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 "Otvaranje ovog adresara nije moguće. To znači da on ili nije označen za korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte ovaj adresar kada se povežete radi preuzimanja njegovog sadržaja"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
-#, 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 "Otvaranje ovog adresara nije moguće.  Proverite da putanja %s postoji i da imate prava pristupa."
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+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 ""
+"Otvaranje ovog adresara nije moguće. To znači da on ili nije označen za "
+"korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte ovaj "
+"adresar kada se povežete radi preuzimanja njegovog sadržaja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-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 "Otvaranje ovog adresara nije moguće.  To znači da ste ili uneli pogrešnu adresu, ili je LDAP server nedostupan."
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, fuzzy, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Otvaranje ovog adresara nije moguće.  Proverite da putanja %s postoji i da "
+"imate prava pristupa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
-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 "Ova verzija Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa podrškom za LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+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 ""
+"Ova verzija Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
+"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
+"podrškom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "Otvaranje ovog adresara nije moguće.  To znači da ste ili uneli pogrešnu adresu, ili je server nedostupan."
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Otvaranje ovog adresara nije moguće.  To znači da ste ili uneli pogrešnu "
+"adresu, ili je server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, fuzzy
+msgid "Detailed error message:"
 msgstr "Detalji greške:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3565,10 +3721,11 @@ msgstr ""
 "Preciznije oblikujte upit ili povećajte ograničenje\n"
 "broja rezultata u postavkama adresara za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
 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 ""
@@ -3577,45 +3734,45 @@ msgstr ""
 "upit ili povećajte vremensko ograničenje u postavkama adresara\n"
 "za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspešno završen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3633,16 +3790,16 @@ msgstr[2] ""
 "Otvaranje %d kontakta će otvoriti i %d novih prozora.\n"
 "Da li zaista želite da prikažete ove kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3651,15 +3808,15 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
@@ -3667,50 +3824,50 @@ msgstr[1] "kontakti"
 msgstr[2] "kontakta"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Izaberi imenik"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Višestruke vKarte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vKarta za %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontakt podaci za %s"
@@ -3719,7 +3876,7 @@ msgstr "Kontakt podaci za %s"
 msgid "Querying Address Book..."
 msgstr "Slanje upita imeniku..."
 
-#: ../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."
@@ -3727,16 +3884,16 @@ msgstr[0] "Postoji još %d kontakt."
 msgstr[1] "Postoji još %d kontakta."
 msgstr[2] "Postoji još %d kontakta."
 
-#: ../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 "Prikaži punu vKartu"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Prikaži sažetu vKartu"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Sačuvaj u adresar"
 
@@ -3745,11 +3902,10 @@ msgid "Card View"
 msgstr "Pregled karte"
 
 #: ../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 "Uvoženje..."
 
@@ -3777,19 +3933,19 @@ msgstr "Evolution CSV ili Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolucijin CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin uvoznik vKarti"
 
@@ -3834,12 +3990,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432
-#: ../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:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Zaglavlje"
@@ -3942,9 +4097,9 @@ msgstr "Senčenje"
 
 #. 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 "Veličina:"
 
@@ -3973,29 +4128,8 @@ msgstr "Širina:"
 msgid "_Font..."
 msgstr "_Slovni lik..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Proba uređivača stila za štampanje kontakta"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Autorsko pravo (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Ovo isprobava element uređivača stila za štampanje kontakta"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Proba štampe kontakta"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Ovo isprobava kod za štampu kontakta"
-
-#: ../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 "Datoteka ne može biti otvorena"
@@ -4008,75 +4142,98 @@ msgstr "Lista adresara nije dostupna"
 msgid "failed to open book"
 msgstr "neuspelo otvaranje knjige"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Lista fascikli lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži karte kao vkartu ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Izvezi u neusklađenom režimu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
-msgstr "Broj karti u jednoj izlaznoj datoteci u neusklađenom režimu, podrazumevana veličina 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:62
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Broj karti u jednoj izlaznoj datoteci u neusklađenom režimu, podrazumevana "
+"veličina 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "Greška u argumentima komande, koristite opciju --help da vidite kako se koristi."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Greška u argumentima komande, koristite opciju --help da vidite kako se "
+"koristi."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vcard oblik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "U neusklađenom režimu, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom režimu, nema potrebe za podešavanjem veličine."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
 #. 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 "Kalendar „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi kalendar sa bočne trake u pogledu Kalendara."
+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 ""
+"Kalendar „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi "
+"kalendar sa bočne trake u pogledu Kalendara."
 
 #. 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 "Kalendar „{0}“ je samo za čitanje i nije ga moguće menjati. Izaberite drugi kalendar koji prihvata zakazivanje."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"Kalendar „{0}“ je samo za čitanje i nije ga moguće menjati. Izaberite drugi "
+"kalendar koji prihvata zakazivanje."
 
 #: ../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 "Dodavanjem smislenog kratkog opisa Vašem sastanku daćete primaocima do znanja u vezi čega zakazujete sastanak."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Dodavanjem smislenog kratkog opisa Vašem sastanku daćete primaocima do znanja "
+"u vezi čega zakazujete sastanak."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "Dodavanjem smislenog kratkog opisa Vašem zaduženju daćete primaocima do znanja šta je zaduženje."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+"Dodavanjem smislenog kratkog opisa Vašem zaduženju daćete primaocima do znanja "
+"šta je zaduženje."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4087,8 +4244,12 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Svi podaci u ovoj belešci biće obrisani i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
-msgstr "Svi podaci o ovim zakazanim sastancima biće obrisani i neće se moći povratiti."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Svi podaci o ovim zakazanim sastancima biće obrisani i neće se moći "
+"povratiti."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4096,11 +4257,15 @@ msgstr "Svi podaci o ovim zaduženjima biće uklonjeni i neće se moći povratit
 
 # calendar:prompt-delete-appointment secondary
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Svi podaci o ovom zakazanom sastanku će biti obrisani i neće se moći povratiti."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"Svi podaci o ovom zakazanom sastanku će biti obrisani i neće se moći "
+"povratiti."
 
 #: ../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 "Svi podaci o ovom sastanku će biti uklonjeni i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4144,19 +4309,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sigurno želite da obrišete ovaj zakazani sastanak?"
 
 #: ../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 "Sigurno želite da obrišete ovaj sastanak?"
 
 #: ../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 "Sigurno želite da obrišete ovau belešku?"
 
 #: ../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 "Sigurno želite da obrišete ovo zaduženje?"
@@ -4174,274 +4339,349 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Sigurno želite da pošaljete zaduženje bez sačinjenog pregleda?"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Calendar repository is offline."
+msgstr "Arhiva van mreže"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Ne mogu napraviti jedan novi događaj"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Ne mogu sačuvati događaj"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Obrisati kalendar ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Obrisati spisak beleški „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Obrisati spisak zaduženja ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Ne šalj_i"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Preuzimanje u toku. Želite li da sačuvate zakazani sastanak?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Preuzimanje u toku. Želite li da sačuvate zaduženje?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Uređivač nije mogao biti učitan."
 
-#: ../calendar/calendar.error.xml.h:37
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "Pozivnice e-poštom biće poslate svim učesnicima da bi mogli da prihvate ovo zaduženje."
-
-# bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Pozivnice će biti poslate e-poštom svim učesnicima i omogućiće im da odgovore."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Pozivnice e-poštom biće poslate svim učesnicima da bi mogli da prihvate ovo "
+"zaduženje."
 
+# bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Pozivnice će biti poslate e-poštom svim učesnicima i omogućiće im da "
+"odgovore."
+
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Greška pri učitavanju kalendara"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Greška pri učitavanju spiska beleški"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Greška pri učitavanju spiska zaduženja"
 
-#: ../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 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće znati da je sastanak otkazan."
-
-#: ../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 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće znati da je beleška obrisana."
-
+#. 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 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće znati da je zaduženje obrisano."
+#, fuzzy
+msgid "Error on '{0}'"
+msgstr "Greška prilikom {0}."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Slanje osveženih podataka omogućava ostalim učesnicima da njihov kalendar bude u toku."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
+"znati da je sastanak otkazan."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Slanje osveženih podataka omogućava ostalim učesnicima da njihov spisak zaduženja bude u toku."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
+"znati da je beleška obrisana."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "Preuzima se nekoliko priloga. Ukoliko sada sačuvate zakazani sastanak ovi prilozi neće biti sačuvani sa njim."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
+"znati da je zaduženje obrisano."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate zaduženje ovi prilozi neće biti sačuvani sa njim."
+msgid "No response from the server."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "Sačuvaj zakazani sastanak"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "Sačuva belešku"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "Sačuvaj zaduženje"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Slanje osveženih podataka omogućava ostalim učesnicima da njihov kalendar bude "
+"u toku."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Slanje osveženih podataka omogućava ostalim učesnicima da njihov spisak "
+"zaduženja bude u toku."
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Preuzima se nekoliko priloga. Ukoliko sada sačuvate zakazani sastanak ovi "
+"prilozi neće biti sačuvani sa njim."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate zaduženje ovi "
+"prilozi neće biti sačuvani sa njim."
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "Na tekućoj verziji servera neke mogućnosti možda neće ispravno raditi"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendar Evolucije je neočekivano završio."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Kalendar Evolucije je neočekivano završio."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Kalendar Evolucije je neočekivano završio."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolucija zaduženja su neočekivano završila."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Ovaj kalendar nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Spisak beleški nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Spisak zaduženja nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Ovaj kalendar će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleški će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Ovaj spisak zaduženja će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Nije moguće otvaranje kalendara „%s“"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Želite li da sačuvate promene na zakazanom sastanku?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Želite li da sačuvate promene u ovim beleškama?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Želite li da sačuvate promene na zaduženju?"
 
-#: ../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 "Želite li da pošaljete obaveštenje o otkazivanju za ovau belešku?"
 
 # calendar:prompt-cancel-task primary
-#: ../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 "Želite li da pošaljete svim učesnicima obaveštenje o otkazivanju?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Želite li da pošaljete pozive na sastanak učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Želite li da pošaljete ovo zaduženje učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o sastanku učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o zaduženju učesnicima?"
 
-#: ../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 "Povezujete se na nepodržan GroupWise server što može da dovede do problema u radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju."
+#: ../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 ""
+"Povezujete se na nepodržan GroupWise server što može da dovede do problema u "
+"radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Promenili ste ovaj zakazani sastanak, ali promene još niste sačuvali."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Promenili ste ovo zaduženje, ali promene još niste sačuvali."
 
-#: ../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 "Promenili ste ovu belešku, ali promene još niste sačuvali."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalendari neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Beleška neće biti dostupna dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Zaduženja neće biti dostupna dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Zanemari promene"
 
-#: ../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 "_Sačuvaj"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "Sačuvaj pro_mene"
 
-#: ../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 "_Pošalji"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
-#: ../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 "Podeli višednevne događaje:"
 
-#: ../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 "Neuspelo pokretanje evolucija-servera-podataka"
 
-#: ../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 "Neuspelo čitanje programskog bloka pilotovog Kalendara"
 
-#: ../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 "Neuspelo čitanje pilotovog bloka beleški"
 
-#: ../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 "Neuspeo upis pilotovog bloka beleški"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Podrazumevana važnost:"
 
-#: ../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 "Neuspelo čitanje pilotovog ToDo programskog bloka"
 
-#: ../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 "Neuspeo upis u pilotov blok „uraditi“"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zaduženja"
 
 #: ../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:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendari"
 
@@ -4482,28 +4722,21 @@ msgid "Memo_s"
 msgstr "Be_leške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280
-#: ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774
-#: ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101
-#: ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Beleške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642
-#: ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4525,29 +4758,29 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Servis za upozorenja Evolucija kalendara"
 
 # bug: plural-forms
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: ../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] "sat"
 msgstr[1] "sata"
 msgstr[2] "sati"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Vreme početka"
 
@@ -4558,10 +4791,10 @@ msgstr "Zakazani sastanci"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -4570,57 +4803,57 @@ msgid "Snooze _time:"
 msgstr "Vreme _dremanja:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h: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 "_Uređivanje"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "Dre_manje"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "zakazano mesto sastanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Nema dostupnog pregleda."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o mestu."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4632,31 +4865,35 @@ msgstr ""
 "podsetnik podešen da pošalje poruku. Evolucija će\n"
 "umesto toga prikazati normalno prozorče."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is 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 ""
-"Podsetnik Evolucija kalendara će biti pokrenut. Ovaj podsetnik je podešen da pokrene sledeći program:\n"
+"Podsetnik Evolucija kalendara će biti pokrenut. Ovaj podsetnik je podešen da "
+"pokrene sledeći program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Sigurno želite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Nije moguće pokrenuti Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Nije moguće pokrenuti servis za upozorenja, možda je već aktivan..."
 
 #: ../calendar/gui/alarm-notify/util.c:44
@@ -4664,8 +4901,7 @@ msgid "invalid time"
 msgstr "neispravno vreme"
 
 #. 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"
@@ -4675,8 +4911,7 @@ msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
 #. 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"
@@ -4688,8 +4923,7 @@ msgstr[2] "%d minuta"
 #. 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"
@@ -4703,560 +4937,681 @@ msgid "Alarm programs"
 msgstr "Programi za alarm"
 
 #: ../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 "Vreme u sekundama za koje se prikazuje greška u statusnoj liniji."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Traži potvrdu za brisanje predmeta"
 
-#: ../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 "Boja pozadine zaduženja za danas, u obliku „#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 "Boja pozadine neispunjenih zaduženja, u obliku „#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 "Kalendari za koje se pokreće alarm"
 
-#: ../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 "Boja za iscrtavanje Markus Bejns linije u liniji vremena (podrazumevano je prazno)."
-
 #: ../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 ""
+"Boja za iscrtavanje Markus Bejns linije u liniji vremena (podrazumevano je "
+"prazno)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Boja za iscrtavanje Markus Bejns linije u dnevnom pregledu."
 
-#: ../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 "Sažmi vikende u mesečni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Potvrdi pražnjenje"
 
-#: ../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 "Potrebno je označiti dane kojima počinju i završavaju se radni časovi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za sastanak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../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 "Direktorijum za čuvanje zvučnih datoteka alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Stepen događaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Providnost događaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Adrese servera za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../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 "Stepen događaja u pregledu kalendara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Sakrij završena zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Sakrij jedinice zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Sakrij vrednost zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
-#: ../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 "Sat kojim se završava radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 do 23."
+msgstr ""
+"Sat kojim se završava radna nedelja, u dvadesetčetvoročasovnom obliku, od 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 "Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 do 23."
+msgstr ""
+"Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom obliku, od 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 "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Poslednje vreme za alarm"
 
-#: ../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 "Nivo nakon kojeg se poruka zavodi u dnevnik."
+
+#: ../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 "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../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 "Boja Markus Bejns linije - dnevni pregled"
 
-#: ../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 "Boja Markus Bejns linije - linija vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se završava radni dan, 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 "Minut kojim počinje radni dan, od 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 "Pozicija položene površi mesečnog pregleda"
 
-#: ../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 "Pozicija uspravne površi mesečnog pregleda"
 
-#: ../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 "Broj jedinica za određivanje podrazumevanog podsetnika."
 
-#: ../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 "Broj jedinica za određivanje kada sakriti zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Boja prekoračenih zaduženja"
 
-#: ../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 "Pozicija položene površi, između dela kalendara za datum i liste zaduženja kada nije postavljen mesečni pregled, u pikselima."
+#: ../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 ""
+"Pozicija položene površi, između dela kalendara za datum i liste zaduženja "
+"kada nije postavljen mesečni pregled, u pikselima."
 
-#: ../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 "Pozicija položene površi, između pregleda i dela kalendara za datum i liste zaduženja u mesečnom pregledu, u pikselima."
+#: ../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 ""
+"Pozicija položene površi, između pregleda i dela kalendara za datum i liste "
+"zaduženja u mesečnom pregledu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "Položaj uspravne površi, između liste kalendara i navigacije kalendara po datumu."
+#: ../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 ""
+"Položaj uspravne površi, između liste kalendara i navigacije kalendara po "
+"datumu."
 
-#: ../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 "Pozicija uspravne površi, između liste zaduženja i panela za pregled zaduženja, u pikselima."
+#: ../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 ""
+"Pozicija uspravne površi, između liste zaduženja i panela za pregled "
+"zaduženja, u pikselima."
 
-#: ../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 "Pozicija uspravne površi, između pregleda i dela kalenda za datum i liste zaduženja u mesečnom pregledu, u pikselima."
+#: ../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 ""
+"Pozicija uspravne površi, između pregleda i dela kalenda za datum i liste "
+"zaduženja u mesečnom pregledu, u pikselima."
 
-#: ../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 "Pozicija uspravne površi, između pregleda i dela kalendara za datum i liste zaduženja kada nije postavljen mesečni pregled, u pikselima."
+#: ../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 ""
+"Pozicija uspravne površi, između pregleda i dela kalendara za datum i liste "
+"zaduženja kada nije postavljen mesečni pregled, u pikselima."
 
-#: ../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 "Programi koji mogu biti pokrenuti alarmima."
 
-#: ../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 "Direktorijum za čuvanje zvučnih alarma"
 
-#: ../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 "Prikaži RSVP polje u uređivaču događaja/zaduženja/susreta"
 
-#: ../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 "Prikaži polje uloge u uređivaču događaja/zaduženja/susreta"
 
-#: ../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 "Prikazuje vremena završetka sastanaka u nedeljnim i mesečnim pregledima"
 
-#: ../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 "Prikaži polje kategorije u uređivaču događaja/susreta/zaduženja"
 
-#: ../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 "Prikazuje alarme u obaveštajnoj zoni"
 
-#: ../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 "Prikaži polje „Stanje“ u uređivaču događaja/zaduženja/susreta"
 
-#: ../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 "Prikaži površ „Pregled“"
 
-#: ../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 "Prikazuje površ „Pregled“."
 
-#: ../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 "Prikaži polje vremenske zone u uređivaču događaja (susreta)"
 
-#: ../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 "Prikaži polje „Vrsta“ u uređivaču događaja/zaduženja/susreta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Prikazuje brojeve nedelja u delu za datum"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Prikazuje brojeve nedelja u delu za datum"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Boja zaduženja za danas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Pozicija uspravne površi zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se zamenjuje korisničkim delom elektronske adrese, a %d domenom."
+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 ""
+"Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se "
+"zamenjuje korisničkim delom elektronske adrese, a %d domenom."
 
-#: ../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\"."
-msgstr "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
+"neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Može imati tri moguće vrednosti. „0“ za greške. „1“ za upozorenja. „2“ za "
+"poruke o dijagnozi kvara."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Podela _vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../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 "Providnost dokađaja u pregledu kalendara, vrednost između 0 (providno) i 1 (neprovidno)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Providnost dokađaja u pregledu kalendara, vrednost između 0 (providno) i 1 "
+"(neprovidno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "24-časovni oblik vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“."
+msgstr ""
+"Jedinice za podrazumevani podsetnik, „minutes“ (minuti), „hours“ (sati) ili "
+"„days“ (dani)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“, ili „dani“."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Jedinice za određivanje kada sakriti zaduženja, „minutes“ (minuti), "
+"„hours“ (sati) ili „days“ (dani)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Početak nedelje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dan kojim počinje nedelja, od nedelje (0) do subote (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Da li da koristi obaveštajnu zonu za prikazivanje alarma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Da li da traži potvrdu za brisanje sastanka ili zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Da li da traži potvrdu pri izbacivanju sastanka i zaduženja."
 
-#: ../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 "Da li da sažme vikende u mesečnom pregledu, koji subotu i nedelju stavlja u prostor radne nedelje."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Da li da sažme vikende u mesečnom pregledu, koji subotu i nedelju stavlja u "
+"prostor radne nedelje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima."
+msgstr ""
+"Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Da li da sakrije završena zaduženja u pregledu zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Da li da postavi podrazumevani podsetnik za zakazane sastanke."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Da li da prikaže RSVP polje u uređivaču događaja/zaduženja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaže polje kategorije u uređivaču događaja (sastanaka)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje sa ulogom u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje sa stanjem u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Da li da prikaže vreme u dvadesetočasovnom obliku umesto am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Da li da prikaže polje vremenske zone u uređivaču događaja (sastanaka)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje vrstu u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Da li da prikaže brojeve nedelja u delu za datum."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Da li da prikaže brojeve nedelja u delu za datum."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Dali da se koristi letnje računanje vremena kada se prikazuju događaji."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Čas kojim se završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minut kojim se završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Čas kojim počinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minut kojim počinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "Letnje računanje vremena"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Pregled sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategorija je"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Mesto sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:629
-#: ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Ne odgovara"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Zaduženja za sledeću nedelju"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Aktivna zaduženja"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Prekoračena zaduženja"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Završena zaduženja"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Zaduženja sa prilozima"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Aktivni sastanci"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Sastanci u sledećih 7 dana"
 
-#: ../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 "Štampaj"
 
-#: ../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 "Ova radnja će trajno obrisati sve događaje pre izabranog roka. Ukoliko nastavite, nećete moći da povratite ove događaje."
+#: ../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 ""
+"Ova radnja će trajno obrisati sve događaje pre izabranog roka. Ukoliko "
+"nastavite, nećete moći da povratite ove događaje."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../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 "dana"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the 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/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241 ../calendar/gui/memos-component.c:244
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "Na vebu"
 
-#: ../calendar/gui/calendar-component.c:310
-#: ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i godišnjice"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../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:677
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "_Omogući za rad van mreže"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "_Onemogući da ovo bude dostupno van mreže"
+
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Neuspela dopuna kalendara."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nije moguće otvoriti kalendar ’%s‘ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Birač izvora kalendara"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazano"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Zakazuje novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Pravi novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
@@ -5276,284 +5631,130 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: ../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 "Bilo koje polje"
 
-#: ../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 "Prilozi"
 
-#: ../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 "_Učesnik"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Poslovno"
-
-#: ../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 "Kategorija"
 
-#: ../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 "Razvrstavanje"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Takmičenje"
-
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:337
-#: ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../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 "Opisi"
 
-#: ../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 "Ne postoji"
 
-#: ../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 "Postoji"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Omiljeno"
-
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Pokloni"
-
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Ciljevi/zadaci"
-
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Praznik"
-
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Čestitke"
-
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Važni kontakti"
-
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Ideje"
-
-#: ../calendar/gui/caltypes.xml.h:23
-#: ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Međunarodno"
-
-#: ../calendar/gui/caltypes.xml.h:24
-#: ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Važan klijent"
-
-#: ../calendar/gui/caltypes.xml.h:26
-#: ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Razno"
-
-#: ../calendar/gui/caltypes.xml.h:27
-#: ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Sledećih 7 dana"
-
-#: ../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 "Telefonski pozivi"
-
-#: ../calendar/gui/caltypes.xml.h:31
-#: ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:335
-#: ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Lično"
 
-#: ../calendar/gui/caltypes.xml.h:32
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545
-#: ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
 
-#: ../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 "Učestalost"
 
-#: ../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 "Status"
-
-#: ../calendar/gui/caltypes.xml.h:35
-#: ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Strategije"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Pregled"
 
-#: ../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 "Pregledi"
 
-#: ../calendar/gui/caltypes.xml.h:38
-#: ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Snabdevači"
-
-#: ../calendar/gui/caltypes.xml.h:39
-#: ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Praćenje u vremenu; izdaci"
-
-#: ../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 "Čekam"
-
-#: ../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 "sadrži"
 
-#: ../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 "ne sadrži"
 
-#: ../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 "je"
 
-#: ../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 "nije"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:429
-#: ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -5590,17 +5791,17 @@ msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
 #: ../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 "Pušta zvuk"
 
 #: ../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 "Iskačuće upozorenje"
 
 #: ../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 "Pokreće program"
 
@@ -5613,7 +5814,7 @@ msgid "Send To:"
 msgstr "Pošalji:"
 
 #: ../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 "Šalje elektronsku poruku"
 
@@ -5678,25 +5879,58 @@ 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 "Alarmi"
 
-#: ../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 "_Predloži automatski prikaz priloga"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Prilaže datoteku(e)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ništa"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Prikaži _polje u pregledu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5710,57 +5944,60 @@ msgstr ""
 "10 minuta\n"
 "5 minuta"
 
-#: ../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 i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese.</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\">Upozorenja</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\">Podrazumevani server slobodnog/zauzetog vremena</span>"
+msgstr ""
+"<span weight=\"bold\">Podrazumevani server slobodnog/zauzetog vremena</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\">Opšte</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\">Spisak zaduženja</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\">Vreme</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\">Radna sedmica</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 "Podesi za _letnje računanje vremena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../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 "Petak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5770,13 +6007,13 @@ msgstr ""
 "Sati\n"
 "Dana"
 
-#: ../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 "Ponedeljak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5794,242 +6031,261 @@ msgstr ""
 "Subota\n"
 "Nedelja"
 
-#: ../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 "Bira boju"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "N_ed"
 
-#: ../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 "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Pošalji:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Izaberi kalendare za zvučno obaveštenje"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "Pri_kaži podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "Pri_kaži podsetnik"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Prikaži _brojeve nedelja u delu za datum"
 
-#: ../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:43
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Prikazuje brojeve nedelja u delu za datum"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "Z_aduženja za danas:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "U_to"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Model:"
 
-#: ../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:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../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:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../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:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Sreda"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Početak n_edelje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - časovni (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 - časovni"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Traži potvrdu za brisanje predmeta"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Sažmi nedelje u mesečni pregled"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij završena zaduženja posle"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "_Prikaži vremena završetka sastanaka u nedeljnim i mesečnim pregledima"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "Podele _vremena:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Uto"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_Sre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "pre svakog sastanka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Umnožava sadržaj kalendara lokalno za rad van mreže"
 
-#: ../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 "_Umnožava sadržaj liste zaduženja lokalno za rad van mreže"
 
-#: ../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 "_Umnožava sadržaj spiska beleški lokalno za rad van mreže"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "Boj_a:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Spisak beleški"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Osobine liste zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "No_vi spisak zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Osobine liste zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Ovo zaduženje je obrisano."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Ova beleška je obrisana."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Načinili ste promene. Zanemariti ih i zatvoriti uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste načinili promene, zatvoriti uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Ovaj događaj je promenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ovo zaduženje je promenjeno."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Ova beleška je promenjena."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Načinili ste promene. Zanemariti ih i osvežiti uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste načinili promene, osvežiti uređivač?"
@@ -6039,41 +6295,35 @@ msgstr "%s  Niste načinili promene, osvežiti uređivač?"
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
 msgid " to "
 msgstr " za "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
 msgid "Completed "
 msgstr "Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
 msgid " (Due "
 msgstr " (Do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
 msgid "Due "
 msgstr "Do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Priložena poruka - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410
-#: ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6081,223 +6331,216 @@ msgstr[0] "%d priložena poruka"
 msgstr[1] "%d priložene poruke"
 msgstr[2] "%d priloženih poruka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481
-#: ../composer/e-msg-composer.c:2058
-#: ../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 "Pre_mesti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483
-#: ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Otkaži _prevlačenje"
 
-#: ../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:3315 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Nije moguće osvežiti objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Uredi zakazani sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljeno zaduženje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Beleška - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Bez pregleda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Pritisnite ovde da zatvorite tekući prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Umnoži izabrani tekst u spisak isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Seče izabrani tekst u spisak isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Pritisnite ovde za dostupnu pomoć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Ubaci tekst iz liste isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Pritisnite ovde da sačuvate tekući prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Izaberi sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../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:1417 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Pritisnite ovde da priložite neki dokument"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Bira da li da prikaže kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Bira da li da prikaže vremensku zonu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Označi kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Označi kao lično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Označi kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "_Uloga polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Bira da li je polje Uloga prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Bira da li je polje RSVP prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Stanje polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Bira da li da prikaže polje sa stanjem"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Vrsta polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Bira da li je prikazana vrsta prisutnih"
 
-#: ../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:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Skorašnji _dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6305,111 +6548,111 @@ msgstr[0] "<b>%d</b> prilog"
 msgstr[1] "<b>%d</b> priloga"
 msgstr[2] "<b>%d</b> priloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193
-#: ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../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 "_Ukloni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Dodaj prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Prikaži p_riloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Pritisnite razmak za prikaz(sakrivanje) linije priloga"
 
-#: ../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:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Promene načinjene na ovom predmetu mogu biti zanemarene ako bude osvežen"
+msgstr ""
+"Promene načinjene na ovom predmetu mogu biti zanemarene ako bude osvežen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Nije moguće korišćenje tekuće verzije!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Nije moguće otvaranje izvora"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Nije moguće otvaranje odredišta"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: ../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 "_Ibriši ovu stavku iz svih ostalih poštanskih sandučića primaoca?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Beleška nije moglo biti obrisana zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Predmet nije mogao biti obrisan zbog corba greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zaduženje nije moglo biti obrisano jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Beleška nije mogla biti obrisana jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Predmet nije mogao biti obrisan jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj nije mogao biti obrisan usled greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Zaduženje nije moglo biti obrisano usled greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Beleška nije mogla biti obrisana usled greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Predmet nije mogao biti obrisan usled greške"
 
@@ -6426,142 +6669,143 @@ msgstr "Delegiraj:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "Ala_rmi"
 
-#: ../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 "Pritisnite ovde da navijete ili isključite sat za ovaj događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "Učesta_lost"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Neka ova pojava bude pokretna"
 
-#: ../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 "Opcije slanja"
 
-#: ../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 "Umetni napredne mogućnosti slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Celodnevni događa_j"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoliti celodnevne događaje"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Bira da li da prikaže vreme kao zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Zaka_zani sastanak"
 
-#: ../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:2725
 msgid "This event has alarms"
 msgstr "Za ovaj događaj je navijen sat"
 
-#: ../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 "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../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 "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../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 "Izabrani organizator više nema nalog."
 
-#: ../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 "Potreban je 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 "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Dodaj "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvaranje kalendara ’%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:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Delujete u ime %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6569,7 +6813,7 @@ msgstr[0] "%d dan pre zakazanog sastanka"
 msgstr[1] "%d dana pre zakazanog sastanka"
 msgstr[2] "%d dana pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6577,7 +6821,7 @@ msgstr[0] "%d sat pre zakazanog sastanka"
 msgstr[1] "%d sata pre zakazanog sastanka"
 msgstr[2] "%d sati pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6585,37 +6829,10 @@ msgstr[0] "%d minut pre zakazanog sastanka"
 msgstr[1] "%d minuta pre zakazanog sastanka"
 msgstr[2] "%d minuta pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Prilagodi"
 
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158
-#: ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685
-#: ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306
-#: ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Ništa"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dan pre zakazanog sastanka"
@@ -6692,24 +6909,19 @@ msgstr "Konta_kti..."
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nije moguće otvaranje beleški u „%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 "Prima"
 
@@ -6723,58 +6935,63 @@ msgid "T_o:"
 msgstr "_Prima:"
 
 #: ../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:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Menjate povratni događaj, šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegirate povratni događaj, šta želite da delegirate?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Menjate povratno zaduženje, šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Ovaj i buduće unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ovaj zakazani sastanak sadrži ponavljanja koja Evolucija ne može da uredi."
+msgstr ""
+"Ovaj zakazani sastanak sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
+#: ../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 "na"
 
@@ -6782,7 +6999,7 @@ msgstr "na"
 #. * (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 "prvoj"
 
@@ -6791,7 +7008,7 @@ msgstr "prvoj"
 #. * (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 "drugoj"
 
@@ -6799,7 +7016,7 @@ msgstr "drugoj"
 #. * (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 "trećoj"
 
@@ -6807,7 +7024,7 @@ msgstr "trećoj"
 #. * (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 "četvrtoj"
 
@@ -6815,13 +7032,13 @@ msgstr "četvrtoj"
 #. * (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 "poslednjoj"
 
 #. 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 "Drugi datum"
 
@@ -6829,7 +7046,7 @@ msgstr "Drugi datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -6837,7 +7054,7 @@ msgstr "od prvog do desetog"
 #. * 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 "od jedanaestog do dvadesetog"
 
@@ -6845,45 +7062,45 @@ msgstr "od jedanaestog do dvadesetog"
 #. * 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 "od dvadeset prvog do trideset prvog"
 
 #. 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 "dan"
 
 #. 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 "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Ne može da nađe izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Izmeni izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Ne može da nađe izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -6934,6 +7151,10 @@ msgstr "nedelja(e)"
 msgid "year(s)"
 msgstr "godina(e)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6955,64 +7176,55 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642
-#: ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Završeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Visoka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
 msgid "In Progress"
 msgstr "U toku"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Mala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974
-#: ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Obična"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640
-#: ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nije započeto"
 
@@ -7025,8 +7237,7 @@ msgid "Stat_us:"
 msgstr "_Stanje:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570
-#: ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Neodređena"
 
@@ -7052,28 +7263,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "Klikni za promenu ili detaljan pregled stanja zaduženja"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Mog_ućnosti kod slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalji zaduženja"
 
-#: ../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 "Datum za završetak je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zaduženja u ’%s‘."
@@ -7095,7 +7306,7 @@ msgid "Time zone:"
 msgstr "Vremenska zona:"
 
 #. 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"
@@ -7104,7 +7315,7 @@ msgstr[1] "%d dana"
 msgstr[2] "%d dana"
 
 #. 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"
@@ -7112,119 +7323,116 @@ msgstr[0] "%d nedelja"
 msgstr[1] "%d nedelje"
 msgstr[2] "%d nedelja"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Izvršiće se nepoznata radnja"
 
 #. 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 pre početka sastanka"
 
 #. 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 nakon početka sastanka"
 
 #. 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 početku sastanka"
 
 #. 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 pre kraja sastanka"
 
 #. 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 nakon završetka sastanka"
 
 #. 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 kraju sastanka"
 
 #. 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 na %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 za nepoznat tip pokretača"
 
-#: ../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 "Pritisnite da otvorite %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 "Neimenovano"
 
-#: ../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 "Datum početka:"
 
-#: ../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 "Veb stranica:"
 
-#: ../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 "Pregled:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Datum za završetak:"
 
 #. 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
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Važnost:"
 
@@ -7238,17 +7446,17 @@ msgid "Start Date"
 msgstr "Datum početka"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7258,256 +7466,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
-#: ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339
-#: ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203
-#: ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111
-#: ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002
-#: ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-popup.c:183
-#: ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:199
-#: ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Izaberite fasciklu za čuvanje izabranih priloga..."
 
-#: ../calendar/gui/e-cal-popup.c:231
-#: ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:286
-#: ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Sačuvaj izabrano"
 
-#: ../calendar/gui/e-cal-popup.c:428
-#: ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Bez pregleda *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 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:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Početak:"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Do: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665
-#: ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795
-#: ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Osvežavanje objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221
-#: ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Novo zad_uženje"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657
-#: ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "Š_tampaj..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677
-#: ../calendar/gui/e-memo-table.c:931
-#: ../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:1594
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../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 "_Iseci"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679
-#: ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../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 "U_baci"
 
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iKalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "_Obeleži kao nezavršeno"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Obeleži izabrana zaduženja kao nezavršena"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite za novo zaduženje"
@@ -7530,8 +7707,8 @@ msgid "Due date"
 msgstr "Datum za završetak"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Važnost"
 
@@ -7539,97 +7716,139 @@ msgstr "Važnost"
 msgid "Start date"
 msgstr "Datum početka"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Premeštanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Umnožavanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Novi _sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Novi _sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Trenutni pregled"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "Štam_paj..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../calendar/gui/e-calendar-view.c:1689
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566
-#: ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Odbijeno"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Sa rezervom"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Delegirano"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+#, fuzzy
+msgid "Needs action"
+msgstr "Potrebna radnja"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -7639,7 +7858,7 @@ msgstr "Vreme: %s %s"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. 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 %m/%d/%Y %H:%M:%S"
 
@@ -7648,11 +7867,11 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. 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 %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7665,11 +7884,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 "%02i minutni razmaci"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Prikaži površ „Pregled“"
+
 # %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
@@ -7681,32 +7905,34 @@ msgstr "%02i minutni razmaci"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791
-#: ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794
-#: ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Nedelja"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeno ponavljanje)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7714,7 +7940,7 @@ msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7722,7 +7948,7 @@ msgstr[0] "Svake %d nedelje"
 msgstr[1] "Svake %d nedelje"
 msgstr[2] "Svakih %d nedelja"
 
-#: ../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 "
@@ -7731,22 +7957,22 @@ msgstr[1] "Svake %d nedelje u "
 msgstr[2] "Svakih %d nedelja u "
 
 #. 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 dan od "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s od "
 
 # slično kao za nedelje
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7755,7 +7981,7 @@ msgstr[1] "svaka %d meseca"
 msgstr[2] "svakih %d meseci"
 
 # slično kao za mesece i nedelje
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7763,349 +7989,335 @@ msgstr[0] "Svake %d godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "Svakih %d godina"
 
-#: ../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] "ukupno %d put"
 msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
 
 #. 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 ", završavajući se "
 
 #. 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 "Počinje"
 
 #. 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 "Završava se"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Rok"
 
-#: ../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 "iKalendar podaci"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iKalendar greška"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Nepoznata 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> Proverite sledeći podatak, i potom izaberite radnju iz donjeg menija."
-
-#: ../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 "Prihvaćeno"
+#: ../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> Proverite sledeći podatak, i potom izaberite radnju iz donjeg menija."
 
-#: ../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:2195
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../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 "Odbijeno"
-
-#: ../calendar/gui/e-itip-control.c:1283
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1278
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "Sastanak je otkazan, međutim nije ga moguće naći u Vašim kalendarima"
 
-#: ../calendar/gui/e-itip-control.c:1285
-msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "Zaduženje je otkazano, međutim nije ga moguće naći u Vašim spiskovima zaduženja"
+#: ../calendar/gui/e-itip-control.c:1280
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"Zaduženje je otkazano, međutim nije ga moguće naći u Vašim spiskovima zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> objavi podatak o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Podatak o sastanku"
 
-#: ../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> zahteva prisustvo %s na sastanku."
 
-#: ../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> zahteva Vaše prisustvo na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
 #. 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> želi da bude deo postojećeg sastanka."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Osvežavanje sastanka"
 
-#: ../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> želi da dobije najnovija obaveštenja o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Zahtev za osvežavanjem sastanka"
 
-#: ../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> odgovori na zahtev za sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../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> otkaza sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Otkazivanje sastanka"
 
-#: ../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> posla nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> objavi podatak o zaduženju."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Podatak o zaduženju"
 
-#: ../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> traži %s za izvršavanje zaduženja."
 
-#: ../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> traži da Vi izvršite zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
 #. 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 želi da bude deo postojećeg zaduženja."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Osvežavanje zaduženja"
 
-#: ../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> želi da prima najnovija obaveštenja o zaduženju."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Zahtev za osvežavanjem zaduženja"
 
-#: ../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> odgovori na dodeljeno zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: ../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> otkaza zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Otkazivanje zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> objavi slobodno/zauzeto vreme."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Slobodno/zauzeto vreme"
 
-#: ../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> pita kada ste slobodni/zauzeti."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Slobodno/zauzeto zahtev"
 
-#: ../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> odgovori na slobodno/zauzeto zahtev."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Slobodno/zauzeto odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodno/zauzeto poruka"
 
-#: ../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 "Poruka izgleda da nije ispravno sačinjena"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: ../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 "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema predmete kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Osvežavanje završeno\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 "Objekat nije ispravan i ne može biti osvežen\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 "Ovaj odgovor nije poslao prisutan učesnik.  Dodati ga u prisutne?"
 
-#: ../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 "Stanje učesnika nije osveženo jer nema ispravano stanje!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Osvežen status učesnika\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:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje učesnika nije osveženo jer predmet više ne postoji"
 
-#: ../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 "Predmet poslat!\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 "Predmet nije mogao biti poslat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Izaberite radnju:"
 
-#: ../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 "Osveži"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodno/zauzeto podatak"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Osveži status sagovornika"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviji podatak"
 
-#: ../calendar/gui/e-itip-control.c:2470
-#: ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -8133,120 +8345,86 @@ msgstr "Učitavanje kalendara..."
 msgid "Server Message:"
 msgstr "Poruka servera:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Obavezni učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740
-#: ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "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:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Mesto"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../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 "Potrebna radnja"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "Sa rezervom"
-
-#: ../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 "Delegirano"
-
 #. 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 "Učesnik"
 
-#. 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 "U toku"
 
@@ -8254,7 +8432,7 @@ msgstr "U 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:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8268,7 +8446,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:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y."
 
@@ -8283,67 +8461,67 @@ msgstr "%a %d/%m/%Y."
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Uč_esnici..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "O_pcije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Osveži slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
@@ -8371,18 +8549,15 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Član"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Obriši izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:1093
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pritisnite da dodate belešku"
 
-#: ../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"
@@ -8391,17 +8566,16 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Učitavanje beleški je u toku"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Otvaranje beleški sa %s je u toku"
 
-#: ../calendar/gui/e-memos.c:1062
-#: ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Brisanje izabranih objekata..."
 
@@ -8409,20 +8583,20 @@ msgstr "Brisanje izabranih objekata..."
 msgid "Loading tasks"
 msgstr "Učitavanje zaduženja"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaranje zaduženja u %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Završavanje zaduženja..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Izaberite vremensku zonu"
 
@@ -8431,44 +8605,43 @@ msgstr "Izaberite vremensku zonu"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343
-#: ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "Pr_ilagođen pregled"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "Sačuvaj prilagođen preg_led"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "Odre_di preglede..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavanje sastanaka sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavanje zaduženja sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Učitavanje beleški na %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -8528,70 +8701,132 @@ msgstr "Septembar"
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: ../calendar/gui/itip-utils.c:404
-#: ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:626
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Podatak o događaju"
 
-#: ../calendar/gui/itip-utils.c:628
-#: ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Podatak o zaduženju"
 
-#: ../calendar/gui/itip-utils.c:630
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Podaci o beleški"
 
-#: ../calendar/gui/itip-utils.c:632
-#: ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto podatak"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Podatak o kalendaru"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+#, fuzzy
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Prihvaćeno s rezervom"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#, fuzzy
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Odbijeno"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegirano"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+#, fuzzy
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+#, fuzzy
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Poništi"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+#, fuzzy
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+#, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto vreme (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iKalendar podatak"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8599,8 +8834,7 @@ msgstr[0] "%d beleška"
 msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 
-#: ../calendar/gui/memos-component.c:546
-#: ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:593 ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8608,94 +8842,93 @@ msgstr[0] ", %d izabrano"
 msgstr[1] "%d izabrana"
 msgstr[2] "%d izabranih"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Neuspela dopuna beleški."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Nije moguće otvaranje spiska beleški „%s“ za pravljenje događaja i sastanaka"
+msgstr ""
+"Nije moguće otvaranje spiska beleški „%s“ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Nijedan kalendar nije dostupan za pravljenje beleški"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Birač izvora beleški"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Nova beleška"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Napiši jednu novu belešku"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Nova deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Napravi nobu deljenu belešku"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Spi_sak beleški"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Sastavi novi spisak beleški"
 
-#: ../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 "Štampaj beleške"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Sledećih 7 dana"
-
 #: ../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 ""
-"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije 1.h.\n"
+"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije 1."
+"h.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
 #: ../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 ""
-"Mesto i hijerarhija fascikli kalendara u Evoluciji je izmenjena od Evolucije 1.h.\n"
+"Mesto i hijerarhija fascikli kalendara u Evoluciji je izmenjena od Evolucije "
+"1.h.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
 #. 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 "Nije moguć prenos starih podešavanja iz evolution/config.xmldb"
@@ -8719,210 +8952,210 @@ msgstr "Nije moguć prenos zaduženja ’%s‘"
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Če"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Zaduženje"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Pregled: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Prisutni:"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Kontakti: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "No_vi spisak zaduženja"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8930,79 +9163,80 @@ msgstr[0] "%d zaduženje"
 msgstr[1] "%d zaduženja"
 msgstr[2] "%d zaduženja"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Neuspela dopuna zaduženja."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Nije moguće otvaranje liste zaduženja ’%s‘ za pravljenje događaja i sastanaka"
+msgstr ""
+"Nije moguće otvaranje liste zaduženja ’%s‘ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za pravljenje zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Birač izvora zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Napravi novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Novo dodeljeno zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_o zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Dodeli novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Nova lista zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista zaduž_enja"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Sastavi novu listu zaduženja"
 
-#: ../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 ""
-"Ova operacija će trajno obrisati sva zaduženja obeležena kao završena. Ako nastavite, nećete moći da povratite ova zaduženja.\n"
+"Ova operacija će trajno obrisati sva zaduženja obeležena kao završena. Ako "
+"nastavite, nećete moći da povratite ova zaduženja.\n"
 "\n"
 "Zaista obrisati ova zaduženja?"
 
-#: ../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 "Ne pitaj me ponovo."
 
-#: ../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 "Štampaj zaduženja"
 
@@ -9011,59 +9245,57 @@ msgstr "Štampaj zaduženja"
 msgid "% Completed"
 msgstr "% završeno"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "U toku"
 
-#: ../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 "je veće od"
 
-#: ../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 "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../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:1723
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iKalendar datoteke (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Evolucija iKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vKalendar datoteke (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Evolucija vKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolucija kalendar inteligentni uvoznik"
 
@@ -10618,224 +10850,227 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Nije moguće otvoriti automatski sačuvanu datoteku"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Nije moguće vratiti poruku iz uređivača"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Umetni prilog"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "Pri_loži"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Priloži datoteku"
 
-#: ../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 "_Zatvori"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Zatvori trenutnu datoteku"
 
-#: ../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 "Štam_paj..."
 
-#: ../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 "Pre_gled pred štampu"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Sačuvaj trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Sačuvaj trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Sačuvaj _pripremu"
+#: ../composer/e-composer-actions.c:511
+#, fuzzy
+msgid "Save as _Draft"
+msgstr "Sačuvaj kao pripremu"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Sačuvaj kao pripremu"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Pošalji ovu poruku"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Umetni opcije slanja"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Sigurnost"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Šifruj ovu poruku pomoću PGP-a"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Potpiši ovu poruku pomoću PGP ključa"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "V_ažnosti poruke"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Postavi važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "T_raži priznanicu"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Primi izveštaj o dostavi kada je vaša poruka pročitana"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifruj ovu poruku pomoću S/MIME sertifikata za šifrovanje"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpiši ovu poruku S/MIME sertifikatom"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje BCC prikazano"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "Š_alje polje"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Bira da li je polje Šalje prikazano"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "_Pošalji polje"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Bira da li je polje Pošalji prikazano"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Odgo_vor polje"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor prikazano"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Polje za _temu"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Bira da li da prikaže polje za temu"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "_Prima polje"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Bira da li je polje Prima prikazano"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#, fuzzy
+msgid "Save Draft"
+msgstr "Sačuvaj _pripremu"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../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 "Unesite adrese koje će primiti kopiju (cc) poruke"
 
-#: ../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 "Unesite adrese koje će primiti kopiju poruke bez pojavljivanja u listi primalaca poruke"
+#: ../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 ""
+"Unesite adrese koje će primiti kopiju poruke bez pojavljivanja u listi "
+"primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
@@ -10843,31 +11078,31 @@ msgstr "Š_alje:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Odgovor:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Kopija (Cc):"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Nevidljiva kopija (Bcc):"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "S_lanje na:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
@@ -10887,23 +11122,27 @@ msgstr "Izaberite fascikle za slanje poruke."
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:180
-#: ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Prikaži lini_ju priloga"
 
-#: ../composer/e-msg-composer.c:872
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Nije moguće potpisivanje odlazeće poruke: nije postavljen sertifikat za potpisivanje za ovaj nalog"
+#: ../composer/e-msg-composer.c:866
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nije moguće potpisivanje odlazeće poruke: nije postavljen sertifikat za "
+"potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:879
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Nije moguće šifrovanje odlazeće poruke: nije postavljen sertifikat za šifrovanje za ovaj nalog"
+#: ../composer/e-msg-composer.c:873
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nije moguće šifrovanje odlazeće poruke: nije postavljen sertifikat za "
+"šifrovanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1500
-#: ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405
-#: ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10911,29 +11150,37 @@ msgstr[0] "Prilog"
 msgstr[1] "Prilozi"
 msgstr[2] "Priloga"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Sakrij li_niju priloga"
 
-#: ../composer/e-msg-composer.c:1573
-#: ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4055
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-msgstr "<b>(Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno.)<b>"
+#: ../composer/e-msg-composer.c:4093
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+"<b>(Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno.)<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 " Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi neće biti poslati sa njom "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi neće "
+"biti poslati sa njom "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
 #: ../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 "Sigurno želite da odbacite poruku, naslovljenu ’{0}‘, koju sastavljate?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -10950,8 +11197,14 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Zbog &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 "Zatvaranjem ovog prozora za sastavljanje ćete trajno odbaciti poruku, osim ako odlučite da sačuvate poruku u fasciklu Priprema. Ovo će Vam omogućiti da nastavite poruku kasnije."
+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 ""
+"Zatvaranjem ovog prozora za sastavljanje ćete trajno odbaciti poruku, osim ako "
+"odlučite da sačuvate poruku u fasciklu Priprema. Ovo će Vam omogućiti da "
+"nastavite poruku kasnije."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -10991,12 +11244,21 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Greška u čuvanju samočuvajuće datoteke zbog &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 "Evolucija je neočekivano završila tokom pisanja nove poruke. Spašavanje poruke će Vam omogućiti da nastavite gde ste stali."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolucija je neočekivano završila tokom pisanja nove poruke. Spašavanje poruke "
+"će Vam omogućiti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
-msgstr "Opcije slanja su dostupne samo za Novell Groupwise i Microsoft Exchange naloge."
+#, fuzzy
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
+msgstr ""
+"Opcije slanja su dostupne samo za Novell Groupwise i Microsoft Exchange "
+"naloge."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11007,14 +11269,19 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Datoteka ’{0}‘ nije regularna i ne može biti poslata u poruci."
 
 #: ../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 "Da priložite sadržaj ovog direktorijuma, ili priložite sve datoteke iz njega pojedinačno, ili napravite arhivu direktorijuma i priložite 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 ""
+"Da priložite sadržaj ovog direktorijuma, ili priložite sve datoteke iz njega "
+"pojedinačno, ili napravite arhivu direktorijuma i priložite 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 ""
 "Nije moguće pokretanje kontrole HTML uređivača.\n"
 "\n"
@@ -11063,8 +11330,7 @@ msgstr "Evolucijina pošta i kalendar"
 # bug(slobo): tooltip bi mogao da bude i „Pošaljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Pošaljite elektronsku poštu prijateljima i poslovnim saradnicima"
 
@@ -11080,48 +11346,101 @@ msgstr "karta imenika"
 msgid "calendar information"
 msgstr "podatak kalendara"
 
-#: ../e-util/e-error.c:77
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Upozorenje Evolucije"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Podatak Evolucije"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Upit Evolucije"
 
 # bug(slobo): mogli su dati i bolji original, dobili su isto tako smislen prevod
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Unutrašnja greška, zahtevana je nepoznata greška „%s“"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponenta"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Naziv komponente koji se beleži"
 
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Dnevnici dijagnoze kvara"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Prikaži u statusnoj liniji _greške za"
+
+# bug: plural-forms
+#. 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(e)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Unosi dnevnika:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Nivo zapisivanja u dnevnik"
+
+# note(slobo): možda treba rok
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Vreme"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Poruke"
+
+#: ../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 "Zatvori ovaj prozor"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Greška"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Greške"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Upozorenja i greške"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Dijagnoza kvara"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Poruke o grešci, upozorenju i dijagnozi kvara"
+
 # has "activatable" set.
-#: ../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-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 "Omogućeno"
 
@@ -11138,7 +11457,8 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Sistem za štampanje je izvestio sledeće detalje o greški:"
 
 #: ../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 "Sistem za štampanje nije ponudio nikakve dodatne detalje o greški."
 
 # mail-composer:no-sig-file secondary
@@ -11146,8 +11466,7 @@ msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o greški."
 # mail:no-delete-folder secondary
 # system:no-save-file secondary
 # system:no-load-file secondary
-#: ../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 "Zbog „{1}“."
 
@@ -11171,21 +11490,25 @@ msgstr "Datoteka postoji „{0}“."
 msgid "Overwrite file?"
 msgstr "Prepisati datoteku?"
 
-#: ../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 "_Prepiši"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Nije moguće otvoriti automatski sačuvanu datoteku"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Nije moguće prikazati pomoć Evolucije."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "Važ_no"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "Po_sao"
 
@@ -11193,50 +11516,52 @@ msgstr "Po_sao"
 # Create the default Person task list
 # orange
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "L_ično"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "Za uradi_ti"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "Kasni_je"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "Naziv _oznake:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Uredi oznaku"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Oznaka ne može biti bez naziva."
 
-#: ../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 "Oznaka istoga naziva već postoji na serveru. Promenite ime oznaci."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf greška: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Sve greške se ubuduće prikazuju samo u terminalu."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11244,7 +11569,7 @@ msgstr[0] "pre %d sekunde"
 msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 
-#: ../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"
@@ -11252,7 +11577,7 @@ msgstr[0] "%d sekunda u budućnosti"
 msgstr[1] "%d sekunde u budućnosti"
 msgstr[2] "%d sekundi u budućnosti"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11260,7 +11585,7 @@ msgstr[0] "pre %d minut"
 msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 
-#: ../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"
@@ -11268,7 +11593,7 @@ msgstr[0] "%d minut u budućnosti"
 msgstr[1] "%d minuta u budućnosti"
 msgstr[2] "%d minuta u budućnosti"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11276,7 +11601,7 @@ msgstr[0] "pre %d sat"
 msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 
-#: ../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"
@@ -11284,7 +11609,7 @@ msgstr[0] "%d sat u budućnosti"
 msgstr[1] "%d sata u budućnosti"
 msgstr[2] "%d sati u budućnosti"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11292,7 +11617,7 @@ msgstr[0] "pre %d dan"
 msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 
-#: ../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"
@@ -11300,7 +11625,7 @@ msgstr[0] "%d dan u budućnosti"
 msgstr[1] "%d dana u budućnosti"
 msgstr[2] "%d dana u budućnosti"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11308,7 +11633,7 @@ msgstr[0] "pre %d nedelju"
 msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 
-#: ../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"
@@ -11316,7 +11641,7 @@ msgstr[0] "%d nedelja u budućnosti"
 msgstr[1] "%d nedelje u budućnosti"
 msgstr[2] "%d nedelja u budućnosti"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11324,7 +11649,7 @@ msgstr[0] "pre %d mesec"
 msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 
-#: ../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"
@@ -11332,7 +11657,7 @@ msgstr[0] "%d mesec u budućnosti"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11340,7 +11665,7 @@ msgstr[0] "pre %d godinu"
 msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 
-#: ../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"
@@ -11348,22 +11673,21 @@ msgstr[0] "%d godina u budućnosti"
 msgstr[1] "%d godine u budućnosti"
 msgstr[2] "%d godina u budućnosti"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../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 "sada"
 
 #. 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 "Izaberite vreme za poređenje"
 
@@ -11376,58 +11700,60 @@ msgstr "Izaberite datoteku"
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Ime p_ravila:"
 
-#: ../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 "Pronađi stavke koje zadovoljavaju sledeće uslove"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "Do_daj kriterijum filtriranja"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Dodaj ra_dnju"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "ako su svi uslovi zadovoljeni"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "ako je bilo koji uslov zadovoljen"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Pronađi predmete:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "U_ključi niti"
 
-#: ../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 "Dolazno"
 
-#: ../filter/filter-rule.c:1044
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Odlazno"
 
@@ -11452,8 +11778,7 @@ msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # mail:no-name-vfolder primary
-#: ../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 "Nedostaje ime."
 
@@ -11531,8 +11856,7 @@ msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: ../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 "sekunde"
 
@@ -11544,11 +11868,11 @@ msgstr "trenutno vreme"
 msgid "the time you specify"
 msgstr "vreme koje odredite"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
 #: ../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
+#: ../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 "nedelje"
 
@@ -11556,15 +11880,15 @@ msgstr "nedelje"
 msgid "years"
 msgstr "godine"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -11573,7 +11897,8 @@ msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Podesite poštu, uključujući sigurnost i prikaz poruke, ovde"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11617,12 +11942,9 @@ msgid "Evolution Network configuration control"
 msgstr "Kontrola mrežnih podešavanja Evolucije"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597
-#: ../mail/mail-component.c:598
+#: ../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"
@@ -11634,7 +11956,7 @@ msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
 #: ../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 "Postavke pošte"
 
@@ -11646,12 +11968,12 @@ msgstr "Postavke mreže"
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ugovor o licenci"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11664,77 +11986,65 @@ msgstr ""
 "za %s\n"
 "i označite kućicu da bi ga prihvatili\n"
 
-#: ../mail/em-account-editor.c:466
-#: ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/em-account-editor.c:590
-#: ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702
-#: ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/em-account-editor.c:1810
-#: ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1859
-#: ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_ta"
 
-#: ../mail/em-account-editor.c:2327
-#: ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/em-account-editor.c:2386
-#: ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Podrazumevano"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452
-#: ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Sigurnost"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489
-#: ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:2490
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Proveram za nove poruke"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/em-account-editor.c:2932
-#: ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolucija naloga"
 
@@ -11751,31 +12061,37 @@ msgstr "Ime naloga"
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../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 imena"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: ../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 "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
@@ -11784,11 +12100,15 @@ msgstr "nepoznati pošiljalac"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} ${TimeZone}, ${Sender} piše:"
+#: ../mail/em-composer-utils.c:2105
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
@@ -11838,11 +12158,9 @@ msgid "Date sent"
 msgstr "Datum slanja"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
-#: ../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
+#: ../plugins/groupwise-features/share-folder.c:768
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
@@ -11891,8 +12209,7 @@ msgstr "Izraz"
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: ../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 "Važno"
 
@@ -11920,8 +12237,7 @@ msgstr "nije podešeno"
 msgid "is set"
 msgstr "podešeno"
 
-#: ../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 "Đubre"
@@ -11930,8 +12246,7 @@ msgstr "Đubre"
 msgid "Junk Test"
 msgstr "Provera đubreta"
 
-#: ../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 "Etiketa"
 
@@ -11971,52 +12286,53 @@ msgstr "Poveži na program"
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#. 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 "Čitaj"
 
-#: ../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 "Primaoci"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex odgovara"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Odgovoreno"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "povratno"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "povratno veće od"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "povratno manje od"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Pokreni 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 "Rezultat"
 
-#: ../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 "Pošiljalac"
 
+# bug(slobo): verovatno izveštaj o dostavi
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "Pošalji priznanicu"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Postavi oznaku"
@@ -12049,14 +12365,11 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../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 "Naslov"
 
@@ -12073,51 +12386,51 @@ msgstr "Potom"
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Skorašnje poruke"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
@@ -12153,17 +12466,15 @@ msgid "Quota usage"
 msgstr "Iskorišćenost kvote"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358
-#: ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
@@ -12180,37 +12491,35 @@ msgstr "Na_pravi"
 msgid "Folder _name:"
 msgstr "_Ime fascikle:"
 
-#. load store to mail component at the end, when everything is loaded
-#: ../mail/em-folder-tree-model.c:204
-#: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970
-#: ../mail/mail-vfolder.c:1027
+#. load store to mail component
+#: ../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 "Fascikle pretrage"
 
 #. 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 "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:504
-#: ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Priprema"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Šabloni"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: ../mail/em-folder-tree-model.c:512
-#: ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../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 "Učitavanje..."
 
@@ -12249,14 +12558,12 @@ msgstr "Premeštanje fascikle %s"
 msgid "Copying folder %s"
 msgstr "Umnožavanje fascikle %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 "Premeštanje poruka u fasciklu %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 "Umnožavanje poruka u fasciklu %s"
@@ -12265,157 +12572,145 @@ msgstr "Umnožavanje poruka u fasciklu %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nije moguće ubaciti poruku(e) u ostavu na najvišem nivou"
 
-#: ../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 "_Umnoži u fasciklu"
 
-#: ../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 "_Premesti u fasciklu"
 
-#: ../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 "Pretraga fascikli u „%s“"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Premesti..."
 
-#: ../mail/em-folder-tree.c:2114
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Preimenuj..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni Za slanje"
 
-#: ../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 "Isprazni _smeće"
 
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Napravi Fasciklu _pretrage"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Umnožavanje ’%s‘ u ’%s‘"
 
-#: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../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 "_Umnoži"
 
-#: ../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 "Pravljenje fascikle ’%s‘"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../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 "Neuspešno brisanje pošte"
 
-#: ../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 "Nemate dovoljna ovlašćenja da obrišete ovu poštu."
 
-#: ../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 "_Odgovori pošiljaocu"
 
-#: ../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 "Prosl_edi"
 
 #. 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 "_Uredi kao novu poruku..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "_Označi kao nevažno"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "Nat_pis"
 
@@ -12426,266 +12721,286 @@ msgstr "Nat_pis"
 # is not permitted.
 #. 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 "Ništ_a"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
 #. 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 "Fascikla pretrage na _temu"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Fascikla pretrage na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Fascikla pretrage na _primaoce"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Fascikla pretrage na dopisnu _listu"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Filter na te_mu"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Filter na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Filter na p_rimaoce"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Filter na _dopisnu listu"
 
 #. 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 "Podrazumevano"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Nije moguće dobiti poruku"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Dovlačenje poruke..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "P_oziv za..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Napravi Fasciklu _pretrage"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_na ovu adresu"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Pritisni da sakriješ/otkirješ adresu"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "_Podudaraj veliko/malo slovo"
 
-#: ../mail/em-format-html-display.c:947
-#: ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../mail/em-format-html-display.c:947
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka autentična."
 
-#: ../mail/em-format-html-display.c:948
-#: ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../mail/em-format-html-display.c:948
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo verovatno autentičan."
+#: ../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 ""
+"Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
+"verovatno autentičan."
 
-#: ../mail/em-format-html-display.c:949
-#: ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../mail/em-format-html-display.c:949
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
+#: ../mail/em-format-html-display.c:953
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../mail/em-format-html-display.c:950
-#: ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali nije moguća provera pošiljaoca"
 
-#: ../mail/em-format-html-display.c:950
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može biti proveren."
+#: ../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 ""
+"Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
+"biti proveren."
 
-#: ../mail/em-format-html-display.c:951
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Potpis postoji, ali traži javni ključ"
 
-#: ../mail/em-format-html-display.c:951
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:955
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "Ova poruka je potpisana, ali nema odgovarajućeg javnog ključa."
 
-#: ../mail/em-format-html-display.c:958
-#: ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../mail/em-format-html-display.c:958
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti u prenosu preko Interneta."
+#: ../mail/em-format-html-display.c:962
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Ova poruka nije šifrovana.  Njen sadržaj je moguće videti u prenosu preko "
+"Interneta."
 
-#: ../mail/em-format-html-display.c:959
-#: ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../mail/em-format-html-display.c:959
-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 "Ova poruka je šifrovana, ali slabim algoritmom.  Teško je, ali ne i nemoguće da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
+#: ../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 ""
+"Ova poruka je šifrovana, ali slabim algoritmom.  Teško je, ali ne i nemoguće "
+"da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:960
-#: ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../mail/em-format-html-display.c:960
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
+#: ../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 ""
+"Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:961
-#: ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../mail/em-format-html-display.c:961
-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 "Ova poruka je šifrovana — i to jakim algoritmom.  Veoma je teško da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
+#: ../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 ""
+"Ova poruka je šifrovana — i to jakim algoritmom.  Veoma je teško da neko sa "
+"strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:1062
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Pre_gledaj sertifikat"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat nije čitljiv"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno u %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Prilagodi na širinu"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Prikaži _originalnu veličinu"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Sačuvaj prilog kao"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Izaberite fasciklu za čuvanje svih priloga"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "Izabrano čuvanje..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12693,43 +13008,44 @@ msgstr[0] "%d pri_log"
 msgstr[1] "%d pri_loga"
 msgstr[2] "%d pri_loga"
 
-#: ../mail/em-format-html-display.c:2112
-#: ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_Sačuvaj"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Nema priloga"
 
-#: ../mail/em-format-html-display.c:2338
-#: ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "O_tvori pomoću"
 
-#: ../mail/em-format-html-display.c:2473
-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 "Evolucija ne može da iscrta ovo pismo pošto je preveliko. Možete ga pogledati neformatirano ili pomoću drugog uređivača teksta."
+#: ../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 ""
+"Evolucija ne može da iscrta ovo pismo pošto je preveliko. Možete ga "
+"pogledati neformatirano ili pomoću drugog uređivača teksta."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. strana od %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 "Dovlačenje ’%s‘"
@@ -12775,28 +13091,21 @@ msgstr "Oblikovanje poruke"
 msgid "Formatting Message..."
 msgstr "Oblikovanje poruke..."
 
-#: ../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 "Kopija (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 "Nevidljiva kopija (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744
-#: ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Pošiljalac"
 
@@ -12813,147 +13122,141 @@ 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 "Poruku šalje <b>%s</b> u ime <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 "Šalje"
 
-#: ../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 "Odgovor"
 
-#: ../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 "Datum"
 
-#: ../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 "Grupe za vesti"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Lice"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
 
-#: ../mail/em-format.c:1336
-#: ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguća obrada MIME poruke. Prikazivanje izvora."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Nije moguća obrada PGP/MIME poruke"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nije moguća obrada PGP/MIME poruke: nepoznata greška"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1581
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Nije moguća obrada PGP poruke."
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nije moguća obrada PGP/MIME poruke: nepoznata greška"
 
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "svaki put"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "jednom nedeljno"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "jednom mesečno"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Dodaje prilagođeno zaglavlje za neželjenu poštu"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Naziv fascikle:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Vrednost zaglavlja sadrži:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Etiketa"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078
-#: ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086
-#: ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Nema dostupnog dodatka za đubre"
 
@@ -12984,11 +13287,13 @@ msgstr "Nije moguća pretraga za postojećim poštanskim sandučićima u ’%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 ""
-"Mesto i hijerarhija fascikli pošte u Evoluciji je izmenjena od Evolucije 1.h.\n"
+"Mesto i hijerarhija fascikli pošte u Evoluciji je izmenjena od Evolucije 1."
+"h.\n"
 "\n"
 "Molim budite strpljivi dok Evolucija prenosi fascikle..."
 
@@ -13000,100 +13305,104 @@ msgstr "Nije moguće otvaranje starog POP čuvaj-na-serveru podatka ’%s‘: %s
 #: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Nije moguće pravljenje POP3 čuvaj-na-serveru direktorijuma podataka ’%s‘: %s"
+msgstr ""
+"Nije moguće pravljenje POP3 čuvaj-na-serveru direktorijuma podataka ’%s‘: %s"
 
 #: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nije moguće umnožavanje POP3 čuvaj-na-serveru podatka ’%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 "Nije uspelo pravljenje lokalne ostave pošte ’%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 ""
-"Format pregleda fascikli pošte prebačen je na sqlite počev od Evolucije 2.24.\n"
+"Format pregleda fascikli pošte prebačen je na sqlite počev od Evolucije "
+"2.24.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nije moguće pravljenje lokalnih fascikli pošte u ’%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 "Nije moguće čitanje podešavanja prethodne instalacije Evolucije, ’evolution/config.xmldb‘ ne postoji ili je oštećen."
+#: ../mail/em-migrate.c:3053
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Nije moguće čitanje podešavanja prethodne instalacije Evolucije, ’evolution/"
+"config.xmldb‘ ne postoji ili je oštećen."
 
-#: ../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 "_Odgovori pošiljaocu"
 
-#: ../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 "Odgovori na _listu"
 
 #. 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 u _imenik"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ova ostava ne podržava prijave, ili nisu omogućene."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Prijavljeno"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Fascikla"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Izaberite server."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
 #. 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 "_Ne prikazuj ponovo ovu poruku."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Propusni_ci poruka"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "poruka"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -13119,17 +13428,13 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Širina prozora „Slanje i primanje pošte“"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Dozvoli evoluciji da prikaže tekstualni deo ograničene veličine"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Uvek traži priznanicu"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj liniji."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatsko prepoznavanje emotikona"
@@ -13167,20 +13472,32 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-msgstr "Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA na broj naznačen u address_count-u."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA na broj naznačen u "
+"address_count-u."
 
 #: ../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 "Kontroliše učestalost usklađivanja lokalnih izmena sa mrežnim serverom pošte. Interval mora biti najmanje 30 sekundi."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Kontroliše učestalost usklađivanja lokalnih izmena sa mrežnim serverom pošte. "
+"Interval mora biti najmanje 30 sekundi."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte."
 
 #: ../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 "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi spiska su niz formata „headername=value“."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi "
+"spiska su niz formata „naziv_zaglavlja=vrednost“."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13235,28 +13552,51 @@ msgid "Default width of the subscribe dialog."
 msgstr "Podrazumevana širina prozorčeta za prijavu."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "Utvrđuje da li da samo u adresaru pregleda adrese u potrazi za neželjenom poštom"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Utvrđuje da li da samo u adresaru pregleda adrese u potrazi za neželjenom "
+"poštom"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li da pregleda u adresaru adrese pošiljaoca"
 
 #: ../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 "tvrđuje da li da pregleda u adresaru adrese pošiljaoca. Ukoliko je pronađe, ne svrstava je u neželjenu poštu. Traži je u adresarima označenim za samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za samodopunjavanje."
+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 ""
+"tvrđuje da li da pregleda u adresaru adrese pošiljaoca. Ukoliko je pronađe, "
+"ne svrstava je u neželjenu poštu. Traži je u adresarima označenim za "
+"samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za "
+"samodopunjavanje."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene pošte"
+msgstr ""
+"Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
+"pošte"
 
 #: ../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 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
+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 ""
+"Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
+"pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
 
 #: ../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 "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Tema“ u uspravnom pogledu kolone „Poruke“."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Tema“ u uspravnom "
+"pogledu kolone „Poruke“."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13267,8 +13607,8 @@ msgid "Directory for saving mail component files."
 msgstr "Direktorijum za čuvanje datoteka modula za poštu."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Isključuje ili omogućava skraćivanje naziva fascikli u stablu"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Isključuje ili omogućava skraćivanje naziva fascikli u bočnoj površi"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13311,12 +13651,24 @@ msgid "Enable search folders on startup."
 msgstr "Omogućava fascikle pretrage pri pokretanju."
 
 #: ../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 "Uključi mogućnost pretrage u bočnoj oblasti tako da možete pokrenuti interaktivnu pretragu kucajući u polje za tekst. Korist je da možete lako naći fasciklu u toj bočnoj oblasti samo kucajući ime fascikle i izbor skače automatski na tu fasciklu."
+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 ""
+"Uključi mogućnost pretrage u bočnoj oblasti tako da možete pokrenuti "
+"interaktivnu pretragu kucajući u polje za tekst. Korist je da možete lako "
+"naći fasciklu u toj bočnoj oblasti samo kucajući ime fascikle i izbor skače "
+"automatski na tu fasciklu."
 
 #: ../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 "Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i spisak poruka i fascikli."
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
+"spisak poruka i fascikli."
 
 # bug: unclear
 #: ../mail/evolution-mail.schemas.in.h:54
@@ -13327,496 +13679,620 @@ msgstr "Uključite da iscrtavate tekstualni deo poruke ograničene veličine."
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kurzora"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Height of the message-list pane"
-msgstr "Visina površi liste poruka"
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Height of the message-list pane."
-msgstr "Visina površi liste poruka."
+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 "Skriva pregled po fasciklama i uklanja izbor"
+msgid "Height of the message-list pane"
+msgstr "Visina površi liste poruka"
 
 #: ../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 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li zaista želi to da uradi."
+msgid "Height of the message-list pane."
+msgstr "Visina površi liste poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "Ako je „Pregled porkue“ površ uključena, onda pokažite je jednu do druge radije nego uspravno."
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
 #: ../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 "Ukoliko nema ugrađenog pregledača za ovaj mime tip u okviru Evolucije, svi mime tipovi sa ove liste koji su vezani bonobo pregledačem delova u Gnomovoj bazi mime tipova mogu biti korišćeni za prikaz sadržaja."
+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 ""
+"Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li "
+"zaista želi to da uradi."
 
 #: ../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 "Početna visina prozora „Slanje i primanje pošte“. Vrednost se ažurira ukoliko korisnik produži prozor."
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+"Ako je „Pregled poruke“ površ uključena, onda pokažite je jednu do druge "
+"radije nego uspravno."
 
 #: ../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 "Početna veličina uvećanog prozora „Slanje i primanje pošte“. Vrednost se ažurira ukoliko korisnik uveća ili umanji prozor. Napominjemo da Evolucija ne koristi ovu vrednost pošto ovaj prozor ne može biti uvećan. Ova je vrednost samo upotpunjuje postavke."
+#, 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 ""
+"Ukoliko nema ugrađenog pregledača za ovaj mime tip u okviru Evolucije, svi "
+"mime tipovi sa ove liste koji su vezani bonobo pregledačem delova u Gnomovoj "
+"bazi mime tipova mogu biti korišćeni za prikaz sadržaja."
 
 #: ../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 "Početna širina prozora „Slanje i primanje pošte“. Vrednost se ažurira ukoliko korisnik proširi prozor."
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Početna visina prozora „Slanje i primanje pošte“. Vrednost se ažurira ukoliko "
+"korisnik produži prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "To uključuje/isključuje upozorenje kada označavate više poruka."
+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 ""
+"Početna veličina uvećanog prozora „Slanje i primanje pošte“. Vrednost se "
+"ažurira ukoliko korisnik uveća ili umanji prozor. Napominjemo da Evolucija ne "
+"koristi ovu vrednost pošto ovaj prozor ne može biti uvećan. Ova je vrednost "
+"samo upotpunjuje postavke."
 
 #: ../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 "Uknjučuje/onemogućuje svojstvo gde su potrebni višestruki upiti za neophodnost sinhronizacije van mreže."
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Početna širina prozora „Slanje i primanje pošte“. Vrednost se ažurira ukoliko "
+"korisnik proširi prozor."
 
 #: ../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 "Uključuje/isključuje ponavljanje upozorenja da je brisanje poruke iz fascikle pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "To uključuje/isključuje upozorenje kada označavate više poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Last time empty junk was run"
-msgstr "Poslednje vreme pražnjenja đubreta"
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+"Uknjučuje/onemogućuje svojstvo gde su potrebni višestruki upiti za "
+"neophodnost sinhronizacije van mreže."
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Last time empty trash was run"
-msgstr "Poslednje vreme pražnjenja smeća"
+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 ""
+"Uključuje/isključuje ponavljanje upozorenja da je brisanje poruke iz fascikle "
+"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
+msgid "Last time empty junk was run"
+msgstr "Poslednje vreme pražnjenja đubreta"
 
 #: ../mail/evolution-mail.schemas.in.h:71
+msgid "Last time empty trash was run"
+msgstr "Poslednje vreme pražnjenja smeća"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Lista oznaka i njima dodeljenih boja"
 
-#: ../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 mime tipova radi provere za bonobo pregledačima"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Lista prihvaćenih licenci"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Lista naloga"
 
-#: ../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 naloga koje poznaje poštanski deo Evolucije. Lista sadrži nizove koje imenuju poddirektorijume u odnosu na /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 naloga koje poznaje poštanski deo Evolucije. Lista sadrži nizove koje "
+"imenuju poddirektorijume u odnosu na /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 prilagođenih zaglavlja i da li su uključena."
 
-#: ../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 "Spisak oznaka jezika rečnika koji se koriste za proveru pravopisa."
 
-#: ../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 oznaka koje poznaje poštanski deo Evolucije. Lista sadrži nizove oblika ime:boja gde boja koristi HTML hex kodiranje."
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Lista mime tipova radi provere za bonobo pregledačima"
+#: ../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 oznaka koje poznaje poštanski deo Evolucije. Lista sadrži nizove "
+"oblika ime:boja gde boja koristi HTML hex kodiranje."
 
-#: ../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 imena protokola čija je licenca prihvaćena."
 
-#: ../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 "Učitava slike za HTML poruke preko http-a"
 
-#: ../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 "Učitava slike za HTML poruke preko http(s)-a. Moguće su vrednosti: „0“ - nikada ne učitavaj slike sa mreže. „1“ - učitavaj slike ukoliko je pošiljalac u imeniku. „2“ - uvek učitavaj slike sa mreže."
+#: ../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 ""
+"Učitava slike za HTML poruke preko http(s)-a. Moguće su vrednosti: „0“ - "
+"nikada ne učitavaj slike sa mreže. „1“ - učitavaj slike ukoliko je pošiljalac "
+"u imeniku. „2“ - uvek učitavaj slike sa mreže."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Beleži radnje filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava kao viđenu posle navedenog roka"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava kao viđenu posle navedenog roka."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Stil prikaza poruke ( „normalan“, „sva zaglavlja“, „izvor“)"
+msgstr ""
+"Stil prikaza poruke ( „normal“ za normalan prikaz; „full headers“ za prikaz "
+"svih zaglavlja; „source“ za izvorni prikaz)"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../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 "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../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 "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../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 "Broj adresa za prikaz u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Pita kada je naslov prazan"
 
-#: ../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 "Pita korisnika kada pokuša da isprazni fasciklu."
 
-#: ../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 "Pita korisnika kada pokuša da pošalje poruku bez naslova."
 
-#: ../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 "Traži proveru da li korisnik želi odmah da se iskljući sa mreže"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Upozori kod brisanja poruka iz fascikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Pita pri pražnjenju"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (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 "Pita korisnika kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../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 "Pita kada korisnik pokuša da pošalje HTML poruku primaocima koji možda ne žele da primaju HTML poštu."
+#: ../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 ""
+"Pita kada korisnik pokuša da pošalje HTML poruku primaocima koji možda ne "
+"žele da primaju HTML poštu."
 
-#: ../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 "Pita korisnika kada pokuša da pošalje poruku bez primalaca."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pita kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Pita pri označavanju više poruka"
 
-#: ../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 "Prepoznaje emotikone u tekstu i zamenjuje ih slikama."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima đubreta u dolaznoj pošti."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Sačuvaj direktorijum"
 
-#: ../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 "Traži sliku pošiljaoca u lokalnim adresarima"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji poštu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalje poštu kao 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 "Prikazuje kolonu sa e-adresama  u spisku poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Interval sinhronizacije sa serverom"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../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 "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Prikatuje sliku pošiljaoca"
 
-#: ../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 "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../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 "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Provera pravopisa unutar"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Boja za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Podrazumevana širina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Slovni lik terminala"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Ograničenje tekstualnog dela poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../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 "Poslednje vreme pražnjenja đubreta, u danima od početka epohe."
 
-#: ../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 "Vreme pražnjenja smeća, u danima od početka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veličine za prikaz pošte."
 
-#: ../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že imati tri moguće vrednosti. \"0\" for errors. „1“ za upozorenja. „2“ za poruke o dijagnozi kvara."
-
-# bug: s/interms/in terms/ (space)
-#: ../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 "Ovo određuje najveću veličinu tekstualnog dela koji se može iscrtati u Evoluciji. Podrazumeva se 4MB/4096 KB i navedeno je kao broj 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 "Ovo je podrazumevani dodatak kuke za đubre, čak i ako su uključeni višestruki dodaci. Ukoliko je pomenuti podrazumevani dodatak isključen, preostali dostupni dodaci neće biti aktivirani."
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Može imati tri moguće vrednosti. „0“ za greške. „1“ za upozorenja. „2“ za "
+"poruke o dijagnozi kvara."
 
+# bug: s/interms/in terms/ (space)
 #: ../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 "Ovak ključ je pročitan jednom i potom vraćen na „lažno“. Ovo uklanja poštu sa spiska i pregled za tu fasciklu."
+#, 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 ""
+"Ovo određuje najveću veličinu tekstualnog dela koji se može iscrtati u "
+"Evoluciji. Podrazumeva se 4MB/4096 KB i navedeno je kao broj 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 "Ovaj ključ treba da sadrži listu XML struktura za navođenje prilagođenih zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header enabled&gt; - omogućeno za prikazivanje zaglavlja u pregledu pošte."
+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 ""
+"Ovo je podrazumevani dodatak kuke za đubre, čak i ako su uključeni višestruki "
+"dodaci. Ukoliko je pomenuti podrazumevani dodatak isključen, preostali "
+"dostupni dodaci neće biti aktivirani."
 
 #: ../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 "Ova opcija se odnosi na ključ lookup_addressbook i koristi se za određivanje da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta primljena od poznatih pošiljalaca od one neželjene."
+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 ""
+"Ovak ključ je pročitan jednom i potom vraćen na „false“ (netačno). Ovo uklanja "
+"poštu sa spiska i pregled za tu fasciklu."
 
 #: ../mail/evolution-mail.schemas.in.h:146
-msgid "This option would help in improving the speed of fetching."
-msgstr "Ova će opcija pripomoći brzini pribavljanja pošte."
+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 ""
+"Ovaj ključ treba da sadrži listu XML struktura za navođenje prilagođenih "
+"zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header "
+"enabled&gt; - omogućeno za prikazivanje zaglavlja u pregledu pošte."
 
 #: ../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 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, posle čega je „...“ prikazano."
+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 ""
+"Ova opcija se odnosi na ključ lookup_addressbook i koristi se za određivanje "
+"da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
+"primljena od poznatih pošiljalaca od one neželjene."
 
 #: ../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 "Ovo podešavanje određuje da li će nizovi podrazumevano biti rašireni ili skupljeni. Evolucija zahteva ponovno pokretanje."
+msgid "This option would help in improving the speed of fetching."
+msgstr "Ova će opcija pripomoći brzini pribavljanja pošte."
 
 #: ../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 "Ovo podešavanje određuje da li će nizovi biti razvrstani po poslednjoj poruci jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
+"posle čega je „...“ prikazano."
 
 #: ../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 ""
+"Ovo podešavanje određuje da li će nizovi podrazumevano biti rašireni ili "
+"skupljeni. Evolucija zahteva ponovno pokretanje."
+
+#: ../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 ""
+"Ovo podešavanje određuje da li će nizovi biti razvrstani po poslednjoj poruci "
+"jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Razvrstava spisak poruka po raspravama."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Razvrstaj poruke po raspravama"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži poruke prema naslovu rasprave"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Vreme za označavanje poruke kao viđene"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Vreme za označavanje poruke kao viđene."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../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 "Boja za podvlačenje pravopisnih greški prilikom provere pravopisa."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Koristi sopstveni slovni lik"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagođeni font za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Koristite jedan do drugog ili široki raspored"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Slovni lik promenljive veličine"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Opcija Pregled/kopija (Cc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Opcija Pregled/kopija (Cc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Opcija Pregled/šalje je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Opcija Pregled/šalje je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Opcija Pregled/prima je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Opcija Pregled/pošalji je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Opcija Pregled/odgovor je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Opcija Pregled/odgovor je izabrana."
 
-#: ../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 "Da li se povratnica podrazumevano dodaje svakoj poruci."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Da li se isključuje skraćivanje naziva fascikli u stablu."
 
-#: ../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 "Da li pokušati prikaz niza rasprave po naslovu kada poruke ne sadrže zaglavlja „In-Reply-To“ ili „References“."
+#: ../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 ""
+"Da li pokušati prikaz niza rasprave po naslovu kada poruke ne sadrže "
+"zaglavlja „In-Reply-To“ ili „References“."
 
-#: ../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 "Da li se poruke nižu na osnovu poslednje poruke u nizu"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Širina površi liste poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Širina površi liste poruka."
 
@@ -13832,82 +14308,72 @@ msgstr "Evolucija Elm uvoznik"
 msgid "Import mail from Elm."
 msgstr "Važna pošta iz programa Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poštansko sanduče (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Uvoženje poštanskog sandučeta"
 
-#: ../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 "Uvoženje ’%s‘"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretraga %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podataka"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolucija Pine uvoznik"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Uvozi poštu iz programa Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %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 "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: ../mail/mail-component.c:164
-#: ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691
-#: ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Šabloni"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13972,97 +14438,36 @@ msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Nova fascikla za poštu"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Napravi novu fasciklu za poštu"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Neuspela nadogradnja podešavanja pošte ili fascikli."
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "Greška"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "Greške"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "Upozorenja i greške"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "Dijagnoza kvara"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "Poruke o grešci, upozorenju i dijagnozi kvara"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "Dnevnici dijagnoze kvara"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "Prikaži u statusnoj liniji _greške za"
-
-# bug: plural-forms
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "sekund(e)."
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "Unosi dnevnika:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "Nivo zapisivanja u dnevnik"
-
-# note(slobo): možda treba rok
-#: ../mail/mail-component.c:1811
-#: ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Vreme"
-
-#: ../mail/mail-component.c:1821
-#: ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Poruke"
-
-#: ../mail/mail-component.c:1830
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Proveri podržane tipove "
@@ -14341,123 +14746,128 @@ msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smećem na izlazu"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+msgid "Enable Magic S_pacebar"
 msgstr "Uključi Magičnu razmak_nicu"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Uključi fascikle pret_rage"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Utvrđene-pirine:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Font nep_romenjive širine:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Osobine slovnog lika"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Oblikuj poruke u H_TML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "Ime i prezime:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "H_TTP posrednik:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Outlook stil)"
 
-#: ../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 "Oznake"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Mesto poštanskog sandučeta"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
-#: ../mail/mail-config.glade.h:107
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "Napomena: Podvučen znak u nazivu koristi se kao skraćenica u meniju."
 
-#: ../mail/mail-config.glade.h:108
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.glade.h:109
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "Napomena: nećete biti upitani za lozinku dok se ne povežete prvi put"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Opcija se zanemaruje ukoliko je pronađeno poklapanje sa prilagođenim zaglavljem za neželjenu poštu."
+msgstr ""
+"Opcija se zanemaruje ukoliko je pronađeno poklapanje sa prilagođenim "
+"zaglavljem za neželjenu poštu."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _ključa:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "_Lozinka:"
 
-#: ../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."
@@ -14465,127 +14875,147 @@ msgstr ""
 "Unesite dole opisno ime za ovaj nalog.\n"
 "Ovo ime će biti korišćeno samo za potrebe prikaza."
 
-#: ../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 "Unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, pitajte administratora sistema ili prodavca Internet usluga."
-
 #: ../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 "Unesite dole ime i elektronsku adresu. „Neobavezna“ polja dole ne moraju biti popunjena, osim ako ne želite da ove podatke uključite u poruke koje šaljete."
+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 ""
+"Unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
+"pitajte administratora sistema ili prodavca Internet usluga."
 
 #: ../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 ""
+"Unesite dole ime i elektronsku adresu. „Neobavezna“ polja dole ne moraju biti "
+"popunjena, osim ako ne želite da ove podatke uključite u poruke koje šaljete."
+
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Molim izaberite među sledećim mogućnostima"
 
-#: ../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 "Upozori kada šalješ poruke samo sa navedenim Bcc primaocima"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "Domaćin za 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 "Tr_aži fotografiju pošiljaoca samo u lokalnim adresarima"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "Izab_eri..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "_Pošalji priznanice:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "_Standardni slovni lik:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "Odabira fasciklu Priprema"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML slovni lik fiksirane veličine"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Izaberite HTML slovni lik fiksirane veličine za štampu"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML slovni lik promenljive veličine"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Izaberite HTML slovni lik promenljive veličine za štampu"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "Odabira fasciklu Poslato"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži autentifikaciju"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Tip servera: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Tabela potpisa"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru započni _kucanje na dnu"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "T_ip: "
 
-#: ../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 jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
+#: ../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 jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../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"
@@ -14595,7 +15025,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu. "
 
-#: ../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\""
@@ -14603,27 +15033,26 @@ msgstr ""
 "Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: „Poslovni“ ili „Lični“"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Korisničko_ime:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Koristi aute_ntifikaciju"
 
-#: ../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 "Korisničko_ime:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "Pro_menljiva veličina:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14633,124 +15062,124 @@ msgstr ""
 "\n"
 "Kliknite „Napred“ za početak. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Automatsko podešavanje posrednika:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "_Podrazumevani dodatak za đubre:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "_Direktna veza sa Internetom"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Zadrži potpis iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Učitaj slike od kontakata u poruku"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "_Ručno podešavanje posrednika:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../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 "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "_Bezbedan HTTP posrednik:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "Izab_eri..."
 
 #. 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 "Prikaži _animacije"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Sažmite PRIMA/KOPIJA/NEVIDLJIVA KOPIJA zaglavlja u "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "_Koristi sistemske postavke"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste slovne likove kao drugi programi"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "opis"
 
@@ -14799,8 +15228,7 @@ msgstr "Pro_nađi:"
 msgid "Find in Message"
 msgstr "Pronađi u poruci"
 
-#: ../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 "Označi za praćenje"
 
@@ -14852,27 +15280,26 @@ msgstr "_Oznaka:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Uzimanje pošte"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlazećih filtera: %s"
 
-#: ../mail/mail-ops.c:572
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14881,113 +15308,110 @@ msgstr ""
 "Neuspelo dopunjavanje u %s: %s\n"
 "Dopunjavanje u lokalnu fasciklu ’Poslato‘."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neuspelo dopunjavanje u lokalnu fasciklu ’Poslato‘: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Slanje poruke %d od %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neuspelo slanje %d od %d poruka"
 
-#: ../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 "Otkazano."
 
-#: ../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 "Završeno."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Čuvanje poruke u fasciklu"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštanje poruka u %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Umnožavanje poruka u %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaranje fascikle %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Dobijam podatke o kvoti za fasciklu %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaranje ostave %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjanje fascikle %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštanje fascikle ’%s‘"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Pražnjenje i smeštanje naloga ’%s‘"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštanje naloga ’%s‘"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Osvežavanje fascikle"
 
-#: ../mail/mail-ops.c:1659
-#: ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Pražnjenje fascikle"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacivanje smeća u ’%s‘"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Dovlačenje poruke %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14995,7 +15419,7 @@ msgstr[0] "Dovlačenje %d poruke"
 msgstr[1] "Dovlačenje %d poruke"
 msgstr[2] "Dovlačenje %d poruka"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15003,7 +15427,7 @@ msgstr[0] "Čuvanje %d poruke"
 msgstr[1] "Čuvanje %d poruke"
 msgstr[2] "Čuvanje %d poruka"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15012,12 +15436,11 @@ msgstr ""
 "Greška pri čuvanju poruke u: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Čuvanje priloga"
 
-#: ../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"
@@ -15026,27 +15449,27 @@ msgstr ""
 "Nije moguće pravljenje izlazne datoteke: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nije moguć upis podataka: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidanje veze sa %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovno povezivanje na %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Priprema nalog ’%s‘ za rad van mreže"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Provera usluge"
 
@@ -15062,40 +15485,39 @@ msgstr "Slanje i primanje pošte"
 msgid "Cancel _All"
 msgstr "Obustavi _sve"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Osvežavanje..."
 
-#: ../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 "Čekanje..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Provera za nove poruke"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Korisnik je obustavio operaciju."
 
@@ -15140,21 +15562,21 @@ msgstr "Neispravna fascikla ’%s‘"
 msgid "Setting up Search Folder: %s"
 msgstr "Podešavanje fascikle pretrage: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Osvežavanje fascikla pretrage za ’%s: %s‘"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Osvežavanje fascikla pretrage za ’%s‘"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
@@ -15171,24 +15593,34 @@ msgstr "Fascikla imena „{1}“ već postoji. Dodelite drugi naziv."
 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 ""
 "Fascikla sa sadržajem na „{1}“ već postoji.\n"
 "\n"
-"Možete ili da ignorišete ovu fasciklu, prepišete je ili dopunite njen sadržaj, ili izađete."
+"Možete ili da ignorišete ovu fasciklu, prepišete je ili dopunite njen "
+"sadržaj, ili izađete."
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "Priznanica je zatražena za „{1}“. Poslati priznanicu za {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../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 "Potpis nazvan „{0}“ već postoji. Navedite drugo ime."
 
 #: ../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 "Dodavanjem smislenog naslova vašim porukama daćete primaocima do znanja o čemu pišete."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Dodavanjem smislenog naslova vašim porukama daćete primaocima do znanja o čemu "
+"pišete."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15199,7 +15631,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
 #: ../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 "Sigurno želite da isključite ovaj nalog i obrišete sve posrednike?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15207,11 +15640,16 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Sigurno želite da otvorite {0} poruka odjednom?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "Želite li trajno da uklonite sve obrisane poruke iz fascikle „{0}“?"
 
 #: ../mail/mail.error.xml.h:15
@@ -15292,8 +15730,12 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Nije moguće otvoriti cilj „{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 "Nije moguće pročitati datoteku licence „{0}“, zbog problema sa instalacijom. Nećete moći da koristite ovog pružaoca dok ne prihvatite licencu."
+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 ""
+"Nije moguće pročitati datoteku licence „{0}“, zbog problema sa instalacijom. "
+"Nećete moći da koristite ovog pružaoca dok ne prihvatite licencu."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:35
@@ -15328,8 +15770,12 @@ msgid "Check Junk Failed"
 msgstr "Provera neželjene pošte nije uspela"
 
 #: ../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 "Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u većini lozinki veličina slova bitna; možda su uključena velika slova."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u većini "
+"lozinki veličina slova bitna; možda su uključena velika slova."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15368,8 +15814,12 @@ msgid "Do not disable"
 msgstr "Nemoj isključiti"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "Želite li lokalno da uskladite fascikle koje su označene za korišćenje van mreže?"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Želite li lokalno da uskladite fascikle koje su označene za korišćenje van "
+"mreže?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15409,8 +15859,12 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ukoliko nastavite, nećete moći da vratite ove poruke."
 
 #: ../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 "Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli će biti trajno obrisani."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli će biti "
+"trajno obrisani."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15429,8 +15883,12 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci naloga biće trajno obrisani."
 
 #: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Ukoliko izađete, ove poruke neće biti poslate dok ponovo ne pokrenete Evoluciju."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Ukoliko izađete, ove poruke neće biti poslate dok ponovo ne pokrenete "
+"Evoluciju."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15445,8 +15903,15 @@ msgid "Mail filters automatically updated."
 msgstr "Filteri pošte su automatski osveženi."
 
 #: ../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 "Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+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 ""
+"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15473,12 +15938,17 @@ msgid "Please enable the account or send using another account."
 msgstr "Molim odobrite nalog ili pošaljite korišćenjem nekog drugog."
 
 #: ../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 "Unesite važeću elektronsku adresu u polje Prima:. Možete pretražiti elektronske adrese klikom na dugme Prima: pored polja za unos."
+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 ""
+"Unesite važeću elektronsku adresu u polje Prima:. Možete pretražiti "
+"elektronske adrese klikom na dugme Prima: pored polja za unos."
 
 #: ../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 ""
 "Proverite da li sledeći primaoci žele i mogu da prime HTML poštu:\n"
@@ -15544,18 +16014,27 @@ msgstr "Uskladiti fascikle lokalno za rad van mreže."
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
 #: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu preimenovati, premestiti ili obrisati."
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu "
+"preimenovati, premestiti ili obrisati."
 
 #: ../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 ""
 "Lista kontakata kojoj šaljete je podešena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -15598,32 +16077,46 @@ msgstr ""
 "idite u uređivač fascikle pretrage i dodajte je izričito, ako želite."
 
 #: ../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 "Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
 
 #: ../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 "Ova poruka se ne može poslati pošto niste naveli nijednog primaoca"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "Ovaj server ne podržava traženi tip autentifikacije i možda uopšte ne podržava autentifikaciju."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Ovaj server ne podržava traženi tip autentifikacije i možda uopšte ne "
+"podržava autentifikaciju."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "Ovo označava sve poruke kao pročitane u izabranoj fascikli i podfasciklama."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Ovo označava sve poruke kao pročitane u izabranoj fascikli i podfasciklama."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Neuspelo povezivanje na GroupWise server."
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "Nije moguće otvaranje fascikle za pripremu za ovaj nalog.  Koristiti sistemsku fasciklu za pripremu?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nije moguće otvaranje fascikle za pripremu za ovaj nalog.  Koristiti "
+"sistemsku fasciklu za pripremu?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15639,10 +16132,12 @@ msgstr "Koristiti podrazumevanu fasciklu za pripremu?"
 
 #: ../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 ""
-"Upozorenje: brisanje poruka iz fascikle pertrage će obrisati samu poruku sa njene lokacije u fascikli.\n"
+"Upozorenje: brisanje poruka iz fascikle pertrage će obrisati samu poruku sa "
+"njene lokacije u fascikli.\n"
 "Želite li ovo da uradite?"
 
 #: ../mail/mail.error.xml.h:127
@@ -15668,10 +16163,12 @@ msgstr "Morate navesti fasciklu."
 #: ../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 ""
 "Morate navesti bar jednu fasciklu kao izvor.\n"
-"Bilo pojedinačnim izborom fascikli, i/ili izborom svih lokalnih fascikli, svih mrežnih fascikli ili i jednih i drugih."
+"Bilo pojedinačnim izborom fascikli, i/ili izborom svih lokalnih fascikli, "
+"svih mrežnih fascikli ili i jednih i drugih."
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -15697,90 +16194,87 @@ msgstr "Iz_baci"
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../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:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: ../mail/message-list.c:1612
-#: ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %l:%M %p"
 
-#: ../mail/message-list.c:1624
-#: ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632
-#: ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1634
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%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 "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4224
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "Nema poruke sa zadatim uslovim pretrage. Možete očistiti pretragu iz menija Pretraga->Očisti ili je izmeniti."
+#: ../mail/message-list.c:4288
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Nema poruke sa zadatim uslovim pretrage. Možete očistiti pretragu iz menija "
+"Pretraga->Očisti ili je izmeniti."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -15813,42 +16307,44 @@ msgstr "_Pošalji poruke"
 msgid "Size"
 msgstr "Veličina"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Polje za _temu"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Poziv"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Ne prosleđuj"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: ../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 "Prosledi"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../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 "Odgovori"
 
-#: ../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 "Odgovori svima"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Pročitati"
 
@@ -15889,15 +16385,23 @@ msgid "Provides core functionality for local address books."
 msgstr "Obezbeđuje osnovnu funkcionalnost za lokalne imenike."
 
 #: ../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 "Spisak predmeta za kojima će dodatak za podsećanje uključivanja priloga tragati u telu poruke"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Spisak predmeta za kojima će dodatak za podsećanje uključivanja priloga tragati "
+"u telu poruke"
 
 #: ../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 "Spisak predmeta za kojima će priključak za podsećanje uključivanja priloga tragati u telu poruke"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+"Spisak predmeta za kojima će priključak za podsećanje uključivanja priloga "
+"tragati u telu poruke"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Ključne reči"
 
@@ -15907,12 +16411,20 @@ msgid "Attachment Reminder"
 msgstr "Podsetnik na priloge"
 
 #: ../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 "Traga za predmetima u kojima se može nalaziti prilog u poruci i upozorava ukoliko priloga nema"
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+"Traga za predmetima u kojima se može nalaziti prilog u poruci i upozorava "
+"ukoliko priloga nema"
 
 #: ../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 "Evolucija je pronašla neke ključne reči koje navode da bi poruka trebalo da sadrži prilog, ali isti ne može da pronađe."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Evolucija je pronašla neke ključne reči koje navode da bi poruka trebalo da "
+"sadrži prilog, ali isti ne može da pronađe."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
@@ -15923,154 +16435,163 @@ msgid "_Edit Message"
 msgstr "_Uredi poruku"
 
 #: ../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 "Dodatak za oblikovanje koji prikazuje zvučne priloge unutar poruke i dozvoljava njihovo puštanje direktno iz evolucije."
+#, fuzzy
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from Evolution."
+msgstr ""
+"Dodatak za oblikovanje koji prikazuje zvučne priloge unutar poruke i "
+"dozvoljava njihovo puštanje direktno iz evolucije."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "Dodatak za zvuk unutar poruke"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite ime za rezervnu kopiju Evolucije"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izaberite ime rezervne kopije Evolucije za povraćaj"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Vraća iz rezervne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 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 ""
-"Evoluciju možete povratiti iz rezervne kopije. Možete povratiti poštu, kalendare, zaduženja, beleške, kontakte.\n"
+"Evoluciju možete povratiti iz rezervne kopije. Možete povratiti poštu, "
+"kalendare, zaduženja, beleške, kontakte.\n"
 "Takođe se  mogu povratiti sva lična podešavanja, filteri za poštu, itd."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "_Povrati Evoluciju iz datoteke rezervne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Izaberite arhivu Evolucije za povraćaj:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Izaberite datoteku za povraćaj"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Proverava rezervnu kopiju Evolucije"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Sa grafičkom okruženjem"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Gašenje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Izrađuje rezervnu kopiju naloga i podešavanja Evolucije"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zaduženja, beleške)"
+msgstr ""
+"Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zaduženja, "
+"beleške)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Izrada rezervne kopije završena"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Izrađuje rezervnu kopiju trenutnih podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Otpakivanje datoteka iz rezervne kopije"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Učitava podešavanja Evolucije"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Osiguranje lokalnih izvora"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Smešta rezervnu kopiju u fasciklu %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Vrši povraćaj iz fascikle %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Rezervna kopija Evolucije"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Povraćaj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Izrađuje rezervnu kopiju podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Sačekajte dok Evolucija pravi rezervnu kopiju podataka."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Povraćaj podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Sačekajte dok Evolucija vraća podatke u prvobitno stanje."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ovo može potrajati, u zavisnosti od količine podataka na nalogu."
 
@@ -16088,12 +16609,22 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Sigurno želite da zatvorite Evoluciju?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "Sigurno želite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Sigurno želite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
 
 #: ../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 "Izrada rezervne kopije može biti pokrenuta samo kada Evolucija ne radi. Pre nego što nastavite, proverite da li ste sačuvali i zatvorili sve prozore u kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon završetka procedure, označite ovu opciju."
+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 ""
+"Izrada rezervne kopije može biti pokrenuta samo kada Evolucija ne radi. Pre "
+"nego što nastavite, proverite da li ste sačuvali i zatvorili sve prozore u "
+"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
+"završetka procedure, označite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16112,8 +16643,18 @@ msgid "The selected folder is not writable."
 msgstr "U izabranu fasciklu se ne može pisati."
 
 #: ../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 "Ovo će obrisati sve trenutne podatke i podešavanja Evolucije i povratiti ih iz rezervne kopije. Ova procedura se može pokrenuti samo kada Evolucija ne radi. Pre nego što nastavite, proverite da li ste zatvorili sve prozore u kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon završetka procedure, označite ovu opciju."
+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 ""
+"Ovo će obrisati sve trenutne podatke i podešavanja Evolucije i povratiti ih "
+"iz rezervne kopije. Ova procedura se može pokrenuti samo kada Evolucija ne "
+"radi. Pre nego što nastavite, proverite da li ste zatvorili sve prozore u "
+"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
+"završetka procedure, označite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16127,69 +16668,73 @@ msgstr "Op_oravlja podešavanja..."
 msgid "_Backup Settings..."
 msgstr "_Izrađuje rezervu podešavanja..."
 
-#: ../plugins/bbdb/bbdb.c:543
-#: ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Automatski napravi unose u adresar pri odgovaranju na poruke"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi imenik za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Brze poruke"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Usklađuje podatke o kontaktima i slikama sa listom drugara u Pidžinu"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za Pidgin listu prijatelja"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
 #: ../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 "Automatski popunjava adresar imenima i adresama e-pošte kada odgovarate na poruke. Takođe popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
+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 ""
+"Automatski popunjava adresar imenima i adresama e-pošte kada odgovarate na "
+"poruke. Takođe popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
 
 #: ../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:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Došlo je do greške u pripremi %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Zavisan proces Bogofiltera ne reaguje, gasim..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Čekanje na zavisan proces Bogofiltera ometeno, prekidam..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Cev ka Bogofilteru je pukla, oznaka greške: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
@@ -16198,8 +16743,12 @@ msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke pošte u Unikod"
 
 #: ../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 "Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta čiji su uzrok različiti kodni rasporedi."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta "
+"čiji su uzrok različiti kodni rasporedi."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
@@ -16213,22 +16762,31 @@ msgstr "Priključak za neželjenu poštu Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtrira neželjenu poštu korišćenjem Bogofiltera."
 
-#: ../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 "_Adresa :"
 
-#: ../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 "Koristi šifrovanu vezu"
 
+#. 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_sveži:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV izvori kalendara"
@@ -16245,13 +16803,6 @@ msgstr "Lokalni kalendari"
 msgid "Provides core functionality for local calendars."
 msgstr "Daje osnovnu upotrebu lokalnim kalendarima."
 
-#: ../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_sveži:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Koristi sigurnu vezu"
@@ -16268,48 +16819,55 @@ msgstr "HTTP Kalendari"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Daje osnovnu upotrebu http kalendarima i onim na vebu."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblačno"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Vreme: mestimično oblačno"
+msgid "Weather: Cloudy"
+msgstr "Vreme: oblačno"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Vreme: kiša"
+msgid "Weather: Cloudy Night"
+msgstr "Vreme: oblačna noć"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "Vreme: tmurno"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Vreme: kiša"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Vreme: sunčano"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Vreme: vedra noć"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Izaberite mesto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Jedinice:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrične (Celzijus, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperijalne (Farenhajt, inči, itd.)"
 
@@ -16322,8 +16880,12 @@ msgid "Weather Calendars"
 msgstr "Kalendari vremena"
 
 #: ../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 "Probni dodatak koji pokazuje iskačući meni za umnožavanje stvari u listu isečaka."
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+"Probni dodatak koji pokazuje iskačući meni za umnožavanje stvari u listu "
+"isečaka."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16334,12 +16896,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Proveri da li je Evolucija podrazumevani program za poštu"
 
 #: ../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 "Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program za poštu."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program "
+"za poštu."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Pri pokretanju proverava da li je Evolucija podrazumevani klijent za poštu."
+msgstr ""
+"Pri pokretanju proverava da li je Evolucija podrazumevani klijent za poštu."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16350,7 +16916,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Želite li da Evoluciju učinite podrazumevanim klijentom e-pošte?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolucija"
 
@@ -16375,19 +16941,23 @@ msgid "Default Sources"
 msgstr "Podrazumevani izvori"
 
 #: ../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."
-msgstr "Obezbeđuje funkcionalnost za obeležavanje nekog kalendara ili imenika kao podrazumevanog."
+msgid ""
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr ""
+"Obezbeđuje funkcionalnost za obeležavanje nekog kalendara ili imenika kao "
+"podrazumevanog."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -16418,8 +16988,20 @@ msgid "List of Custom Headers"
 msgstr "Spisak prilagođenih zaglavlja"
 
 #: ../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 \";\""
-msgstr "Ključ navodi spisak prilagođenih zaglavlja koje možete dodati odlaznoj poruci. Format za navođenje zaglavlja i njegove vrednosti je: naziv prilagođenog zaglavlja, zatim „=“ i vrednosti odvojene sa „;“"
+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 ""
+"Ključ navodi spisak prilagođenih zaglavlja koje možete dodati odlaznoj poruci. "
+"Format za navođenje zaglavlja i njegove vrednosti je: naziv prilagođenog "
+"zaglavlja, zatim „=“ i vrednosti odvojene sa „;“"
+
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16438,28 +17020,36 @@ msgid "_User:"
 msgstr "_Korisnik:"
 
 #. 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 "Sigurna lozinka"
 
 #. 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 "Ova opcija će povezati na Exchange server korišćenjem prijave sigurnom lozinkom (NTLM)."
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+"Ova opcija će povezati na Exchange server korišćenjem prijave sigurnom "
+"lozinkom (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Tekstualna lozinka"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "Ova opcija će povezati na Exchange server korišćenjem prijave tekstualnom lozinkom."
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"Ova opcija će povezati na Exchange server korišćenjem prijave tekstualnom "
+"lozinkom."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Van kancelarije"
 
-#: ../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."
@@ -16467,88 +17057,93 @@ msgstr ""
 "Dole izabrana poruka će biti automatski poslata svakoj osobi \n"
 "koja Vam pošalje poštu dok ste van kancelarije."
 
-#: ../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 "Nisam u kancelariji"
 
-#: ../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 "U kancelariji sam"
 
 #. 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 "Unesite lozinku za nalog 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 "Izmenite lozinku"
 
 #. 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 "Upravljajte podešavanjima delegata za nalog Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Pomoćnik za delegiranje"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Razno"
 
 #. 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 "Pregledaj veličine svih Exchange fascikli"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Veličina fascikli"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange podešavanja"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA adresa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "A_utentifikuj"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+msgid "S_pecify the mailbox name"
+msgstr "Odredi ime _datoteke:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Sanduče:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "Tip _autentifikacije"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "_Proveri podržane tipove"
 
-#: ../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."
@@ -16560,8 +17155,12 @@ msgstr ""
 #. * 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"
-msgstr "Trenutna lozinka ne odgovara postojećoj lozinki za ovaj nalog. Unesite ispravnu lozinku"
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+"Trenutna lozinka ne odgovara postojećoj lozinki za ovaj nalog. Unesite "
+"ispravnu lozinku"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -16589,34 +17188,34 @@ msgstr "Trenutna lozinka je istekla. Izmenite lozinku sada."
 msgid "Your password will expire in the next %d days"
 msgstr "Broj dana nakon kojih Vaša lozinka ističe: %d"
 
-#: ../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 "Prilagođeno"
 
-#: ../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 "Uređivač (čita, pravi, uređuje)"
 
-#: ../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 (čita, pravi)"
 
-#: ../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 (samo čita)"
 
-#: ../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 "Delegiraj ovlašćenja"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../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"
@@ -16625,31 +17224,35 @@ msgstr "Ovlašćenja za %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 "Ovu poruku je Evolucija automatski poslala da bi Vas obavestila da ste određeni za delegata. Sada možete slati poruke u moje ime."
+#: ../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 ""
+"Ovu poruku je Evolucija automatski poslala da bi Vas obavestila da ste "
+"određeni za delegata. Sada možete slati poruke u moje ime."
 
 #. 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 "Dodeljena su Vam sledeća ovlašćenja na mojim fasciklama:"
 
 #. 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 "Takođe Vam je dozvoljeno da vidite moje privatne stvari."
 
 #. 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 "Niste ovlašćeni, međutim, da vidite moje privatne podatke."
 
-#: ../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 "%s Vas je odredio za svog delegata"
@@ -16807,10 +17410,12 @@ msgstr "<b>Status:</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>Dole izabrana poruka će biti automatski poslata svakoj osobi koja Vam pošalje\n"
+"<small>Dole izabrana poruka će biti automatski poslata svakoj osobi koja Vam "
+"pošalje\n"
 "poštu dok niste u kancelariji.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -16857,8 +17462,8 @@ msgstr "Dodaj korisnika:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Dodaje korisnika"
 
@@ -16976,11 +17581,11 @@ msgstr "_Osetljivost: "
 msgid "_User"
 msgstr "_Korisnik"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Izaberite korisnika"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Imenik..."
 
@@ -16993,38 +17598,50 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Prijavi se na kalendar drugog korisnika"
 
 #: ../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 "Priključak koji rukuje zbirkom naročitih radnji i svojstava nad nalozima za Exchange."
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Priključak koji rukuje zbirkom naročitih radnji i svojstava nad nalozima za "
+"Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Exchange radnje"
 
 #: ../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 "Nije moguće promeniti lozinku zbog problema u podešavanju."
 
-#: ../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 "Nije moguće prikazati fascikle."
 
-#: ../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 "Operacija se ne može odraditi."
 
-#: ../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 "Promene u podešavanju Exchange naloga „{0}“ će nastupiti nakon izlaska i ponovnog pokretanja Evolucije."
-
 #: ../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 ""
+"Promene u podešavanju Exchange naloga „{0}“ će nastupiti nakon izlaska i "
+"ponovnog pokretanja Evolucije."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Nije moguća autentifikacija na server."
 
-#: ../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 "Nije moguće izmeniti lozinku."
 
-#: ../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"
@@ -17034,59 +17651,61 @@ msgstr ""
 "pojave nepoznate greške. Proverite adresu, \n"
 "korisničko ime i lozinku, i pokušajte ponovo."
 
-#: ../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 "Nije moguće povezivanje na Exchange server."
 
-#: ../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 "Nije moguće povezivanje na server {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 "Nije moguće utvrditi ovlašćenja za fascikle delegata."
 
-#: ../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 "Nije moguće pronaći Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Nije moguće pronaći server {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 "Nije moguće {0} učiniti delegatom"
 
-#: ../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 "Nije moguće pročitati ovlašćenja fascikli"
 
-#: ../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 "Nije moguće pročitati ovlašćenja fascikli."
 
-#: ../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 "Neuspelo čitanje stanja za van kancelarije"
 
-#: ../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 "Nije moguće osvežiti ovlašćenja fascikli."
 
-#: ../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 "Nije moguće osvežiti stanje za van kancelarije"
 
-#: ../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 "Potrebno je ponovo pokrenuti Evoluciju da bi se učitalo sanduče prijavljenog korisnika"
+msgstr ""
+"Potrebno je ponovo pokrenuti Evoluciju da bi se učitalo sanduče prijavljenog "
+"korisnika"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Exchange nalog nije na mreži."
 
-#: ../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"
@@ -17114,101 +17733,106 @@ 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 "Neuspelo osvežavanje delegata:"
 
-#: ../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 "Fascikla već postoji"
 
-#: ../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 "Fascikla ne postoji"
 
-#: ../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 "Fascikla nije na mreži"
 
-#: ../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 "Opšta greška"
 
-#: ../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 "Server za opšti katalog nije pristupačan."
 
-#: ../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 "Ukoliko OWA radi na drugoj putanji, morate je navesti u dijalogu za podešavanje naloga."
-
 #: ../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 ""
+"Ukoliko OWA radi na drugoj putanji, morate je navesti u dijalogu za "
+"podešavanje naloga."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Poštansko sanduče za {0} nije na ovom serveru."
 
-#: ../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 "Proverite da li je adresa ispravna i pokušajte ponovo."
 
-#: ../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 "Proverite da li je ime servera ispravno napisano i pokušajte ponovo."
 
-#: ../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 "Proverite da li su korisničko ime i lozinka ispravni i pokušajte ponovo."
+msgstr ""
+"Proverite da li su korisničko ime i lozinka ispravni i pokušajte ponovo."
 
-#: ../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 "Server za opšti katalog nije podešen za ovaj nalog."
 
-#: ../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 "Nema poštanskog sandučeta za korisnika {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 "Nema takvog korisnika {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 "Lozinka je uspešno promenjena."
 
-#: ../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 "Unesite IB delegata ili isključite opciju slanja kao delegata"
 
-#: ../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 "Molim budite sigurni da je ime Globalnog servera za katalog tačno."
 
 # shell:noshell-reason title
-#: ../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 "Ponovo pokrenite Evoluciju da bi promene nastupile"
 
-#: ../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 "Izaberite korisnika."
 
-#: ../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 "Server je odbio lozinku jer je preslaba."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange nalog će biti isključen kada izađete iz Evolucije"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange nalog će biti ukloljen kada izađete iz Evolucije"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange server nije kompatibilan sa Exchange Connector-om."
 
-#: ../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."
@@ -17216,7 +17840,7 @@ msgstr ""
 "Server ima pokrenut Exchange 5.5. Exchange Connector \n"
 "podržava samo 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"
@@ -17230,80 +17854,95 @@ msgstr ""
 "\n"
 "Ili ste možda samo pogrešno ukucali lozinku."
 
-#: ../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 "Pokušajte ponovo drugom lozinkom."
 
-#: ../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 "Nije moguća dodati korisnika na listu za kontrolu pristupa:"
 
-#: ../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 "Nije moguće uređivanje delegata."
 
-#: ../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 "Nepoznata greška u pronalaženju {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 "Nepoznata greška."
 
-#: ../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 "Nepoznat tip"
 
-#: ../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 "Operacija nije podržana"
 
-#: ../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 "Približavate se vašoj kvoti koju imate za smeštanje pošte na ovom serveru."
+msgstr ""
+"Približavate se vašoj kvoti koju imate za smeštanje pošte na ovom serveru."
 
-#: ../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."
+#: ../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 "Dozvonjeno Vam je slanje poruke u ime samo jednog delegata odjednom."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Ne možete da sebe delegirate"
 
-#: ../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 "Prekoračili ste kvotu za smeštaj pošte na ovom serveru."
 
-#: ../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žete samo da podesite jedan Exchange nalog."
 
-#: ../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 "Trenutna iskorišćenost je: {0} KB. Probajte da oslobodite prostor brisanjem nekih poruka."
-
 #: ../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 "Trenutna iskorišćenost je: {0} KB. Od ovog trenutka nećete moći ni da šaljete ni da primate poštu."
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+"Trenutna iskorišćenost je: {0} KB. Probajte da oslobodite prostor brisanjem "
+"nekih poruka."
 
 #: ../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 "Trenutna iskorišćenost je: {0} KB. Nećete moći da šaljete poštu dok ne oslobodite prostor brisanjem nekih poruka."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+"Trenutna iskorišćenost je: {0} KB. Od ovog trenutka nećete moći ni da šaljete "
+"ni da primate poštu."
 
 #: ../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 ""
+"Trenutna iskorišćenost je: {0} KB. Nećete moći da šaljete poštu dok ne "
+"oslobodite prostor brisanjem nekih poruka."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Lozinka je istekla."
 
-#: ../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} ne može biti dodat na listu za kontrolu pristupa"
 
-#: ../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} je već delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} je već ne listi"
 
@@ -17324,8 +17963,12 @@ msgid "The default command that must be used as the editor."
 msgstr "Podrazumevana naredba koja se koristi kao uređivač."
 
 #: ../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 "Dodatak za korišćenje drugog uređivača za sastavljanje. Možete slati samo poruke u običnom tekstu."
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+"Dodatak za korišćenje drugog uređivača za sastavljanje. Možete slati samo "
+"poruke u običnom tekstu."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17341,12 +17984,20 @@ msgid "Editor not launchable"
 msgstr "Uređivač se ne pokreće"
 
 #: ../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 "Evolucija nije mogla da napravi privremenu datoteku za čuvanje pošte. Pokušajte kasnije."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Evolucija nije mogla da napravi privremenu datoteku za čuvanje pošte. "
+"Pokušajte kasnije."
 
 #: ../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 "Uređivač koje ste naveli u postavkama dodatka nije moguće pokrenuti. Pokušajte da navedete drugi uređivač."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Uređivač koje ste naveli u postavkama dodatka nije moguće pokrenuti. "
+"Pokušajte da navedete drugi uređivač."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17356,11 +18007,11 @@ msgstr "Sastavi u _drugom uređivaču"
 msgid "Compose messages using an external editor"
 msgstr "Sastavite poruke korišćenjem drugog uređivača"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Naredba za izvršavanje radi pokretanja uređivača:"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17381,12 +18032,14 @@ msgid "_Face"
 msgstr "_Lice"
 
 #: ../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 "Prilaže zaglavlje s licem odlaznim porukama. Potrebno je prvi put da korisnik podesi 48*48 png sliku. Ona je šifrirana kao base64  i smeštena u ~/.evolution/faces Kao takva će biti korišćena u porukama koje se nadalje šalju."
-
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Lice"
+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 ""
+"Prilaže zaglavlje s licem odlaznim porukama. Potrebno je prvi put da korisnik "
+"podesi 48*48 png sliku. Ona je šifrirana kao base64  i smeštena u ~/."
+"evolution/faces Kao takva će biti korišćena u porukama koje se nadalje šalju."
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -17394,8 +18047,10 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Odjava sa fascikle „%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 "Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo fascikli."
+#, fuzzy
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr ""
+"Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo fascikli."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17407,22 +18062,19 @@ msgstr "_Odjavi se"
 
 #: ../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 "Prvo unesite korisničko ime."
-
-#: ../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 "Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
+msgstr ""
+"Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
 
-#: ../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"
@@ -17431,21 +18083,22 @@ msgstr ""
 "Nije moguće pročitati podatke sa servera Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "Kal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "Dovuci _listu"
 
-#: ../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>Server</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 "Priključak za postavljanje kalendara i kontakata za google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17457,14 +18110,16 @@ msgid "Checklist"
 msgstr "Spisak"
 
 #: ../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 "Dodatak za nameštanje izvora grupnih kalendara i imenika."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "Postavljanje Groupware naloga"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17489,11 +18144,11 @@ msgstr ""
 "Kliknite 'Napred' radi instalacije deljene fascikle\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Instaliraj deljenu fasciklu"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Instalacija deljene fascikle"
 
@@ -17519,7 +18174,7 @@ msgid "Email:"
 msgstr "E-pošta:"
 
 #: ../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 "_Onemogući"
 
@@ -17536,8 +18191,12 @@ msgid "Message Retract"
 msgstr "Povlačenje poruke"
 
 #: ../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 "Povlačenje poruke je može ukloniti iz sandučeta primaoca. Želite li ovo da uradite? "
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Povlačenje poruke je može ukloniti iz sandučeta primaoca. Želite li ovo da "
+"uradite? "
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17548,15 +18207,18 @@ msgid "Retract Mail"
 msgstr "Povuci poštu"
 
 #: ../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 "Dodaj opcije slanja groupwise porukama"
 
 #: ../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 "Dodatak za mogućnosti Groupwise naloga."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Groupware mogućnosti"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17575,22 +18237,26 @@ msgstr "Neispravan korisnik"
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../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 "Korisniku &quot;{0}&quot; ne može biti dodeljen pristup posredniku"
 
-#: ../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 "Izaberite korisnika"
 
-#: ../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 "Već imate ovlašćenja za posrednika za ovog korisnika."
 
-#: ../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 "Morate navesti ispravno korisničko ime za davanje prava pristupa posredniku."
+msgstr ""
+"Morate navesti ispravno korisničko ime za davanje prava pristupa posredniku."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
@@ -17601,27 +18267,35 @@ msgid "Account Already Exists"
 msgstr "Nalog već postoji"
 
 #: ../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 "Prijava na posrednika kao &quot;{0}&quot; nije bila uspešna. Proverite adresu e-pošte i pokušajte ponovo."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Prijava na posrednika kao &quot;{0}&quot; nije bila uspešna. Proverite "
+"adresu e-pošte i pokušajte ponovo."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Ovaj sastanak se ponavlja"
 
-#: ../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 "Prihvatate?"
 
-#: ../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 "Odbijate?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &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 "Ne možete podeliti fasciklu sa navedenim korisnikom &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 "Morate navesti kime korisnika kojeg želite da dodate na listu"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17712,7 +18386,8 @@ msgstr "_Piši"
 msgid "permission to read|_Read"
 msgstr "Dozvola za čitanje|_Čitaj"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Mrežni posrednik"
 
@@ -17720,14 +18395,15 @@ msgstr "Mrežni posrednik"
 msgid "<b>Account Name</b>"
 msgstr "<b>Ime naloga</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Prijava za mrežnog posrednika"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite lozinku za %s (korisnik %s)"
@@ -17735,20 +18411,29 @@ msgstr "%sUnesite lozinku za %s (korisnik %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 "Prijava za mrežnog _posrednika..."
 
-#: ../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 "Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude na mreži."
+msgstr ""
+"Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude na mreži."
 
-#: ../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 "Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude omogućen."
+msgstr ""
+"Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude omogućen."
+
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Umetni napredne mogućnosti slanja"
 
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Korisnici"
 
@@ -17764,68 +18449,68 @@ msgstr "Nova _deljena fascikla..."
 msgid "Sharing"
 msgstr "Deljenje"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Prilagođeno obaveštenje"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Dodaj "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Izmeni"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Status poruke"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Naslov:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "Šalje:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Datum pravljenja:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Primalac:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Isporučeno:"
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Otvoreno:"
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Prihvaćeno:"
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Obrisano:"
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Odbijeno:"
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Završeno:"
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Neisporučeno:"
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Prati status poruke..."
 
@@ -17863,10 +18548,12 @@ msgstr "Pribavi s_va zaglavlja"
 
 #: ../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 ""
-"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim zaglavljima. \n"
+"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim "
+"zaglavljima. \n"
 "Izborom \"Sva zaglavlja\" ovo možete ignorisati."
 
 #: ../plugins/imap-features/imap-headers.glade.h:7
@@ -17927,30 +18614,41 @@ msgstr "Uvezi u kalendar"
 msgid "Imports ICS attachments to calendar."
 msgstr "Uvozi ICS priloge u kalendar."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Sloj hardverske apstrakcije nije učitan"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
-msgstr "Servis \"hald\"  je neophodan ali nije trenutno aktivan. Uključite servis i ponovo pokrenite program, ili kontaktirajte administratora sistema."
+#: ../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 ""
+"Servis \"hald\"  je neophodan ali nije trenutno aktivan. Uključite servis i "
+"ponovo pokrenite program, ili kontaktirajte administratora sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Traženje iPod uređaja nije uspelo"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-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 "Evolucija nije pronašla iPod radi usklađivanja. Uređaj ili nije priključen na sistem ili nije uključen."
+#: ../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 ""
+"Evolucija nije pronašla iPod radi usklađivanja. Uređaj ili nije priključen na "
+"sistem ili nije uključen."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iKalendar oblik (.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 "Usklađuje izabrano zaduženje/belešku/kalendar/adresar sa džepnim uređajem Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr ""
+"Usklađuje izabrano zaduženje/belešku/kalendar/adresar sa džepnim uređajem "
+"Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17960,236 +18658,246 @@ msgstr "Uskladi sa iPod džepnim uređajem"
 msgid "iPod Synchronization"
 msgstr "_Usklađivanje sa iPod džepnim uređajem"
 
-#: ../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 "Nije moguće otvaranje kalendara „%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 "Jedan zakazani sastanak u kalendaru „%s“ je u isto vreme kad i ovaj susret"
+msgstr ""
+"Jedan zakazani sastanak u kalendaru „%s“ je u isto vreme kad i ovaj susret"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Zakazani sastanak je pronađen u kalendaru „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ne mogu pronaći ovaj susret u nijednom kalendaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Ne mogu pronaći ovo zaduženje u nijednom spisku zaduženja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Pretraga jedne postojeće verzije ovog sastanka je u toku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Nije moguća obrada predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nije moguće slanje predmeta kalendaru ’%s‘.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru ’%s‘ kao prihvaćeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru ’%s‘ uz rezervu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru ’%s‘ kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nije moguće poslati obaveštenje o otkazivanju delegatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stanje učesnika nije osveženo zbog neispravnog stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nije moguće osvežavanje za učesnika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Stanje učesnika je osveženo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Podatak o zaduženju poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Podatak o belešci poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nije moguće slanje podataka o sastanku, sastanak ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nije moguće slanje podatka o zaduženju, zaduženje ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nije moguće slanje podataka o belešci, beleška ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../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:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "Poruka prijavljuje kalendar, ali taj kalendar nije ispravan iKalendar."
 
-#: ../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:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Predmet u kalendaru nije ispravan"
 
-#: ../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 "Poruka sadrži kalendar, ali on ne sadrži događaje, zaduženja ili slobodno/zauzeto podatke."
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Poruka sadrži kalendar, ali on ne sadrži događaje, zaduženja ili slobodno/"
+"zauzeto podatke."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
-msgid "To process all of these items, the file should be saved and the calendar imported"
-msgstr "Radi obrade svih ovih predmeta, potrebno je datoteku sačuvati a kalendar uvesti"
+#: ../plugins/itip-formatter/itip-formatter.c:1584
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Radi obrade svih ovih predmeta, potrebno je datoteku sačuvati a kalendar "
+"uvesti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Ovaj se sastanak ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Ovo se zaduženjese ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Ova se beleška ponavlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Tabela pretrage za preklapanjima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
 #. 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:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Danas %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Danas %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Sutra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Sutra %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Sutra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Sutra %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -18199,69 +18907,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -18271,327 +18979,349 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Odgovorite u ime <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Primljeno u ime <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> preko %s objavi sledeći podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> objavi sledeći podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> Vam delegira sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> preko %s zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> preko %s želi da doda postojećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> želi da doda postojećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> preko %s želi da primi najnovije informacije za sledeći sastanak:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+"<b>%s</b> preko %s želi da primi najnovije informacije za sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> želi da primi najnoviji podatak za sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> preko %s šalje sledeći odgovor za sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> posla sledeći odgovor za sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> preko %s otkaza sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> otkaza sledeći sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> preko %s predlaže sledeće promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> predloži sledeće promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> preko %s odbi sledeće promene sastanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> odbi sledeće promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> preko %s objavi sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> objavi sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> zahteva da %s preuzme sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> preko %s Vam dodeli zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> Vam dodeli zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b preko %s želi da doda postojećem zaduženju:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b želi da doda postojećem zaduženju:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> preko %s želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+"<b>%s</b> preko %s želi da dobije najnovije informacije za sledeće dodeljeno "
+"zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> preko %s vraća sledeći odgovor na dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> posla nazad sledeći odgovor na dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> preko %s otkaza sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> otkaza sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> preko %s predlaže sledeće promene u dodeli zaduženja:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> predloži sledeće promene u dodeli zaduženja:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> preko %s odbi sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> odbi sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> preko %s objavi sledeću belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> objavi sledeću belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> preko %s želi da doda postojećoj belešci:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> želi da doda postojećoj belešci:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> preko %s otkaza sledeću deljenu belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> otkaza sledeće deljenu belešku:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Otvori kalendar"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Odbij"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Odbij"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "Pri_hvati"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "P_rihvati sve"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "Pošalji podat_ke"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "Osveži stanje učesni_ka"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "Os_veži"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Vreme početka:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Vreme završetka:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Napomena:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Pošalji o_svežene podatke učesnicima"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Podsetnik na priloge"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "Za_duženja:"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Beleške :"
 
@@ -18604,18 +19334,23 @@ msgid "Itip Formatter"
 msgstr "Itip oblikovanje"
 
 #: ../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; delegira sastanak. Želite li da dodate 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; delegira sastanak. Želite li da dodate delegata &quot;{1}"
+"&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Ovaj sastanak je delegiran"
 
 #: ../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?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan učesnik. Dodati ga u prisutne?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Odjava sa mrežnog posrednika"
 
@@ -18648,8 +19383,12 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Stvara D-BUS poruku kada stigne nova pošta."
 
 #: ../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 "Ako je „tačno“ svirne, inače pušta zvučnu datoteku kada stigne nova poruka."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Svirne ako je postavljeno na „true“ (tačno), a inače pušta zvučnu datoteku "
+"kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18665,7 +19404,8 @@ msgstr "Iskačuća poruka sa ikonom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Prikazuje ikonu za novu poštu u obaveštajnoj zoni kada stigne nova poruka."
+msgstr ""
+"Prikazuje ikonu za novu poštu u obaveštajnoj zoni kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -18673,7 +19413,9 @@ msgstr "Ime datoteke za puštanje."
 
 #: ../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 "Zvučna datoteka za puštanje kada stigne nova poruka, ukoliko nije uključeno obaveštenje sirenom."
+msgstr ""
+"Zvučna datoteka za puštanje kada stigne nova poruka, ukoliko nije uključeno "
+"obaveštenje sirenom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
@@ -18691,20 +19433,20 @@ msgstr "Da li da ikona trepće ili ne."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Da li da obavesti o novoj poruci samo za prijemno sanduče."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Stvara _D-Bus poruku"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Evolucijino obaveštenje o pošti"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Postavke obaveštenja o pošti"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18722,7 +19464,7 @@ msgstr[2] ""
 "Primili ste %d novih poruka\n"
 "u %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18730,62 +19472,69 @@ msgstr[0] "Primili ste %d novu poruku."
 msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Prikazuje ikonu u _obaveštajnoj zoni"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "Tre_peri ikona u obaveštajnoj zoni "
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Prikaži _poruku zajedno sa ikonom"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "_Pusti zvuk kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Svirni"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Pusti _zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Pu_sti"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _prijemno sanduče"
 
 #: ../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 "Stvara D-Bus poruku ili obaveštava korisnika ikonom u obaveštajnoj zoni i obaveštenjem kada stigne nova poruka."
+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 ""
+"Stvara D-Bus poruku ili obaveštava korisnika ikonom u obaveštajnoj zoni i "
+"obaveštenjem kada stigne nova poruka."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Obaveštenje o pošti"
 
 #: ../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."
-msgstr "Dodatak koji omogućava pravljenje sastanaka iz sadržaja elektronske poruke."
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+"Dodatak koji omogućava pravljenje sastanaka iz sadržaja elektronske poruke."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -18801,12 +19550,19 @@ msgid "Cannot open calendar. %s"
 msgstr "Nije moguće otvoriti kalendar. %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 "Izabrani izvor je samo za čitanje, stoga ne možete tu napraviti zaduženje. Izaberite drugi izvor."
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Izabrani izvor je samo za čitanje, stoga ne možete tu napraviti zaduženje. "
+"Izaberite drugi izvor."
 
 #: ../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."
-msgstr "Dodatak koji omogućava pravljenje zaduženja iz sadržaja elektronske poruke."
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+"Dodatak koji omogućava pravljenje zaduženja iz sadržaja elektronske poruke."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -18843,8 +19599,10 @@ msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "Obezbeđuje radnje za opšte naredbe dopisnih listi (prijava, odjava, ...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr ""
+"Obezbeđuje radnje za opšte naredbe dopisnih listi (prijava, odjava, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -18864,11 +19622,14 @@ msgstr "Radnja nije dostupna"
 
 #: ../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 ""
-"Elektronska poruka će biti poslata na adresu „{0}“. Možete poruku da pošaljete automatski, ili je prvo pogledati i izmeniti.\n"
+"Elektronska poruka će biti poslata na adresu „{0}“. Možete poruku da "
+"pošaljete automatski, ili je prvo pogledati i izmeniti.\n"
 "\n"
 "Trebalo bi da dobijete odgovor sa dopisne liste ubrzo nakon slanja poruke."
 
@@ -18885,20 +19646,27 @@ msgid "Posting not allowed"
 msgstr "Slanje nije dozvoljeno"
 
 #: ../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 "Slanje na ovu dopisnu listu nije dozvoljeno. Možda je ova lista samo za čitanje. Obratite se vlasniku liste za detalje."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Slanje na ovu dopisnu listu nije dozvoljeno. Možda je ova lista samo za "
+"čitanje. Obratite se vlasniku liste za detalje."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Poslati elektronsku poruku na dopisnu listu?"
 
 #: ../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 ""
-"Radnju nije moguće izvesti. To znači da zaglavlje za ovu radnju nije sadržalo obradivu radnju.\n"
+"Radnju nije moguće izvesti. To znači da zaglavlje za ovu radnju nije sadržalo "
+"obradivu radnju.\n"
 "\n"
 "Zaglavlje: {0}"
 
@@ -18913,7 +19681,9 @@ msgstr ""
 "Zaglavlje: {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."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "Ova poruka ne sadrži potrebne podatke u zaglavlju za ovu radnju."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18977,8 +19747,12 @@ msgid "Also mark messages in subfolders?"
 msgstr "Označiti takođe i poruke u podfasciklama?"
 
 #: ../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 "Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i one u podfasciklama? "
+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 ""
+"Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i "
+"one u podfasciklama? "
 
 #: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
@@ -19001,22 +19775,6 @@ msgstr "Označi po_ruke kao pročitane"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Koristi se za obeležavanje svih poruka u fascikli da budu pročitane"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Označi kalendar za rad van mreže"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Označava izabran kalendar za pregled van mreže."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Onemogući da ovo bude dostupno van mreže"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Omogući za rad van mreže"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Dodatak koji uvodi mono dodatke."
@@ -19066,11 +19824,13 @@ msgstr "Dodatak"
 
 #: ../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 ""
-"Probni dodatak koji pokazuje kako dodatak za oblikovanje omogućava isključivanje HTML pošte.\n"
+"Probni dodatak koji pokazuje kako dodatak za oblikovanje omogućava "
+"isključivanje HTML pošte.\n"
 "\n"
 "Ovaj dodatak je samo za potrebe demonstracije.\n"
 
@@ -19083,19 +19843,19 @@ msgstr "Model teksta"
 msgid "Prefer plain-text"
 msgstr "Prednost tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Prikaži HTML ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Prednost PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Isključivo prikazuj PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML _režim"
 
@@ -19107,6 +19867,20 @@ msgstr "Evolucijin ispitivač"
 msgid "Writes a log of profiling data events."
 msgstr "Upisuje dnevnik ispitivačkih događaja."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Uvozi poštu iz programa Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Outlook CSV i Tab uvoznik"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Dozvoljava objavljivanje kalendara na Internetu"
@@ -19123,8 +19897,9 @@ msgstr "Mesta"
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
-#: ../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 "Sigurno želite da uklonite ovu adresu?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19162,8 +19937,9 @@ msgid "Publishing _Frequency:"
 msgstr "Učesta_lost objavljivanja"
 
 #: ../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"
@@ -19211,6 +19987,16 @@ msgstr ""
 "iKal\n"
 "Slobodno/zauzeto"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+msgid "New Location"
+msgstr "Mesto"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+msgid "Edit Location"
+msgstr "Mesto"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Zdravo Python"
@@ -19228,72 +20014,78 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Pokretač test priključka za Python EPlugin."
 
 #: ../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 "Priključak koji učitava druge priključke pisanih jezikom python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Pokretač Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "Spam ubica (ugrađen)"
 
-#: ../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 "Ubica spama nije pronađen, 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 "Nije uspelo pravljenje cevi: %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 "Greška po izdvajanju: %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 "Zavisan proces SpamAssassin nije odgovorio, ubijam..."
 
-#: ../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 "Čekanje na zavistan proces Spamassassin ometeno, prekidam..."
 
-#: ../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 "Cev ka Spamassassin je pukla, oznaka greške: %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 "Ubica spama nije dostupan."
 
-#: ../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 "Ovo će učiniti Ubicu spama pouzdanijim, ali sporijim"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
 #: ../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 "Filtrira neželjenu poštu koristeći Ubicu spama. Ovaj dodatak zahteva njegovu ponovnu instalaciju."
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+"Filtrira neželjenu poštu koristeći Ubicu spama. Ovaj dodatak zahteva njegovu "
+"ponovnu instalaciju."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Dodatak za neželjenu poštu Ubice spama"
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Opcije Ubica spama"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opcije Ubica spama"
+msgid "SpamAssassin junk plugin"
+msgstr "Dodatak za neželjenu poštu Ubice spama"
 
 #: ../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."
@@ -19301,7 +20093,7 @@ msgstr "Dodatak za čuvanje svih priloga ili delova poruke odjednom."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Sačuvaj priloge"
 
@@ -19313,15 +20105,15 @@ msgstr "Sačuvaj priloge..."
 msgid "Save all attachments"
 msgstr "Sačuvaj sve priloge"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Izaberi ime za snimanje baze"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME tip"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -19329,79 +20121,79 @@ msgstr "Sačuvaj"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "JIB"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Lista opisa"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Lista kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Lista komentara"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Napravljeno"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Kontakt lista"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Početak"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "postotak završenog"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "Adresa"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Spisak učesnika"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Napredne opcije za CSV oblik"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Prvo uključi zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Graničnik vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Graničnik zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Obavij vrednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Zarezom odvojen oblik vrednosti (.csv)"
 
@@ -19422,15 +20214,15 @@ msgstr "Sačuvaj na _disk"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF oblik (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
@@ -19462,46 +20254,49 @@ msgstr "Vodi Vas kroz prvo podešavanje naloga."
 msgid "Setup Assistant"
 msgstr "Pomoćnik podešavanja"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"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 ""
-"Dobro došli u Evoluciju. Nekoliko narednih ekrana će omogućiti da se Evolucija poveže na naloge eletronske pošte i da uveze datoteke iz drugih programa. \n"
+"Dobro došli u Evoluciju. Nekoliko narednih ekrana će omogućiti da se "
+"Evolucija poveže na naloge eletronske pošte i da uveze datoteke iz drugih "
+"programa. \n"
 "\n"
 "Kliknite „Napred“ da nastavite. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Uvoženje datoteka"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Uvoženje podataka."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Sačekajte"
@@ -19524,18 +20319,22 @@ msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
 #: ../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."
-msgstr "Spisak parova ključna-reč/vrednost koje priključak šablona predmeta zamenjuje u telu poruke."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Spisak parova ključna-reč/vrednost koje priključak šablona predmeta zamenjuje u "
+"telu poruke."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
@@ -19544,7 +20343,8 @@ msgid "Drafts based template plugin"
 msgstr "Priključak za obrazac za pripreme"
 
 #: ../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 "Jednostavan dodatak koji koristi ytnef za dekodiranje tnef priloga."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19570,7 +20370,8 @@ msgid "URL:"
 msgstr "Adresa :"
 
 #: ../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 "_Izbegavaj IfMatch (potrebno na apaču < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19618,8 +20419,11 @@ msgid "Default window width"
 msgstr "Podrazumevana širina prozora"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Uključuje podešavanja posrednika kada pristupa HTTP/bezbedan HTTP preko interneta."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Uključuje podešavanja posrednika kada pristupa HTTP/bezbedan HTTP preko "
+"interneta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -19642,15 +20446,24 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
 #: ../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 "Ako je tačno, povezivanje na posrednika zahteva autentifikaciju. Korisničko ime se čita iz ključa GConf „/apps/evolution/shell/network_config/authentication_user“, a lozinka ili iz gnome-keyring, ili datoteke lozinki ~/.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 ""
+"Ako je tačno, povezivanje na posrednika zahteva autentifikaciju. Korisničko "
+"ime se čita iz ključa GConf „/apps/evolution/shell/network_config/"
+"authentication_user“, a lozinka ili iz gnome-keyring, ili datoteke lozinki "
+"~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Poslednja nadograđena verzija podešavanja"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Lista putanja fascikli za usklađivanje na disku za rad van mreže"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
@@ -19682,8 +20495,15 @@ msgid "Secure HTTP proxy port"
 msgstr "Port bezbednog posrednika za 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 "Izaberite način podešavanja posrednika. Podržane su vrednosti 0, 1, 2 i 3, koje označavaju „koristi sistemske postavke“, „bez posrednika“, „koristi ručna podešavanja posrednika“ i „koristi podešavanja posrednika na adresi“, respektivno."
+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 ""
+"Izaberite način podešavanja posrednika. Podržane su vrednosti 0 (koristi "
+"sistemske postavke), 1 (bez posrednika), 2 (koristi ručna podešavanja "
+"posrednika) i 3 (koristi podešavanja posrednika na adresi)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -19693,8 +20513,7 @@ msgstr "Bočna oblast je vidljiva"
 msgid "Skip development warning dialog"
 msgstr "Preskoči prozorče sa upozorenjem o razvoju"
 
-#: ../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 "Počni rad van mreže"
 
@@ -19703,8 +20522,12 @@ msgid "Statusbar is visible"
 msgstr "Linija sa stanjem je vidljiva"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja — npr. „2.6.0“."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja — npr. "
+"„2.6.0“."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
@@ -19719,8 +20542,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Podrazumevana širina pomoćne linije, u pikselima."
 
 #: ../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 "Poslednja nadograđena verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja (npr. „2.6.0“)."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Poslednja nadograđena verzija podešavanja Evolucije, sa glavnim/sporednim/"
+"nivoom podešavanja (npr. „2.6.0“)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
@@ -19735,24 +20562,50 @@ msgid "The machine name to proxy socks through."
 msgstr "Naziv mašine za puštanje socks posrednika."
 
 #: ../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 mašini određen u „/apps/evolution/shell/network_config/http_host„“ koji posrednik pušta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Port na mašini određen u „/apps/evolution/shell/network_config/http_host„“ "
+"koji posrednik pušta."
 
 #: ../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 mašini određen u „/apps/evolution/shell/network_config/secure_host“ koji posrednik pušta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Port na mašini određen u „/apps/evolution/shell/network_config/secure_host“ "
+"koji posrednik pušta."
 
 #: ../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 mašini određen u „/apps/evolution/shell/network_config/socks_host“ koji posrednik pušta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Port na mašini određen u „/apps/evolution/shell/network_config/socks_host“ "
+"koji posrednik pušta."
 
 #: ../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 "Stil dugmadi prozora. Može biti „tekst“, „ikone“, „oboje“, „paleta alata“. Ako je postavljeno „paleta alata“, Gnomovo podešavanje palete alata utvrđuje stil dugmadi."
+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 ""
+"Stil dugmadi prozora. Može biti „text“ (tekst), „icons“ (ikonice), "
+"„both“ (oboje), „toolbar“ (paleta alata). Ako je postavljeno „toolbar“, "
+"Gnomovo podešavanje palete alata utvrđuje stil dugmadi."
 
 #: ../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 "Ovaj ključ sadrži spisak domaćina koji su direktno povezani, bez korišćenja posrednika (ukoliko je aktivan). Vrednosti mogu biti domaćini, domeni (upotrebom džokera poput *.foo.com), IP adrese domaćina (IPv4 i IPv6) i mrežne adrese sa maskom (nešto kao 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 ""
+"Ovaj ključ sadrži spisak domaćina koji su direktno povezani, bez korišćenja "
+"posrednika (ukoliko je aktivan). Vrednosti mogu biti domaćini, domeni "
+"(upotrebom džokera poput *.foo.com), IP adrese domaćina (IPv4 i IPv6) i "
+"mrežne adrese sa maskom (nešto kao 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
@@ -19791,8 +20644,11 @@ msgid "Whether the toolbar should be visible."
 msgstr "Da li da paleta alata bude vidljiva."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Da li će prozorče sa upozorenjem u razvojnim verzijama Evolucije biti prikazano."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Da li će prozorče sa upozorenjem u razvojnim verzijama Evolucije biti "
+"prikazano."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
@@ -19823,8 +20679,12 @@ msgid "Choose the type of importer to run:"
 msgstr "Izaberite tip uvoznika:"
 
 #: ../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 "Izaberite datoteku koju želite da uvezete u Evoluciju i izaberite kojeg je tipa ta datoteka iz liste."
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Izaberite datoteku koju želite da uvezete u Evoluciju i izaberite kojeg je "
+"tipa ta datoteka iz liste."
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -19868,8 +20728,7 @@ msgstr "Evolucijine postavke"
 
 #. 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 - Evolucija"
@@ -19894,7 +20753,7 @@ msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
@@ -19902,28 +20761,23 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "Greška pri otvaranju stranice za pomoć."
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-commands.c:968
-#: ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ra_d van mreže"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Rad van mreže"
 
-#: ../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."
@@ -19931,11 +20785,11 @@ msgstr ""
 "Evolucija je trenutno na mreži.\n"
 "Kliknite na ovo dugme za rad van mreže."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolucija je u procesu isključivanja sa mreže."
 
-#: ../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."
@@ -19943,35 +20797,33 @@ msgstr ""
 "Evolucija trenutno nije na mreži.\n"
 "Kliknite na ovo dugme da se povežete."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Nepoznata sistemska greška."
 
-#: ../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 "U redu"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Nije moguća registracija na OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Baza sa podešavanjima nije nađena"
 
@@ -20015,8 +20867,9 @@ msgid "Importer Type"
 msgstr "Tip uvoznika"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Izaberite uvoznike"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Izaberite fasciklu za uvoz"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20033,7 +20886,7 @@ msgstr ""
 "uvoza spoljnih datoteka u Evoluciju."
 
 #. 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"
@@ -20068,7 +20921,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo Vaš doprinos!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20076,43 +20929,43 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Silom gasi sve delove Evolucije"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovan prenos podataka iz Evolucije 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Isključuje učitavanje svih dodataka."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključuje okno za pregled pošte, kontakata i zaduženja."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolucija - Lični urednik podataka i program za e-poštu"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20125,72 +20978,98 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Sigurno želite da sve zapamćene lozinke budu zaboravljene?"
 
+# shell:noshell-reason title
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ponovo pokreće Evoluciju"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Nastavi"
 
 # shell:upgrade-remove-1-4 primary
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Obrisati stare podatke iz verzije {0}?"
 
 # shell:noshell-reason primary
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolucija se ne može pokrenuti."
 
-#: ../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 "Zaboravljanje lozinki će očistiti sve zapamćene lozinke. Ponovo ćete biti upitani kada sledeći put budu bile potrebne."
+#: ../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 ""
+"Zaboravljanje lozinki će očistiti sve zapamćene lozinke. Ponovo ćete biti "
+"upitani kada sledeći put budu bile potrebne."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Nedovoljno mesta na disku za dograđivanje."
 
 # shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Zaista obrisati stare podatke?"
 
-#: ../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 ""
 "Ceo sadržaj fascikle &quot;evolution&quot; će biti trajno obrisan.\n"
 "\n"
-"Savetujemo da proverite da li postoje pošta, kontakti i kalendar, i da li ova verzija Evolucije ispravno radi pre brisanja starih podataka.\n"
+"Savetujemo da proverite da li postoje pošta, kontakti i kalendar, i da li "
+"ova verzija Evolucije ispravno radi pre brisanja starih podataka.\n"
 "\n"
-"Posle brisanja, ne možete da se vratite na prethodnu verziju Evolucije bez ručne intervencije.\n"
+"Posle brisanja, ne možete da se vratite na prethodnu verziju Evolucije bez "
+"ručne intervencije.\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 ""
 "Prethodna verzija evolucije je smeštala svoje podatke na drugo mesto.\n"
 "\n"
-"Ukoliko odlučite da uklonite ove podatke, ceo sadržaj fascikle &quot;evolution&quot; biće trajno obrisan. Ukoliko se odlučite da zadržite ove podatke, moraćete ručno da uklonite sadržaj iz &quot;evolution&quot;kada Vam odgovara.\n"
+"Ukoliko odlučite da uklonite ove podatke, ceo sadržaj fascikle &quot;"
+"evolution&quot; biće trajno obrisan. Ukoliko se odlučite da zadržite ove "
+"podatke, moraćete ručno da uklonite sadržaj iz &quot;evolution&quot;kada Vam "
+"odgovara.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Neuspela nadogradnja sa prethodne verzije: {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 ""
-"Nadogradnja podataka i podešavanja će zahtevati do {0} prostora na disku, ali imate na raspolaganju samo {1}.\n"
+"Nadogradnja podataka i podešavanja će zahtevati do {0} prostora na disku, ali "
+"imate na raspolaganju samo {1}.\n"
 "\n"
 "Moraćete da oslobodite više mesta u ličnoj fascikli pre nego što nastavite."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20200,7 +21079,7 @@ msgstr ""
 "\n"
 "Kliknite na pomoć za detalje"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20214,27 +21093,29 @@ msgstr ""
 "\n"
 "Pritisnite na pomoć za detalje."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "Za_boravi"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Zadrži podatke"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Podseti me kasnije"
 
-#: ../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"
-"Ukoliko odlučite da nastavite, možda nećete moći da pristupite nekim starim podacima.\n"
+"Ukoliko odlučite da nastavite, možda nećete moći da pristupite nekim starim "
+"podacima.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20248,12 +21129,22 @@ msgstr ""
 "Uredite podešavanja poverenja:"
 
 #: ../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 "Pošto verujete izdavaocu ovog sertifikata, onda verujete i u autentičnost ovog sertifikata osim ako ovde ne naznačite drugačije"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Pošto verujete izdavaocu ovog sertifikata, onda verujete i u autentičnost "
+"ovog sertifikata osim ako ovde ne naznačite drugačije"
 
 #: ../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 "Pošto ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u autentičnost ovog sertifikata osim ako ovde ne naznačite drugačije"
+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 ""
+"Pošto ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u "
+"autentičnost ovog sertifikata osim ako ovde ne naznačite drugačije"
 
 #: ../smime/gui/certificate-manager.c:137
 #: ../smime/gui/certificate-manager.c:380
@@ -20282,9 +21173,8 @@ msgstr "Ime sertifikata"
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../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 "Serijski broj"
 
@@ -20395,11 +21285,14 @@ msgid "Backup All"
 msgstr "Rezerva svega"
 
 #: ../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 "Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, politiku i procedure (ako su dostupni)."
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, "
+"politiku i procedure (ako su dostupni)."
 
-#: ../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 "Sertifikat"
 
@@ -20475,13 +21368,11 @@ msgstr "Organizaciona jedinica (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../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 "Sertifikat SSL klijenta"
 
-#: ../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 "Sertifikat SSL servera"
 
@@ -20510,7 +21401,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Imate sertifikate ovih organizacija koji vas određuju:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Držite sertifikate koji određuju ove izdavaoce sertifikata:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -20526,187 +21418,182 @@ msgid "_Edit CA Trust"
 msgstr "_Uredi poverenje u 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 "Sertifikat već postoji"
 
-#: ../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 "Potpiši"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Verzija"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Verzija 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Verzija 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrovanje"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključa sertifikata"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape tip sertifikata"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Određivač ključa izdavaoca sertifikata"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Određivač predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Određivač algoritma"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom ključu subjekta"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog ključa subjekta"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Javni ključ subjekta"
 
-#: ../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 "Greška: nije moguća obrada proširenja"
 
-#: ../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 "Potpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL izdavač sertifikata"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Izdavač sertifikata e-pošte"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Zamućivanje ključa"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Zamućivanje podataka"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Saglasnost ključa"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Potpisnik sertifikata"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Kritično"
 
-#: ../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 "Nije kritično"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: ../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 "Algoritam potpisa sertifikata"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Izdavalac"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavača"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Uvežen sertifikat"
 
@@ -20740,22 +21627,21 @@ msgstr "Umnoži _sve kontakte u..."
 msgid "Contact _Preview"
 msgstr "Pred-pregled ko_ntakta"
 
-#: ../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 "Umnoži"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Copy selected contacts to another folder"
 msgstr "Umnoži izabrane kontakte u drugu fasciklu..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Umnoži kontakte izabrane fascikle u neku drugu fasciklu"
 
-#: ../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 "Umnoži izabrano"
 
@@ -20767,14 +21653,12 @@ msgstr "Umnoži u fasciklu..."
 msgid "Create a new address book folder"
 msgstr "Pravi novu fasciklu adresara"
 
-#: ../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 "Iseci"
 
-#: ../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 "Iseci izabrano"
 
@@ -20799,7 +21683,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Move selected contacts to another folder"
 msgstr "Premesti izabrane kontakte u drugu fasciklu..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -20810,14 +21695,12 @@ msgstr "Premesti kontakte izabrane fascikle u neku drugu fasciklu"
 msgid "Move to Folder..."
 msgstr "Premesti u fasciklu..."
 
-#: ../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 "Ubaci"
 
-#: ../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 "Ubaci iz spiska isečaka"
 
@@ -20842,15 +21725,15 @@ msgid "Save as VCard..."
 msgstr "Sačuvaj kao VKartu..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+msgid "Save selected contacts as a VCard"
 msgstr "Čuva izabrane kontakte kao VKartu."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Čuva kontakte izabrane fascikle kao VKartu."
 
-#: ../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 "Izaberi sve"
 
@@ -20863,7 +21746,8 @@ msgid "Select all contacts"
 msgstr "Izaberi sve kontakte"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts"
 msgstr "Šalje poruku izabranim kontaktima."
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -20871,7 +21755,8 @@ msgid "Send message to contact"
 msgstr "Šalje poruku kontaktu"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+msgid "Send selected contacts to another person"
 msgstr "Šalje izabrane kontakte drugoj osobi."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -20894,8 +21779,7 @@ msgstr "Prekini učitavanje"
 msgid "View the current contact"
 msgstr "Pregledaj tekući 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 "_Radnje"
@@ -20924,8 +21808,7 @@ msgstr "Premes_ti kontakt u..."
 msgid "_Move Folder Contacts To"
 msgstr "_Premesti kontakte iz fascikle u"
 
-#: ../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 "_Novo"
 
@@ -20985,9 +21868,8 @@ msgstr "Spisak"
 msgid "Month"
 msgstr "Mesec"
 
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Sledeće"
 
@@ -20995,9 +21877,8 @@ msgstr "Sledeće"
 msgid "Previews the calendar to be printed"
 msgstr "Pregleda kalendar za štampu"
 
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Prethodno"
 
@@ -21005,8 +21886,7 @@ msgstr "Prethodno"
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../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 "Izba_ci"
 
@@ -21054,15 +21934,23 @@ msgstr "Prikaži radnu nedelju"
 msgid "View the current appointment"
 msgstr "Pregledaj tekući sastanak"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Pregleda poruke u konzoli za dijagnozu kvara"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "Dnevnici _dijagnoze kvara"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
@@ -21094,8 +21982,7 @@ msgstr "Preuzima poruke za naloge/fascikle koje su označene za rad van mreže"
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../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 "Fas_cikla"
 
@@ -21132,10 +22019,6 @@ msgstr "Prikaži prozor za pregled poruke"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavi se ili odjavi na fascikle na mrežnim serverima"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Pregleda poruke u konzoli za dijagnozu kvara"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
@@ -21144,10 +22027,6 @@ msgstr "_Klasični prikaz"
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Dnevnici _dijagnoze kvara"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzima poruke za rad van mreže"
@@ -21172,7 +22051,8 @@ msgstr "_Pregled"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+#, fuzzy
+msgid "_Subscriptions..."
 msgstr "_Prijave"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21229,7 +22109,8 @@ msgid "Hide _Read Messages"
 msgstr "Sakrij pro_čitane poruke"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umesto njihovog precrtavanja"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21252,10 +22133,6 @@ msgstr "Trajno ukloni sve obrisane poruke iz ove fascikle"
 msgid "Permanently remove this folder"
 msgstr "Trajno ukloni ovu fasciklu"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "O_sveži..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Osvežava fasciklu"
@@ -21313,8 +22190,7 @@ msgstr "Poruke po raspravama"
 msgid "_Group By Threads"
 msgstr "Grupiši po raspravama"
 
-#: ../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 "_Poruka"
@@ -21640,8 +22516,7 @@ msgstr "Izaberi _sav tekst"
 msgid "Select all the text in a message"
 msgstr "Izaberi sav tekst u poruci"
 
-#: ../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 "Podesi stranu za tekući štampač"
 
@@ -21770,8 +22645,7 @@ msgstr "Uv_ećaj"
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../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 "Glavna paleta alata"
 
@@ -21877,7 +22751,8 @@ msgstr "Otvara nov prozor za prikaz ove fascikle"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Prikazuje dugmad prozora korišćenjem podešavanja palete alata radne površine"
+msgstr ""
+"Prikazuje dugmad prozora korišćenjem podešavanja palete alata radne površine"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -22059,8 +22934,7 @@ msgstr "Prema _preduzeću"
 msgid "_Address Cards"
 msgstr "_Karte imenika"
 
-#: ../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 "Pregled _spiska"
 
@@ -22153,7 +23027,8 @@ msgstr "Meni za podešavanje vremenske zone"
 
 #: ../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 ""
 "Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
@@ -22181,18 +23056,18 @@ msgid "Define Views for \"%s\""
 msgstr "Odredi preglede za „%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabela"
 
 # bug(slobo): instanca, primerak, pogledaj...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Struktura"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Sačuvaj trenutni pregled"
 
@@ -22205,42 +23080,42 @@ msgid "_Replace existing view"
 msgstr "_Zameni postojeći pregled"
 
 #. 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 "Prilagođen pregled"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Čuva prilagođen pregled"
 
-#: ../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 "Odredi preglede..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Bira pregled: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je korisnik podesio"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Čuva trenutni korisnički pregled"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Pravi ili menja preglede"
 
@@ -22264,20 +23139,17 @@ msgstr "Tip pregleda"
 msgid "Type of view:"
 msgstr "Tip pregleda:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Linija priloga"
 
-#: ../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 "Nije moguće prilaganje datoteke %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 "Nije moguće prilaganje datoteke %s: nije regularna datoteka"
@@ -22303,87 +23175,80 @@ msgstr "Predloži automatski prikaz priloga"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
-#: ../widgets/misc/e-canvas-background.c:453
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Boja ispunjavanja"
 
-#: ../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:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c: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 "GDK boja ispunjavanja"
 
-#: ../widgets/misc/e-canvas-background.c:474
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Istačkaj"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "H1"
 
-#: ../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 "Najmanja širina"
 
-#: ../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 "Najmanja širina"
 
-#: ../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 "Razmak"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Sada"
 
-#: ../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 "Vreme mora biti u formatu: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost postotka mora biti između 0 i 100"
 
@@ -22443,16 +23308,13 @@ msgstr "Zapadnoevropska"
 msgid "Western European, New"
 msgstr "Zapadnoevropska, nova"
 
-#: ../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 "Tradicionalna"
 
-#: ../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 "Pojednostavljena"
 
@@ -22485,93 +23347,93 @@ msgstr "Drugo..."
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Pritisnite na ovo dugme za prikaz kalendara"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Okvir za izbor vremena"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_Danas"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Razgranato"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Da li je stablo razgranato ili ne"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Tekst oznake stabla"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Koristi podvlačenje"
 
-#: ../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 "Ako je postavljeno, podvlačenje u tekstu označava znak koji će se koristiti kao prečica na tastaturi"
+#: ../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 ""
+"Ako je postavljeno, podvlačenje u tekstu označava znak koji će se koristiti "
+"kao prečica na tastaturi"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Razmak između oznake i sadržanog elementa"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Element oznake"
 
-#: ../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 "Element koji se prikazuje umesto obične oznake stabla"
 
-#: ../widgets/misc/e-expander.c:221
-#: ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Veličina stabla"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Veličina strelice stabla"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Razmak pokazivača"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Razmak oko strelice stabla"
 
 #. 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 "Napredna pretraga"
 
@@ -22588,18 +23450,15 @@ msgstr "_Pretrage"
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../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 "_Sačuvaj pretragu..."
 
-#: ../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 "_Uredi sačuvane pretrage..."
 
-#: ../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 "_Napredna pretraga..."
 
@@ -22632,14 +23491,18 @@ msgid "World Map"
 msgstr "Karta sveta"
 
 #: ../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 "Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone vrši iz donjeg okvira."
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone "
+"vrši iz donjeg okvira."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "Na mreži"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Stanje dugmeta je na mreži"
 
@@ -22655,80 +23518,74 @@ msgstr "Uskladi lične zapise:"
 msgid "Sync Categories:"
 msgstr "Uskladi kategorije:"
 
-#: ../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 "Prazna poruka"
 
-#: ../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 preispunjavanja"
 
-#: ../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 "Širina kolone"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Pretraži"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "IB predmeta"
 
-#: ../widgets/misc/e-search-bar.c:875
-#: ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Prika_ži: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "P_retraži"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " _u "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Red kursora"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Kolona kursora"
 
@@ -22875,19 +23732,19 @@ msgid "_When opened:"
 msgstr "_Kada je otvoreno:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Pritisnite ovde da posetite adresu"
 
@@ -22927,23 +23784,23 @@ msgstr "Fokusirana kolona"
 msgid "Unselected Column"
 msgstr "Neizabrana kolona"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Precrtana kolona"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Podvučena kolona"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Podebljana kolona"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Kolona u boji"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Kolona boja u pozadini"
 
@@ -22951,13 +23808,11 @@ msgstr "Kolona boja u pozadini"
 msgid "State"
 msgstr "Stanje"
 
-#: ../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 "(Rastuće)"
 
-#: ../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 "(Opadajuće)"
 
@@ -22983,7 +23838,7 @@ msgid "A_vailable Fields:"
 msgstr "Do_stupna polja:"
 
 #: ../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 "Rastuće"
 
@@ -22996,7 +23851,7 @@ msgid "Clear _All"
 msgstr "Očisti _sve"
 
 #: ../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 "Opadajuće"
 
@@ -23058,16 +23913,16 @@ msgstr "_Razvrstaj..."
 
 # Prevuci-i-Pusti
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "PiP kod"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Puno zaglavlje"
 
@@ -23107,8 +23962,7 @@ msgstr[2] "%s (%d stavki)"
 #: ../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 "Redovi naizmeničnih boja"
 
@@ -23116,10 +23970,8 @@ msgstr "Redovi naizmeničnih boja"
 #: ../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:3344
-#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Položene linije za crtanje"
 
@@ -23127,10 +23979,8 @@ msgstr "Položene linije za crtanje"
 #: ../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:3350
-#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Uspravne linije za crtanje"
 
@@ -23138,10 +23988,8 @@ msgstr "Uspravne linije za crtanje"
 #: ../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:3356
-#: ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Središte crtanja"
 
@@ -23149,8 +23997,7 @@ msgstr "Središte crtanja"
 #: ../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 "Režim kursora"
 
@@ -23158,8 +24005,7 @@ msgstr "Režim 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 za izbor"
 
@@ -23167,11 +24013,9 @@ msgstr "Model za izbor"
 #: ../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-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
-#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Najveća dužina"
 
@@ -23179,11 +24023,9 @@ msgstr "Najveća dužina"
 #: ../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-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
-#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Ujednačena visina redova"
 
@@ -23194,654 +24036,907 @@ msgstr "Ujednačena visina redova"
 msgid "Frozen"
 msgstr "Zamrznuto"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuće"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuće"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Ne razvrstavaj"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Grupiši po ovome _polju"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Grupiši po _okviru"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Dodaj ko_lonu..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Oblikuj kolo_ne..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Poređaj po"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Opis fonta"
 
-#: ../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 "Detalji razvrstavanja"
 
-#: ../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 "Stablo"
 
-#: ../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 "Zaglavlje tabele"
 
-#: ../widgets/table/e-table-item.c:3018
-#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Model tabele"
 
-#: ../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 "Red kursora"
 
-#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Uvek pretraži"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Koristite klik da dodate"
 
-#: ../widgets/table/e-tree.c:3363
-#: ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ETree prilagođivač tabele"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Starinski izgled"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Iscrtava linije i +/- graničnike."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
-#: ../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 "Obrađivač događaja"
 
-#: ../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 "Podebljano"
 
-#: ../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 "Precrtano"
 
-#: ../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 "Veza"
 
-#: ../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 "Obostrano"
 
-#: ../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 "Iseci širinu"
 
-#: ../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 "Iseci visinu"
 
-#: ../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 "Iseci"
 
-#: ../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 "Ispuni pravougaonik isečka"
 
-#: ../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 "X pomeranje"
 
-#: ../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 "Y pomeranje"
 
-#: ../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 "Širina teksta"
 
-#: ../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 "Visina teksta"
 
-#: ../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 "Koristi tri tačke"
 
-#: ../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 "Tri tačke"
 
-#: ../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 "Prelom reda"
 
-#: ../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 "Znaci za prelom"
 
-#: ../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 "Najviše linija"
 
-#: ../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 "Iscrtaj ivice"
 
-#: ../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 "Dozvoli nove linije"
 
-#: ../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 "Iscrtaj pozadinu"
 
-#: ../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 "Iscrtaj dugme"
 
-#: ../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 "Pozicija kurzora"
 
-#: ../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 metoda unosa"
 
-#: ../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 "Upravljaj iskačućim prozorom"
 
+#~ 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 ""
+#~ "Otvaranje ovog adresara nije moguće.  To znači da ste ili uneli pogrešnu "
+#~ "adresu, ili je LDAP server nedostupan."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Proba uređivača stila za štampanje kontakta"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Autorsko pravo (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Ovo isprobava element uređivača stila za štampanje kontakta"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Proba štampe kontakta"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Ovo isprobava kod za štampu kontakta"
+
+#~ msgid "Business"
+#~ msgstr "Poslovno"
+
+#~ msgid "Competition"
+#~ msgstr "Takmičenje"
+
+#~ msgid "Favourites"
+#~ msgstr "Omiljeno"
+
+#~ msgid "Gifts"
+#~ msgstr "Pokloni"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Ciljevi/zadaci"
+
+#~ msgid "Holiday"
+#~ msgstr "Praznik"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Čestitke"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Važni kontakti"
+
+#~ msgid "Ideas"
+#~ msgstr "Ideje"
+
+#~ msgid "International"
+#~ msgstr "Međunarodno"
+
+#~ msgid "Key Customer"
+#~ msgstr "Važan klijent"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Razno"
+
+#~ msgid "Next 7 days"
+#~ msgstr "Sledećih 7 dana"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Telefonski pozivi"
+
+#~ msgid "Strategies"
+#~ msgstr "Strategije"
+
+#~ msgid "Suppliers"
+#~ msgstr "Snabdevači"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Praćenje u vremenu; izdaci"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Čekam"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Sledećih 7 dana"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "Do_daj kriterijum filtriranja"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Vreme: mestimično oblačno"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Prvo unesite korisničko ime."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Označi kalendar za rad van mreže"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Označava izabran kalendar za pregled van mreže."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Greška pri otvaranju stranice za pomoć."
+
+#~ msgid "Select Importers"
+#~ msgstr "Izaberite uvoznike"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "O_sveži..."
+
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #~ msgid "Permission Denied."
 #~ msgstr "Zabranjen pristup."
+
 #~ msgid "_Properties..."
 #~ msgstr "Po_dešavanja..."
+
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Prikaz</b>"
+
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Podaci servera</b>"
+
 #~ msgid "_Categories..."
 #~ msgstr "Ka_tegorije..."
+
 #~ msgid "\n"
 #~ msgstr "\n"
+
 #~ msgid "Add an email to the List"
 #~ msgstr "Dodaj e-poštu na listu"
+
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Umetnite elektronske adrese iz imenika"
+
 #~ msgid "Members"
 #~ msgstr "Članovi"
+
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Ukloni elektronsku adresu sa liste"
+
 #~ msgid "_Select"
 #~ msgstr "_Izaberi"
+
 #~ msgid "D_escription:"
 #~ msgstr "_Opis:"
+
 #~ msgid "De_scription:"
 #~ msgstr "O_pis:"
+
 #~ msgid "Or_ganiser:"
 #~ msgstr "Or_ganizator:"
+
 #~ msgid "Task sort"
 #~ msgstr "Razvrstavanje zaduženja"
+
 #~ msgid "Memo sort"
 #~ msgstr "Razvrstavanje beleški"
+
 #~ msgid "Updating query"
 #~ msgstr "Osvežavanje upita"
+
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Nastupajući sastanci"
+
 #~ msgid "SMTWTFS"
 #~ msgstr "NPUSČPS"
+
 #~ msgid "Post To:"
 #~ msgstr "Slanje na:"
+
 #~ msgid "Unknown reason"
 #~ msgstr "Nepoznat razlog"
+
 #~ msgid "Open File"
 #~ msgstr "Otvara datoteku"
+
 #~ msgid "_Save Message"
 #~ msgstr "Sač_uvaj poruku"
+
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "Poslovni i program za e-poštu — Evolucija"
+
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Nije moguće otvaranje datoteke &quot;{0}&quot;."
+
 #~ msgid "_Search name:"
 #~ msgstr "Osnova za _pretragu:"
+
 #~ msgid "Di_sable"
 #~ msgstr "I_sključi"
+
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
+
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "Zvučna datoteka za obaveštenje o novoj pošti"
+
 #~ msgid "New Mail Notify type"
 #~ msgstr "Tip obaveštenja o novoj pošti"
+
 #~ msgid "Specifies the type of New Mail Notification the user wishes to use."
 #~ msgstr "Navodi tip obaveštenja o novoj pošti koje korisnik želi da koristi."
+
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">Oznake i boje</span>"
+
 #~ msgid "<span weight=\"bold\">New Mail Notification</span>"
 #~ msgstr "<span weight=\"bold\">Obaveštavanje o novoj pošti</span>"
+
 #~ msgid "Attach original message"
 #~ msgstr "Priloži originalnu poruku"
+
 #~ msgid "Do not quote original message"
 #~ msgstr "Ne citiraj originalnu poruku"
+
 #~ msgid "HTML Mail"
 #~ msgstr "HTML pošta"
+
 #~ msgid "Quote original message"
 #~ msgstr "Citiraj originalnu poruku"
+
 #~ msgid "Se_lect..."
 #~ msgstr "Iza_beri..."
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Odabira fasciklu Priprema"
-#~ msgid "Select Sent Folder"
-#~ msgstr "Odabira fasciklu Poslato"
+
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "S_virni kada stigne nova pošta"
+
 #~ msgid "_Do not notify me when new mail arrives"
 #~ msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
+
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Unesite ime za ovaj potpis."
+
 #~ msgid "Name:"
 #~ msgstr "Ime:"
+
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "Sigurno želite trajno da uklonite sve obrisane poruke u fascikli &quot;{0}"
 #~ "&quot;?"
+
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "Obrisati &quot;{0}&quot;?"
+
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Da li želite da ovu radnju takođe primenite na sve podfascikle?"
+
 # bug: requires a comment on usage
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Samo na _tekućoj fascikli"
+
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "Uključuje dodatak za podsetnik za priloge"
+
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "Svojstva podsetnika za priloge"
+
 #~ msgid "Remind _missing attachments"
 #~ msgstr "Podseti za _nedostajuće priloge"
+
 #~ msgid "_Refresh:"
 #~ msgstr "O_sveži:"
+
 # Nejasno. "Čemu ovo služi, a uz to i ne radi?".
 # http://bugzilla.gnome.org/show_bug.cgi?id=458512
 #, fuzzy
 #~ msgid "button-user"
 #~ msgstr "dugme-korisnik"
+
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "Izaberite (48*48) png veličine < 720bajta"
+
 #~ msgid "_Contacts..."
 #~ msgstr "_Kontakti..."
+
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr ""
 #~ "Svaki put kada stigne nova pošta, prikaži prozorče sa libnotify "
 #~ "obaveštenjem."
+
 #~ msgid "Make the status icon blink"
 #~ msgstr "Čini da ikona statusa trepće"
+
 #~ msgid "When the new-mail status icon is visible, make it blink."
 #~ msgstr "Kada je ikona za novu poštu vidljiva, neka trepće."
+
 #~ msgid "System error: %s"
 #~ msgstr "Sistemska greška: %s"
+
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Nalog ne može da šalje poštu"
+
 #~ msgid "No store available"
 #~ msgstr "Nema dostupne ostave"
+
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
 #~ msgstr "Dodatak koji uvodi CORBA sučelje za mrežno pristupanje pošti."
+
 #~ msgid "Mail Remote"
 #~ msgstr "Mrežna pošta"
+
 #~ msgid "New Mail Notification"
 #~ msgstr "Obaveštenje o novoj pošti"
+
 #~ msgid "Configure"
 #~ msgstr "Podešava"
+
 #~ msgid "Gives an option to print mail from composer"
 #~ msgstr "Daje mogućnost štampe poruke iz sastavljača"
+
 #~ msgid "Print Message"
 #~ msgstr "Štampaj poruku"
+
 #~ msgid "Prints the message"
 #~ msgstr "Štampa poruku"
+
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Dodatak koji rukuje uvodnim čarobnjakom"
+
 #~ msgid "Startup wizard"
 #~ msgstr "Čarobnjak za početak"
+
 #~ msgid "A string description of the current printer settings"
 #~ msgstr "Opisni niz trenutnih podešavanja štampača"
+
 #~ msgid "No folder name specified."
 #~ msgstr "Nije navedeno ime fascikle."
+
 #~ msgid "Folder name cannot contain the Return character."
 #~ msgstr "Ime fascikle ne može da sadrži Return znak."
+
 #~ msgid "Folder name cannot contain the character \"/\"."
 #~ msgstr "Ime fascikle ne može da sadrži znak „/“."
+
 #~ msgid "Folder name cannot contain the character \"#\"."
 #~ msgstr "Ime fascikle ne može da sadrži znak „#“."
+
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "’.‘ i ’..‘ su zauzeti za imena fascikli."
+
 #~ msgid "Copy selection to clipboard"
 #~ msgstr "Umnoži izabrano u spisak isečaka"
+
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "Seče izabrano u spisak isečaka"
+
 #~ msgid "Paste from clipboard"
 #~ msgstr "Ubaci sa spiska isečaka"
+
 #~ msgid "All Day Event"
 #~ msgstr "Celodnevni događaj"
+
 #~ msgid "Send _Options"
 #~ msgstr "_Opcije slanja"
+
 #~ msgid "Download messages for offline"
 #~ msgstr "Preuzima poruke za rad van mreže"
+
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Prikaži poruku u normalnom stilu"
+
 #~ msgid "Delete all but signature"
 #~ msgstr "Briše sve osim potpisa"
+
 #~ msgid "For_mat"
 #~ msgstr "_Oblik"
+
 #~ msgid "HT_ML"
 #~ msgstr "HT_ML"
+
 #~ msgid "Open a file"
 #~ msgstr "Otvori datoteku"
+
 #~ msgid "PGP Encrypt"
 #~ msgstr "PGP šifruj"
+
 #~ msgid "PGP Sign"
 #~ msgstr "PGP potpis"
+
 #~ msgid "S/MIME Encrypt"
 #~ msgstr "S/MIME šifruj"
+
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME potpis"
-#~ msgid "Save As"
-#~ msgstr "Sačuvaj kao"
+
 #~ msgid "Save in folder..."
 #~ msgstr "Sačuvaj u fasciklu..."
+
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "Sačuvaj poruku u navedenoj fascikli"
+
 #~ msgid "Send"
 #~ msgstr "Pošalji"
+
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Pošalji poruku u HTML formatu"
+
 #~ msgid "_Delete all"
 #~ msgstr "Obri_ši sve"
+
 #~ msgid "_Open..."
 #~ msgstr "_Otvori..."
+
 #~ msgid "C_lose"
 #~ msgstr "_Zatvori"
+
 #~ msgid "H_TML"
 #~ msgstr "H_TML"
+
 #~ msgid "Save and _Close"
 #~ msgstr "Sačuvaj i _zatvori"
+
 #~ msgid "Save the current file and close the window"
 #~ msgstr "Sačuvaj tekuću datoteku i zatvori prozor"
+
 #~ msgid "Refresh List"
 #~ msgstr "Osveži spisak"
+
 #~ msgid "Refresh List of Folders"
 #~ msgstr "Osveži spisak fascikli"
+
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Ukloni fasciklu sa spiska prijavljenih fascikli"
+
 #~ msgid "Subscribe"
 #~ msgstr "Prijavi se"
+
 #~ msgid "Unsubscribe"
 #~ msgstr "Odjavi se"
+
 #~ msgid "_Invert Selection"
 #~ msgstr "_Obrni izbor"
+
 #~ msgid "Status Details"
 #~ msgstr "Detalji stanja"
+
 #~ msgid "Time Zone"
 #~ msgstr "Vremenska zona"
+
 #~ msgid "TimeZone Combobox"
 #~ msgstr "Okvir za vremensku zonu"
 
 # week, 'M' for 'Monday', 'T' for Tuesday etc.
 #~ msgid "MTWTFSS"
 #~ msgstr "PUSČPSN"
+
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Ukloni"
+
 #~ msgid "Sh_ow these fields in order:"
 #~ msgstr "Pri_kaži ova polja redom:"
+
 #~ msgid "_Add ->"
 #~ msgstr "_Dodaj ->"
+
 #~ msgid "Emulate label resize"
 #~ msgstr "Oponašaj promenu veličine oznake"
+
 #~ msgid "A Folder with this name already exists"
 #~ msgstr "Jedna fascikla sa tim imenom već postoji"
+
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
 #~ "Promenjena elektronska adresa ili ime ovog kontakta\n"
 #~ "već postoji u ovoj fascikli.  Želite li ipak da dodate?"
+
 #~ msgid ""
 #~ "All information in these journal entries will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Svi podaci u ovim unosima u dnevnik će biti obrisani i neće se moći "
 #~ "povratiti."
+
 #~ msgid ""
 #~ "All information on this journal entry will be deleted and can not be "
 #~ "restored."
 #~ msgstr ""
 #~ "Svi podaci o ovom unosu u dnevnik će biti obrisani i neće se moći "
 #~ "povratiti."
+
 #~ msgid "Are you sure you want to delete the journal entry '{0}'?"
 #~ msgstr "Sigurno želite da obrišete unos u dnevnik ’{0}‘?"
+
 # bug: plural-forms
 #~ msgid "Are you sure you want to delete these {0} journal entries?"
 #~ msgstr "Sigurno želite da obrišete ove {0} unose u dnevnik?"
+
 #~ msgid "Are you sure you want to delete this journal entry?"
 #~ msgstr "Sigurno želite da obrišete ovaj unos u dnevnik?"
+
 #~ msgid ""
 #~ "If you do not send a cancelation notice, the other participants may not "
 #~ "know the journal has been deleted."
 #~ msgstr ""
 #~ "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 #~ "znati da je dnevnik obrisan."
+
 #~ msgid "This journal entry has been deleted."
 #~ msgstr "Ovaj unos u dnevnik je obrisan."
+
 #~ msgid "This journal entry has been changed."
 #~ msgstr "Ovaj unos u dnevnik je promenjen."
+
 #~ msgid "Journal entry - %s"
 #~ msgstr "Unos u dnevnik - %s"
+
 #~ msgid "The journal entry could not be deleted due to a corba error"
 #~ msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
+
 #~ msgid "The journal entry could not be deleted because permission was denied"
 #~ msgstr "Unos u dnevnik nije mogao biti obrisan jer pristup nije dozvoljen"
+
 #~ msgid "The journal entry could not be deleted due to an error"
 #~ msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
+
 # povratni > redovni
 #~ msgid ""
 #~ "You are modifying a recurring journal entry. What would you like to "
 #~ "modify?"
 #~ msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
+
 #~ msgid "Journal information"
 #~ msgstr "Podatak o dnevniku"
+
 #~ msgid "<b>Then</b>"
 #~ msgstr "<b>Onda</b>"
+
 #~ msgid "Valid signature, cannot verify sender"
 #~ msgstr "Ispravan potpis, nije moguća provera pošiljaoca"
+
 #~ msgid "Mark as _Read"
 #~ msgstr "O_znači kao pročitano"
+
 #~ msgid "_Do not Mark as Read"
 #~ msgstr "Os_tavi nepročitano"
+
 #~ msgid "Check Evolution archive"
 #~ msgstr "Proverava arhivu Evolucije"
+
 #, fuzzy
 #~ msgid "With GUI"
 #~ msgstr "Širina"
+
 #~ msgid "<b>Junk Mail Settings</b>"
 #~ msgstr "<b>Podešavanja pošte za đubre</b>"
+
 #~ msgid "<b>Subject</b> :"
 #~ msgstr "<b>Naslov</b>"
+
 #~ msgid "<b>From</b> :"
 #~ msgstr "<b>Šalje</b>"
+
 #~ msgid "Unable to find this journal entry in any journal"
 #~ msgstr "Ne mogu da pronađem ovaj unos u nijednom dnevniku"
+
 #~ msgid "_Address: "
 #~ msgstr "_Adresa:"
+
 #~ msgid "Print cards"
 #~ msgstr "Štampaj karte"
+
 #~ msgid "Organization"
 #~ msgstr "Organizacija"
+
 #~ msgid "E-mail"
 #~ msgstr "E-pošta"
+
 #~ msgid "GTK Tree View"
 #~ msgstr "Pregled GTK stabla"
+
 #~ msgid "Print envelope"
 #~ msgstr "Štampaj kovertu"
+
 #~ msgid "Print contacts"
 #~ msgstr "Štampaj kontakte"
+
 #~ msgid "Print contact"
 #~ msgstr "Štampaj kontakt"
+
 #~ msgid "Error loading default addressbook."
 #~ msgstr "Greška pri učitavanju podrazumevanog imenika."
+
 #~ msgid "Input File"
 #~ msgstr "Ulazna datoteka"
+
 #~ msgid "Add Calendar"
 #~ msgstr "Dodaje kalendar"
+
 #~ msgid "Add Task List"
 #~ msgstr "Dodaje listu zaduženja"
+
 #~ msgid "_Add Calendar"
 #~ msgstr "_Dodaj kalendar"
+
 #~ msgid "_Add Task List"
 #~ msgstr "_Dodaj listu zaduženja"
+
 #~ msgid "Add New Calendar"
 #~ msgstr "Dodaj novi kalendar"
+
 #~ msgid "Calendar Group"
 #~ msgstr "Grupa kalendara"
+
 #~ msgid "Calendar Location"
 #~ msgstr "Mesto kalendara"
+
 #~ msgid "Calendar Name"
 #~ msgstr "Ime kalendara"
+
 #~ msgid "<b>Task List Options</b>"
 #~ msgstr "<b>Opcije liste zaduženja</b>"
+
 #~ msgid "Add New Task List"
 #~ msgstr "Dodaj novu listu zaduženja"
+
 #~ msgid "Task List Group"
 #~ msgstr "Grupa za liste zaduženja"
+
 #~ msgid "Task List Name"
 #~ msgstr "Ime liste zaduženja"
+
 #~ msgid "<b>Free/Busy C_alendars</b>"
 #~ msgstr "<b>K_alendari za slobodno/zauzeto</b>"
+
 #~ msgid "<b>Publishing Frequency</b>"
 #~ msgstr "<b>Učestalost objavljivanja</b>"
+
 #~ msgid "<b>Publishing _Location</b>"
 #~ msgstr "<b>_Mesto objavljivanja</b>"
+
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "Podešavanja objavljivanja slobodno/zauzeto"
+
 #~ msgid "_Daily"
 #~ msgstr "_Dnevno"
+
 #~ msgid "_Manual"
 #~ msgstr "_Ručno"
+
 #~ msgid "_Weekly"
 #~ msgstr "_Nedeljno"
+
 #~ msgid "Enter the password for %s"
 #~ msgstr "Unesite lozinku za %s"
+
 #~ msgid "Selected day (%a %b %d %Y)"
 #~ msgstr "Izabrani dan (%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 "Izabrana nedelja (%s - %s)"
+
 #~ msgid "Selected month (%b %Y)"
 #~ msgstr "Izabrani mesec (%b %Y)"
+
 #~ msgid "Selected year (%Y)"
 #~ msgstr "Izabrana godina (%Y)"
+
 #~ msgid "Print Item"
 #~ msgstr "Štampaj predmet"
+
 #~ msgid "%.0fK"
 #~ msgstr "%.0fK"
+
 #~ msgid "%.0fM"
 #~ msgstr "%.0fM"
+
 #~ msgid "%.0fG"
 #~ msgstr "%.0fG"
+
 #~ msgid "No, Do not Change Status"
 #~ msgstr "Ne, ne menjaj stanje"
+
 #~ msgid "<b>Receiving Email</b>"
 #~ msgstr "<b>Primanje pošte</b>"
+
 #~ msgid "<b>Sending Email:</b>"
 #~ msgstr "<b>Slanje pošte:</b>"
+
 #~ msgid ""
 #~ "<small>This page allows you to choose if you want to be notified via a "
 #~ "read receipt when a message you\n"
@@ -23852,27 +24947,37 @@ msgstr "Upravljaj iskačućim prozorom"
 #~ "priznanicu uz svoju\n"
 #~ "poruku radi obaveštenja kada bude pročitana, i da odredite šta Evolucija "
 #~ "da radi kada neko Vama pošalje priznanicu.</small>"
+
 #~ msgid "Ask me if I want to send back a read receipt"
 #~ msgstr "Pitaj me želim li da vratim priznanicu"
+
 #~ msgid "Never send back a read receipt"
 #~ msgstr "Nikada ne vraćaj priznanicu"
+
 #~ msgid "Read Receipts"
 #~ msgstr "Priznanice"
+
 #~ msgid "Request a read receipt for all messages I send"
 #~ msgstr "Zatraži povraćaj priznanice za sve poruke koje pošaljem"
+
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
 #~ msgstr "Osim ako je poruka poslata dopisnoj listi, a ne meni lično"
+
 #~ msgid ""
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 #~ msgstr "Kada primite poruku sa priznanicom, šta Evolucija da radi?"
+
 #~ msgid "The orientation of the tray."
 #~ msgstr "Položaj zone."
+
 #~ msgid "Enable"
 #~ msgstr "Omogući"
+
 #~ msgid "Priority Filter \"%s\""
 #~ msgstr "Filter važnosti „%s“"
+
 #~ msgid ""
 #~ "Some of your Netscape email filters are based on\n"
 #~ "email priorities, which are not used in Evolution.\n"
@@ -23897,6 +25002,7 @@ msgstr "Upravljaj iskačućim prozorom"
 #~ "rezultate Evolucije, a promenjeni filteri koriste rezultate umesto\n"
 #~ "prioriteta. Proverite uvežene filtere da se uverite\n"
 #~ "da li sve radi kao što bi trebalo."
+
 #~ msgid ""
 #~ "Some of your Netscape email filters use\n"
 #~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -23907,6 +25013,7 @@ msgstr "Upravljaj iskačućim prozorom"
 #~ "mogućnost „Zanemari raspravu“ ili „Prati raspravu“\n"
 #~ "koju Evolucija ne podržava.\n"
 #~ "Ovi filteri će biti izostavljeni."
+
 #~ msgid ""
 #~ "Some of your Netscape email filters test the\n"
 #~ "body of emails for (in)equality to a given string,\n"
@@ -23919,64 +25026,88 @@ msgstr "Upravljaj iskačućim prozorom"
 #~ "što Evolucija ne podržava. Ovi filteri\n"
 #~ "su promenjeni da proveravaju da li taj niz jeste\n"
 #~ "ili nije sadržan u telu poruke."
+
 #~ msgid "Evolution is importing your old Netscape data"
 #~ msgstr "Evolucija uvozi stare Netscape podatke"
+
 #~ msgid "Importing Netscape data"
 #~ msgstr "Uvoženje Netscape podataka"
+
 #~ msgid "Settings"
 #~ msgstr "Podešavanja"
+
 #~ msgid "Mail Filters"
 #~ msgstr "Filteri pošte"
+
 #~ msgid ""
 #~ "Evolution has found Netscape mail files.\n"
 #~ "Would you like them to be imported into Evolution?"
 #~ msgstr ""
 #~ "Evolucija je pronašla Netscape datoteke pošte.\n"
 #~ "Želite li da budu uvežene u Evoluciju?"
+
 #~ msgid "<span weight=\"bold\">Filter Options</span>"
 #~ msgstr "<span weight=\"bold\">Mogućnosti filtera</span>"
+
 #~ msgid "<b>Recipients </b>"
 #~ msgstr "<b>Primaoci</b>"
+
 #~ msgid "<b>Action</b>"
 #~ msgstr "<b>Radnja</b>"
+
 #~ msgid "<b>Date and Time</b>"
 #~ msgstr "<b>Datum i vreme</b>"
+
 #~ msgid ""
 #~ "The output directory was not found on iPod! Please ensure that iPod has "
 #~ "been correctly set up and try again."
 #~ msgstr ""
 #~ "Izlazna fascikla nije pronađena na iPod uređaju! Molim proverite da li je "
 #~ "džepni uređaj pravilno podešen i pokušajte ponovo."
+
 #~ msgid "Could not export data!"
 #~ msgstr "Nije moguć izvoz podataka!"
+
 #~ msgid "Exporting data failed."
 #~ msgstr "Neuspešan izvoz podataka."
+
 #~ msgid "Could not open addressbook!"
 #~ msgstr "Nije moguće otvoriti imenik!"
+
 #~ msgid "Could not open the Evolution addressbook to export data."
 #~ msgstr "Ne mogu da otvorim Evolucijin imenik kako bi izvezao podatke."
+
 #~ msgid "Could not open calendar/todo!"
 #~ msgstr "Ne mogu otvoriti kalendar/spisak obaveza"
+
 #~ msgid "Could not open the Evolution calendar/todo list to export data."
 #~ msgstr ""
 #~ "Ne mogu otvoriti Evolucijin kalendar/spisak za uraditi da bi izvezao "
 #~ "podatke."
+
 #~ msgid "New mail notify"
 #~ msgstr "Obaveštenje o novoj pošti"
+
 #~ msgid "(Untitled)"
 #~ msgstr "(Neimenovano)"
+
 #~ msgid "An attachment to add."
 #~ msgstr "Prilog za dodavanje."
+
 #~ msgid "Content type of the attachment."
 #~ msgstr "Tip sadržaja priloga."
+
 #~ msgid "The filename to display in the mail."
 #~ msgstr "Ime datoteke koje se prikazuje u poruci."
+
 #~ msgid "Description of the attachment."
 #~ msgstr "Opis priloga."
+
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr "Označi da se prilog podrazumevano prikazuje unutar poruke."
+
 #~ msgid "_Edit..."
 #~ msgstr "_Uredi..."
+
 #~ msgid "..."
 #~ msgstr "..."
-
diff --git a/po/sv.po b/po/sv.po
index 39794a9f59..3758f80ac5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,11 +1,11 @@
 # Swedish messages for Evolution.
-# Copyright (C) 2000-2008 Free Software Foundation, Inc.
+# Copyright (C) 2000-2009 Free Software Foundation, Inc.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
 # Richard Hult <rhult@codefactory.se>, 2000, 2001.
 # Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005.
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <johan@gnome.org>, 2001, 2006.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009.
 #
 # Terminology
 # appointment = möte
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-24 08:47+0200\n"
-"PO-Revision-Date: 2008-10-24 08:54+0100\n"
+"POT-Creation-Date: 2009-01-31 02:19+0100\n"
+"PO-Revision-Date: 2009-01-31 02:23+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -33,12 +33,12 @@ msgid "evolution address book"
 msgstr "evolution-adressbok"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact"
 msgstr "Ny kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
@@ -161,7 +161,7 @@ msgid "calendar view for one or more days"
 msgstr "kalendervy för en eller flera dagar"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:821
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -172,9 +172,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:787
+#: ../calendar/gui/calendar-component.c:824
 #: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -182,9 +182,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:789
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -192,10 +192,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:808
-#: ../calendar/gui/calendar-component.c:815
-#: ../calendar/gui/calendar-component.c:821
-#: ../calendar/gui/calendar-component.c:823
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -205,9 +205,9 @@ 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:813
+#: ../calendar/gui/calendar-component.c:850
 #: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -405,7 +405,7 @@ msgstr "Misslyckades med att autentisera med LDAP-server."
 
 #. 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 "Misslyckades med att ta bort kontakt"
 
@@ -418,7 +418,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-servern svarade inte med giltig schemainformation."
 
 #: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Serverversion"
 
@@ -523,7 +523,7 @@ msgstr "_Använd som det är"
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44
 #: ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -534,21 +534,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
 
-#: ../addressbook/conduit/address-conduit.c:1321
-#: ../addressbook/conduit/address-conduit.c:1322
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "Kunde inte läsa in adressboken"
 
-#: ../addressbook/conduit/address-conduit.c:1399
-#: ../addressbook/conduit/address-conduit.c:1402
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Automatisk ifyllning"
 
@@ -564,10 +565,12 @@ msgstr "Certifikat"
 msgid "Configure autocomplete here"
 msgstr "Konfigurera automatisk ifyllning här"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1325
-#: ../calendar/gui/calendar-component.c:299
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319
 #: ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
@@ -606,86 +609,106 @@ msgstr "Evolutions konfigurationskontroll för mappinställningar"
 msgid "Manage your S/MIME certificates here"
 msgstr "Hantera dina S/MIME-certifikat här"
 
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:198
+#: ../calendar/gui/memos-component.c:202
 #: ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577
 #: ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195
+#: ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198
 #: ../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/em-migrate.c:2967
+#: ../mail/mail-component.c:316
 #: ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1518
+#: ../mail/message-list.c:1517
 msgid "On This Computer"
 msgstr "På denna dator"
 
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208
-#: ../calendar/gui/memotypes.xml.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:210
+#: ../calendar/gui/memos-component.c:214
 #: ../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
+#: ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210
 #: ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personligt"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "På LDAP-servrar"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:253
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:254
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adress_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:255
 msgid "Create a new address book"
 msgstr "Skapa en ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:418
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Misslyckades med att uppgradera adressboksinställningar eller mappar."
 
@@ -704,19 +727,19 @@ msgstr "Kopiera _bokinnehåll lokalt för frånkopplad användning"
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283
-#: ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2441
+#: ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmänt"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressbok"
@@ -810,61 +833,70 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina Pilot Sync-data..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Mappnamn kan inte innehålla \"/\""
 
-#: ../addressbook/gui/component/addressbook-view.c:941
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:945
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:644
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:493
-#: ../calendar/gui/tasks-component.c:484
-#: ../mail/em-folder-tree.c:2111
-#: ../mail/em-folder-view.c:1340
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:510
+#: ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132
+#: ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Byt namn..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-view.c:1797
+#: ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:513
+#: ../calendar/gui/tasks-component.c:504
+#: ../mail/em-folder-tree.c:2129
+#: ../mail/em-folder-view.c:1342
 #: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40
+#: ../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 "_Ta bort"
 
-#: ../addressbook/gui/component/addressbook-view.c:948
-#: ../calendar/gui/calendar-component.c:649
-#: ../calendar/gui/dialogs/comp-editor.c:2043
-#: ../calendar/gui/memos-component.c:498
-#: ../calendar/gui/tasks-component.c:489
-#: ../composer/e-msg-composer.c:1041
-#: ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:518
+#: ../calendar/gui/tasks-component.c:509
+#: ../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 "_Egenskaper"
 
-#: ../addressbook/gui/component/addressbook-view.c:1336
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
@@ -885,7 +917,7 @@ msgstr "Ange lösenord för %s (användare %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:422
 #: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -928,7 +960,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI för den mapp som senast användes i namnväljardialogen."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Vertical pane position"
 msgstr "Vertikal panelposition"
 
@@ -940,6 +972,14 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Huruvida förhandsgranskningspanelen ska visas."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "Slå upp i adressböcker"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -1151,7 +1191,7 @@ msgstr "_Inloggningsmetod:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:177
+#: ../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:"
@@ -1166,7 +1206,7 @@ msgid "_Search scope:"
 msgstr "_Sökomfattning:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1184,14 +1224,15 @@ msgid "cards"
 msgstr "kort"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20
 #: ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-contacts-source.c:366
 msgid "minutes"
 msgstr "minuter"
 
@@ -1232,8 +1273,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Jobb</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1244,16 +1285,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1262,11 +1303,12 @@ msgid "Full _Name..."
 msgstr "Fullständigt _namn..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Bild"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1279,7 +1321,7 @@ msgid "Nic_kname:"
 msgstr "Sme_knamn:"
 
 #: ../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"
 
@@ -1297,10 +1339,10 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Jobb"
@@ -1323,9 +1365,9 @@ msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:791
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1413,16 +1455,16 @@ msgstr "_Var:"
 msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
-#: ../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 "Adress"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
@@ -1431,981 +1473,981 @@ msgstr "Adress"
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1835
+#: ../widgets/table/e-cell-text.c:1822
 #: ../widgets/text/e-text.c:3688
 #: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "USA"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algeriet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikanska Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua och Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Österrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbajdzjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../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 "Vitryssland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien och Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvetön"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Brittiskt territorium i Indiska Oceanen"
 
-#: ../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 "Bulgarien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodja"
 
-#: ../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 "Kap Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Caymanöarna"
 
-#: ../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 "Centralafrikanska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tchad"
 
-#: ../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 "Kina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Julön"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komorerna"
 
-#: ../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 "Kongo, demokratiska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cooköarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskusten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Cypern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tjeckien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Dominikanska republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egypten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Ekvatorialguinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandsöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Färöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Frankrike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Franska Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynesien"
 
-#: ../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 "Franska sydterritorierna"
 
-#: ../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 "Georgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../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 "Grekland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard och McDonald-öarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: ../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 "Ungern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Nordkorea"
 
-#: ../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 "Sydkorea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libyen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Makedonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldiverna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Marshallöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldavien, republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: ../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 "Marocko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar (Burma)"
 
-#: ../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 "Nederländerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Nederländska Antillerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nya Kaledonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nya Zeeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolköarna"
 
-#: ../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 "Norra Marianeröarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "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 Nya Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filippinerna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Ryssland"
 
-#: ../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 Kitts och 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 och Grenadinerna"
 
-#: ../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 "São Tomé och Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudiarabien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbien och Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychellerna"
 
-#: ../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 "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slovakien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Solomonöarna"
 
-#: ../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 "Sydafrika"
 
-#: ../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 "Sydgeorgien och södra Sandwichöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre och Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard och 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 "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadzjikistan"
 
-#: ../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 "Tanzania, förenade republiken"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Östtimor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad och Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turkiet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks och Caicosöarna"
 
-#: ../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 "Förenade Arabemiraten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../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 "USA:s mindre avlägsna öar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "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 "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Brittiska Jungfruöarna"
 
-#: ../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 "Amerikanska Jungfruöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis och Futunaöarna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Västsahara"
 
-#: ../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
@@ -2417,36 +2459,42 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Tjänst"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
@@ -2454,82 +2502,83 @@ msgstr "Tjänst"
 msgid "Location"
 msgstr "Plats"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Annat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Källbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Är ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Obligatoriska fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Ändrad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigerare - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Välj en bild för denna kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Ingen bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2537,43 +2586,43 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" är tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Välj adressbok"
 
@@ -2710,7 +2759,7 @@ msgstr "_Snabbmeddelandetjänst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/calendar-weather/calendar-weather.c:372
 #: ../plugins/exchange-operations/exchange-calendar.c:247
 #: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
@@ -2726,6 +2775,9 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Välj..."
 
@@ -2753,7 +2805,7 @@ msgstr "_Medlemmar"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2807,26 +2859,26 @@ msgstr "Sammanfoga 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
+#: ../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-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 #: ../calendar/gui/cal-search-bar.c:80
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
@@ -2847,7 +2899,7 @@ msgstr[1] "%d kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2871,115 +2923,122 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Källkod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:565
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2041
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1670
-#: ../calendar/gui/e-memo-table.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-view.c:1775
+#: ../calendar/gui/e-memo-table.c:922
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Ny kontakt_lista..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Vidarebefordra kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Vidarebefordra kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Skicka _meddelande till kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Skicka _meddelande till lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Skicka _meddelande till kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Ko_piera till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Fly_tta till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:484
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1677
-#: ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2052
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-memo-table.c:930
+#: ../composer/e-msg-composer.c:2051
 #: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2106
+#: ../mail/em-folder-view.c:1327
+#: ../mail/message-list.c:2105
 #: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39
+#: ../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 "_Kopiera"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Klistra _in"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
 #: ../calendar/gui/cal-search-bar.c:628
 #: ../calendar/gui/cal-search-bar.c:671
 #: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Alla kategorier"
 
+#: ../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 "Omatchade"
+
 #: ../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 "Sekreterare"
 
@@ -3009,7 +3068,7 @@ msgstr "Biltelefon"
 
 #: ../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
@@ -3017,7 +3076,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../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 "Företag"
 
@@ -3066,22 +3125,22 @@ msgid "Journal"
 msgstr "Dagbok"
 
 #: ../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 "Manager"
 
 #: ../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 "Mobiltelefon"
 
 #: ../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 "Smeknamn"
 
 #: ../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 "Notering"
 
@@ -3110,14 +3169,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:577
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Roll"
 
 #: ../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 "Partner"
 
@@ -3295,66 +3354,66 @@ msgstr "Markerad"
 msgid "Has Cursor"
 msgstr "Har markör"
 
-#: ../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 "_Öppna länk i webbläsare"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2792
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2757
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: ../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 "_Skicka nytt meddelande till..."
 
-#: ../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 "Kopiera _e-postadress"
 
 # Osäker
-#: ../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 "(karta)"
 
 # Osäker
-#: ../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 "karta"
 
 # Osäker
-#: ../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 "Listmedlemmar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Avdelning"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Videochatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:93
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2451
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3366,54 +3425,48 @@ msgstr "Videochatt"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../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 "Ledig/Upptagen"
 
-#: ../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 "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Hemsida"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Webblogg"
 
-#: ../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:2538
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: ../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:2539
 msgid "Anniversary"
 msgstr "Jubileum"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Hemsida"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Webblogg"
 
@@ -3447,7 +3500,7 @@ msgstr "Ingen självkontakt definierad"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
@@ -3469,12 +3522,12 @@ msgstr "Protokollet stöds inte"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:642
-#: ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:653
+#: ../calendar/gui/print.c:2564
 msgid "Canceled"
 msgstr "Avbruten"
 
@@ -3485,12 +3538,13 @@ msgstr "Kunde inte avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
@@ -3526,31 +3580,30 @@ msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden stöds inte"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-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"
+#, fuzzy
+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 "Vi kunde inte öppna denna adressbok. Detta betyder antingen att denna bok inte är markerad för frånkopplad användning eller att den ännu inte är hämtad för frånkopplad användning. Läs in adressboken en gång i anslutet läge för att hämta dess innehåll"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
 msgstr "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen %s finns och att du har behörighet att komma åt den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "Vi kunde inte öppna denna adressbok. Detta betyder antingen att du har angett en felaktig URI eller att LDAP-servern inte går att komma åt."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
-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."
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+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 "Denna version av Evolution har inte LDAP-stöd inkompilerat. Om du vill använda LDAP i Evolution måste du installera ett Evolution-paket som har LDAP-stöd aktiverat."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
-msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "Vi kunde inte öppna denna adressbok. Detta betyder antingen att du har angett en felaktig URI eller att servern inte går att komma åt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
-msgid "Detailed error:"
-msgstr "Detaljerat fel:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "Detaljerat felmeddelande:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3562,10 +3615,11 @@ msgstr ""
 "Gör din sökning mer specifik eller öka resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
 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 ""
@@ -3574,45 +3628,45 @@ msgstr ""
 "specifik eller öka resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Bakänden för denna adressbok kunde inte tolka denna fråga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr "Bakänden för denna adressbok vägrade att genomföra denna fråga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:190
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
-#: ../addressbook/gui/widgets/eab-gui-util.c:688
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:638
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3627,16 +3681,16 @@ msgstr[1] ""
 "Att öppna %d kontakter kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kontakter?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "Visa _inte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:326
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Visa _alla kontakter"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3645,65 +3699,65 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:356
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Skriv över"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-#: ../addressbook/gui/widgets/eab-gui-util.c:400
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakter"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:483
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:749
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Flytta kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Kopiera kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Flytta kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Kopiera kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Flera vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard för %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:921
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:949
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformation för %s"
@@ -3934,7 +3988,7 @@ msgstr "Skuggning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
 #: ../plugins/exchange-operations/exchange-calendar.c:236
 #: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
@@ -3965,27 +4019,6 @@ msgstr "Bredd:"
 msgid "_Font..."
 msgstr "_Typsnitt..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Test av stilredigeraren för kontaktutskrifter"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright © 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Detta bör testa redigerarwidgeten för stilen på kontaktutskrifter"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Test av utskrift av kontakter"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Detta bör testa koden för utskrift av kontakter"
-
 #: ../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
@@ -4160,240 +4193,263 @@ msgstr "Är du säker på att du vill skicka mötet utan en sammanfattning?"
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Är du säker på att du vill skicka uppgiften utan en sammanfattning?"
 
+#: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Calendar repository is offline."
+msgstr "Lagret frånkopplat"
+
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Kan inte skapa ett nytt evenemang"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Kan inte spara evenemang"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Ta bort kalendern \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Ta bort memolistan \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Ta bort uppgiftslistan \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Skicka i_nte"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hämtning pågår. Vill du spara mötet?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hämtning pågår. Vill du spara uppgiften?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Redigerare kunde inte läsas in."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "E-posta inbjudningar till alla deltagare och låt dem acceptera denna uppgift."
 
 # Vad är RSVP?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "E-postinbjudningar kommer att skickas ut till alla deltagare och möjliggöra för dem att svara."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Fel vid inläsning av kalendern"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Fel vid inläsning av memolista"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Fel vid inläsning av uppgiftslista"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "Fel på \"{0}\""
+
+#: ../calendar/calendar.error.xml.h:45
 msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
 msgstr "Om du inte skickar ett avbokningsmeddelande kan det hända att de andra deltagarna inte vet om att sammanträdet är avbokat."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
 msgstr "Om du inte skickar ett avbokningsmeddelande kan det hända att de andra deltagarna inte vet om att memot är borttaget."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
 msgstr "Om du inte skickar ett avbokningsmeddelande kan det hända att de andra deltagarna inte vet om att uppgiften är borttagen."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "Inget svar från servern."
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "Save Appointment"
 msgstr "Spara möte"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:50
 msgid "Save Memo"
 msgstr "Spara memo"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid "Save Task"
 msgstr "Spara uppgift"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "Att skicka uppdaterad information möjliggör för andra deltagare att hålla sina kalendrar uppdaterade."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "Att skicka uppdaterad information möjliggör för andra deltagare att hålla sina uppgiftslistor uppdaterade."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "Det finns några bilagor som hämtas. Att spara mötet kommer att göra att mötet sparas utan dessa kvarvarande bilagor."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "Det finns några bilagor som hämtas. Att spara uppgiften kommer att göra att uppgiften sparas utan dessa kvarvarande bilagor."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "En del funktioner kanske inte fungerar korrekt med din nuvarande server."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalendern har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Evolution-kalendern har oväntat avslutats."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-memot har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-uppgifterna har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalendern är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Memolistan är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Uppgiftslistan är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Denna kalender kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Denna memolista kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Denna uppgiftslista kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "Kunde inte läsa in kalendern"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vill du spara dina ändringar i detta möte?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vill du spara dina ändringar i detta memo?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Vill du spara dina ändringar i denna uppgift?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vill du skicka ett avbokningsmeddelande för detta memo?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vill du skicka ett avbokningsmeddelande till alla deltagare?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vill du skicka ut sammanträdesinbjudningar till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Vill du skicka denna uppgift till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vill du skicka uppdaterad sammanträdesinformation till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vill du skicka uppdaterad uppgiftsinformation till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../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 "Du ansluter till en GroupWise-server som inte stöds och kan råka ut för problem vid användningen av Evolution. För bästa resultat bör servern uppgraderas till en version som stöds."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har gjort ändringar i detta möte, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har gjort ändringar i denna uppgift, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har gjort ändringar i detta memo, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Dina kalendrar kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Dina memon kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Dina uppgifter kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Förkasta _ändringar"
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Spara ändringar"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../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 "_Skicka"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_Skicka meddelande"
 
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
@@ -4440,13 +4496,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Kunde inte skriva pilotens att-göra-programblock"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2432
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/calendar-component.c:1429
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4487,25 +4543,25 @@ msgid "Memo_s"
 msgstr "Mem_o"
 
 #: ../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:575
-#: ../calendar/gui/memos-component.c:1128
-#: ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278
+#: ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821
+#: ../calendar/gui/memos-component.c:595
+#: ../calendar/gui/memos-component.c:913
+#: ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Memon"
 
 #: ../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:566
-#: ../calendar/gui/tasks-component.c:1117
-#: ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/e-calendar-table.c:714
+#: ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689
+#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586
+#: ../calendar/gui/tasks-component.c:908
+#: ../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
@@ -4520,7 +4576,9 @@ msgstr "Uppgifter"
 msgid "_Calendars"
 msgstr "_Kalendrar"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../plugins/pst-import/pst-importer.c:331
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Uppgifter"
@@ -4529,27 +4587,28 @@ msgstr "_Uppgifter"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionkalenderns alarmnotifieringstjänst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timmar"
 msgstr[1] "timmar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Starttid"
 
@@ -4560,10 +4619,10 @@ msgstr "Möten"
 
 #. 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
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "Plats:"
 
@@ -4572,14 +4631,18 @@ msgid "Snooze _time:"
 msgstr "Slumringsti_d:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1336
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:169
+#: ../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-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25
@@ -4588,40 +4651,40 @@ msgstr "Slumringsti_d:"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "_Slumra"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "platsen för mötet"
 
-#: ../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 "Ingen sammanfattning finns tillgänglig."
 
-#: ../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 "Ingen beskrivning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Ingen platsinformation finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarm"
 
-#: ../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 "Varning"
 
-#: ../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"
@@ -4633,7 +4696,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: ../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"
@@ -4649,7 +4712,7 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta 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 "Fråga mig inte om detta program igen."
 
@@ -4702,403 +4765,454 @@ msgid "Alarm programs"
 msgstr "Alarmprogram"
 
 #: ../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 "Den tidsperiod i sekunder som felet ska visas på statusraden."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Fråga efter bekräftelse vid borttagning av objekt"
 
-#: ../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 "Bakgrundsfärg på uppgifter som ska genomföras idag, i \"#rrggbb\"-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Bakgrundsfärg på uppgifter som skulle ha genomförts, i \"#rrggbb\"-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Kalendrar att köra alarm för"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Färg att rita Marcus Bains-linjen med i tidsraden (tomt för standardalternativet)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Färg att rita Marcus Bains-linjen med i dagsvyn."
 
-#: ../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 "Komprimera helger i månadsvyn"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Bekräfta tömning"
 
-#: ../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 "Dagar på vilka början och slutet av arbetstiden ska indikeras."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Standardmötespåminnelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Standardpåminnelseenheter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Standardpåminnelsevärde"
 
-#: ../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 för sparade alarmljudfiler"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Evenemangsgradient"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Genomskinlighet för evenemang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL:er för ledig-/upptagenserver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "URL för ledig-/upptagenmall"
 
-#: ../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 för evenemang i kalendervyer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Dölj färdiga uppgifter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Dölj uppgiftsenheter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Dölj uppgiftsvärde"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Horisontell panelposition"
 
-#: ../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 "Timme som arbetsdagen slutar, i tjugofyratimmarsformat, 0 till 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 "Timme som arbetsdagen börjar, i tjugofyratimmarsformat, 0 till 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 "Intervall som visas i dags- och arbetsveckovyerna, i minuter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Senaste alarmtid"
 
-#: ../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 "Nivå bortom vilken meddelandet ska loggas."
+
+#: ../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 med server-url:er för ledig-/upptagenpublicering."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../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 "Färg på Marcus Bains-linje - Dagsvy"
 
-#: ../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 "Färg på Marcus Bains-linje - Tidsrad"
 
+#: ../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 ""
+
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut som arbetsdagen slutar, 0 till 59."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut som arbetsdagen börjar, 0 till 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 "Horisontell panelposition för månadsvyn"
 
-#: ../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 "Vertikal panelposition för månadsvyn"
 
-#: ../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 "Antal enheter för att bestämma en standardpåminnelse."
 
-#: ../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 "Antal enheter för avgörande av när uppgifter ska döljas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Färg på uppgifter som skulle ha genomförts"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "Position för den horisontella panelen, mellan datumbläddrarkalendern och uppgiftslistan när månadsvyn inte används, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Position för den horisontella panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "Position för den vertikala panelen, mellan kalenderlistorna och datumnavigeringskalendern."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "Position för den vertikala panelen, mellan uppgiftslistan och uppgiftsförhandsgranskningspanelen, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Position för den vertikala panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn, i bildpunkter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "Position för den vertikala panelen, mellan vyn och datumbläddrarkalendern och uppgiftslistan i månadsvyn när månadsvyn inte används, i bildpunkter."
 
-#: ../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 "Program som tillåts att köra som en del av alarm."
 
-#: ../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 för sparade alarmljud"
 
-#: ../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 "Visa OSA-fältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../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 "Visa rollfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../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 "Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: ../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 "Visa kategorierfältet i evenemang/sammanträde/uppgiftsredigeraren"
 
-#: ../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 "Visa visningsalarm i notifieringslådan"
 
-#: ../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 "Visa statusfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../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 "Visa panelen \"Förhandsvisning\""
 
-#: ../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 "Visa panelen \"Förhandsvisning\"."
 
-#: ../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 "Visa tidszonfältet i evenemang/sammanträdesredigeraren"
 
-#: ../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 "Visa typfältet i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
+msgstr "Visa veckonummer i datumbläddraren"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Visa veckonummer i datumbläddraren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Färg på uppgifter som ska genomföras idag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Vertikal panelposition för uppgifter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 msgstr "URL-mallen att använda som en reserv för ledig-/upptagendata, %u ersätts av användardelen av e-postadressen, och %d ersätts av domänen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "Standardstidszonen att använda för datum och tider i kalendern, som en oöversatt Olsen-tidszonsdatabasplats som till exempel \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "Denna kan ha tre möjliga värden. \"0\" för fel. \"1\" för varningar. \"2\" för felsökningsmeddelanden."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Tidsuppdelningar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid som senaste alarmet körde, i time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
 msgstr "Genomskinlighet för evenemang i kalendervyer, ett värde mellan 0 (genomskinlig) och 1 (opak)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "Tjugofyratimmarstidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enheter för en standardpåminnelse, \"minutes\" (minuter), \"hours\" (timmar) eller \"days\" (dagar)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enheter för avgörande av när uppgifter ska döljas, \"minutes\" (minuter), \"hours\" (timmar) eller \"days\" (dagar)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Veckan börjar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Veckodag som veckan börjar, från söndag (0) till lördag (6)."
 
 # Osäker
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Huruvida notifieringslådan ska användas för visning av alarm eller inte."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av ett möte eller en uppgift."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Huruvida det ska frågas efter bekräftelse vid borttagning av möten och uppgifter."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "Huruvida veckoslut ska komprimeras i månadsvyn, vilket placerar lördag och söndag i utrymmet för en veckodag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Huruvida sluttiderna på möten i vecko- och månadsvyerna ska visas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Huruvida Marcus Bains-linjen (linjen vid aktuell tid) ska ritas i kalendern."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Huruvida färdigställda uppgifter i uppgiftsvyn ska döljas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "Huruvida en standardpåminnare för möten ska ställas in."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Huruvida OSA-fältet ska visas i evenemang/uppgift/sammanträdesredigeraren."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Huruvida kategorierfältet ska visas i evenemang/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Huruvida rollfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Huruvida statusfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Huruvida tider ska visas i 24-timmarsformat istället för fm/em."
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Huruvida tidszonfältet ska visas i evenemang/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Huruvida typfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Huruvida veckonummer ska visas i datumbläddraren."
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Huruvida veckonummer ska visas i datumbläddraren."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Huruvida sommartid skall användas vid visning av evenemang."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Arbetsdagar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Timme som arbetsdagen slutar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minut som arbetsdagen slutar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Timme som arbetsdagen börjar"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minut som arbetsdagen börjar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "sommartid"
 
@@ -5122,12 +5236,6 @@ msgstr "Kommentaren innehåller"
 msgid "Location contains"
 msgstr "Platsen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:632
-#: ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "Omatchade"
-
 #: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Uppgifter de närmsta 7 dagarna"
@@ -5156,7 +5264,7 @@ msgstr "Aktiva möten"
 msgid "Next 7 Days' Appointments"
 msgstr "Möten de närmsta 7 dagarna"
 
-#: ../calendar/gui/calendar-commands.c:93
+#: ../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
@@ -5165,138 +5273,149 @@ msgstr "Möten de närmsta 7 dagarna"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:318
+#: ../calendar/gui/calendar-commands.c:315
 msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr "Denna åtgärd kommer att permanent ta bort alla evenemang äldre än den valda mängden tid. Om du fortsätter kommer du inte att kunna återställa dessa evenemang."
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Töm evenemang äldre än"
 
-#: ../calendar/gui/calendar-commands.c:329
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../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:654
+#: ../plugins/google-account-setup/google-contacts-source.c:368
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dag"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:241
+#: ../calendar/gui/memos-component.c:244
 #: ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604
 #: ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
 msgid "On The Web"
 msgstr "På webben"
 
-#: ../calendar/gui/calendar-component.c:310
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333
 #: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Födelsedagar och jubileum"
 
+#. ensure the group name is in current locale, not read from configuration
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Väder"
 
-#: ../calendar/gui/calendar-component.c:640
+#: ../calendar/gui/calendar-component.c:676
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:641
-#: ../calendar/gui/memos-component.c:490
-#: ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:509
+#: ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../calendar/gui/calendar-component.c:645
-#: ../calendar/gui/memos-component.c:494
-#: ../calendar/gui/tasks-component.c:485
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:514
+#: ../calendar/gui/tasks-component.c:505
 msgid "_Make available for offline use"
 msgstr "_Gör tillgänglig för användning i frånkopplat läge"
 
-#: ../calendar/gui/calendar-component.c:646
-#: ../calendar/gui/memos-component.c:495
-#: ../calendar/gui/tasks-component.c:486
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:515
+#: ../calendar/gui/tasks-component.c:506
 msgid "_Do not make available for offline use"
 msgstr "Gör _inte tillgänglig i frånkopplat läge"
 
-#: ../calendar/gui/calendar-component.c:976
+#: ../calendar/gui/calendar-component.c:1013
 msgid "Failed upgrading calendars."
 msgstr "Misslyckades med att uppgradera kalendrar."
 
-#: ../calendar/gui/calendar-component.c:1275
+#: ../calendar/gui/calendar-component.c:1142
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan inte öppna kalendern \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:1158
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Det finns ingen kalender tillgänglig för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/calendar-component.c:1404
+#: ../calendar/gui/calendar-component.c:1271
 msgid "Calendar Source Selector"
 msgstr "Väljare för kalenderkälla"
 
-#: ../calendar/gui/calendar-component.c:1623
+#: ../calendar/gui/calendar-component.c:1487
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1624
+#: ../calendar/gui/calendar-component.c:1488
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: ../calendar/gui/calendar-component.c:1625
+#: ../calendar/gui/calendar-component.c:1489
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1631
+#: ../calendar/gui/calendar-component.c:1495
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1632
+#: ../calendar/gui/calendar-component.c:1496
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1633
+#: ../calendar/gui/calendar-component.c:1497
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: ../calendar/gui/calendar-component.c:1639
+#: ../calendar/gui/calendar-component.c:1503
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1640
+#: ../calendar/gui/calendar-component.c:1504
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Hel_dagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1641
+#: ../calendar/gui/calendar-component.c:1505
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1647
+#: ../calendar/gui/calendar-component.c:1511
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1648
+#: ../calendar/gui/calendar-component.c:1512
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1649
+#: ../calendar/gui/calendar-component.c:1513
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -5316,268 +5435,143 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: ../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 "Alla fält"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6
-#: ../mail/em-filter-i18n.h:21
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: ../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 "Deltagare"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Arbete"
-
-#: ../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 "Kategori"
 
-#: ../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 "Klassifikation"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Konkurrans"
-
-#: ../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:352
+#: ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: ../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 "Beskrivning"
 
-#: ../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 "Beskrivningen innehåller"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/em-filter-i18n.h:41
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "finns"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Favoriter"
-
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Presenter"
-
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Mål"
-
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Semester"
-
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Semestervykort"
-
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Viktiga kontakter"
-
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Idéer"
-
-#: ../calendar/gui/caltypes.xml.h:23
-#: ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Internationellt"
-
-#: ../calendar/gui/caltypes.xml.h:24
-#: ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Viktig kund"
-
-# Felstavat... borde buggrapporteras.
-#: ../calendar/gui/caltypes.xml.h:26
-#: ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: ../calendar/gui/caltypes.xml.h:27
-#: ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Närmsta 7 dagarna"
-
-#: ../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 "Organisatör"
 
-#: ../calendar/gui/caltypes.xml.h:30
-#: ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Telefonsamtal"
-
-#: ../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:350
+#: ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:32
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/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:341
+#: ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Publikt"
 
-#: ../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 "Upprepning"
 
-#: ../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:86
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/caltypes.xml.h:35
-#: ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Strategier"
-
-#: ../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/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: ../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 "Sammanfattningen innehåller"
 
-#: ../calendar/gui/caltypes.xml.h:38
-#: ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Leverantörer"
-
-#: ../calendar/gui/caltypes.xml.h:39
-#: ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Tid och utlägg"
-
-#: ../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 "Väntar"
-
-#: ../calendar/gui/caltypes.xml.h:42
-#: ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47
-#: ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "innehåller"
 
-#: ../calendar/gui/caltypes.xml.h:43
-#: ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48
-#: ../mail/em-filter-i18n.h:32
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: ../calendar/gui/caltypes.xml.h:44
-#: ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49
-#: ../mail/em-filter-i18n.h:46
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "är"
 
-#: ../calendar/gui/caltypes.xml.h:45
-#: ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52
-#: ../mail/em-filter-i18n.h:52
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "är inte"
 
@@ -5593,8 +5587,8 @@ msgstr "Metoden stöds inte vid öppnande av kalendern"
 msgid "Permission denied to open the calendar"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
-#: ../calendar/gui/comp-editor-factory.c:433
-#: ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439
+#: ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -5718,25 +5712,57 @@ msgid "A_dd"
 msgstr "L_ägg till"
 
 #: ../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 "Alarm"
 
-#: ../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 "_Föreslå automatisk visning av bilaga"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305
+#: ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Ingen"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Markerade kalendrar för alarm"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Visa _fält i vy"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5750,21 +5776,21 @@ msgstr ""
 "10 minuter\n"
 "05 minuter"
 
-#: ../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 och %d kommer att ersättas med användaren och domänen från e-postadressen.</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\">Varningar</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\">Standard ledig-/upptagenserver</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>"
@@ -5772,37 +5798,37 @@ msgstr "<span weight=\"bold\">Allmänt</span>"
 
 # Finns både med <b> och <span blah blah. Varför?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61078
-#: ../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\">Uppgiftslista</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\">Tid</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\">Arbetsvecka</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 "Justera för s_ommartid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Dagen _slutar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Visning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "fredag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5812,13 +5838,13 @@ msgstr ""
 "timmar\n"
 "dagar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "måndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5836,151 +5862,167 @@ msgstr ""
 "Lördag\n"
 "Söndag"
 
-#: ../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 "Välj en färg"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_sön"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "lördag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "An_dra tidszon:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Välj kalendrar för alarmnotifiering"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "_Visa en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "Visa en p_åminnelse"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Visa vec_konummer i vy för dag och arbetsvecka"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "söndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "U_ppgifter som ska genomföras idag:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "to_r"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Mall:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Tids_zon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "onsdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "Vec_kan börjar på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Arbetsdagar:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12-timmars (FM/EM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24-timmars"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "T_ryck ihop helger i månadsvyn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "_Dagen börjar:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_fre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Dölj färdiga uppgifter efter"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_mån"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "Uppgi_fter som skulle ha genomförts:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_lör"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "_Tidsuppdelningar:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "t_is"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "_ons"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "före varje möte"
 
@@ -6032,46 +6074,46 @@ msgstr "Egenskaper för uppgiftslista"
 msgid "New Memo List"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Detta memo har tagits bort."
 
-#: ../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  Du har gjort ändringar. Glöm dessa ändringar och stäng redigeraren?"
 
-#: ../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  Du har inte gjort några ändringar, stäng redigeraren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Detta memo har ändrats."
 
-#: ../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  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
-#: ../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  Du har inte gjort några ändringar, uppdatera redigeraren?"
@@ -6082,162 +6124,167 @@ msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/print.c:2365
 msgid " to "
 msgstr " till "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/print.c:2369
 msgid " (Completed "
 msgstr " (Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2364
+#: ../calendar/gui/print.c:2371
 msgid "Completed "
 msgstr "Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/print.c:2376
 msgid " (Due "
 msgstr " (Ska genomföras "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2378
 msgid "Due "
 msgstr "Ska genomföras "
 
-#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bifogat meddelande - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:241
-#: ../calendar/gui/dialogs/comp-editor.c:414
-#: ../composer/e-msg-composer.c:1766
-#: ../composer/e-msg-composer.c:1985
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417
+#: ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Bifogat meddelande"
 msgstr[1] "%d bifogade meddelanden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:485
-#: ../composer/e-msg-composer.c:2053
+#: ../calendar/gui/dialogs/comp-editor.c:488
+#: ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006
 #: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2107
+#: ../mail/em-folder-view.c:1188
+#: ../mail/message-list.c:2106
 msgid "_Move"
 msgstr "_Flytta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../composer/e-msg-composer.c:2055
+#: ../calendar/gui/dialogs/comp-editor.c:490
+#: ../composer/e-msg-composer.c:2054
 #: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2109
+#: ../mail/message-list.c:2108
 msgid "Cancel _Drag"
 msgstr "Avbryt _dragning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
-#: ../calendar/gui/dialogs/comp-editor.c:3257
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 #: ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "bilaga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:846
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:941
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sammanträde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tilldelad uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Ingen sammanfattning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Klicka här för att stänga aktuellt fönster"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiera markerad text till urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut markerad text till urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Klicka här för att visa tillgänglig hjälp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Klistra in text från urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Klicka här för att spara aktuellt fönster"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Markera all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "_Klassifikation"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1364
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371
-#: ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417
+#: ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
@@ -6246,148 +6293,148 @@ msgstr "_Alternativ"
 msgid "_View"
 msgstr "_Visa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1381
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Bilaga..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1383
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Klicka här för att bifoga en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1391
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1393
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Växlar huruvida kategorier ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1399
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "Tids_zon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Växlar huruvida tidszonen ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Klassificera som publik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Klassificera som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1424
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Klassificera som konfidentiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1434
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "_Rollfältet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Växlar huruvida rollfältet ska visas"
 
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_OSA"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Växlar huruvida OSA-fältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1450
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "_Statusfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1452
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Växlar huruvida statusfältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "_Typfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Växlar huruvida Deltagartyp ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1774
-#: ../composer/e-composer-private.c:66
-#: ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64
+#: ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Senaste _dokument"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1793
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Bifoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1888
+#: ../calendar/gui/dialogs/comp-editor.c:1942
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> bilaga"
 msgstr[1] "<b>%d</b> bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:1974
 msgid "Hide Attachment _Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2042
-#: ../calendar/gui/dialogs/event-page.c:1875
-#: ../calendar/gui/dialogs/task-page.c:1197
-#: ../composer/e-msg-composer.c:1040
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201
+#: ../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 "_Ta bort"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2045
-#: ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lägg till bilaga..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2381
 msgid "Show Attachments"
 msgstr "Visa bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2254
+#: ../calendar/gui/dialogs/comp-editor.c:2303
 msgid "Press space key to toggle attachment bar"
 msgstr "Tryck på blankstegstangenten för att växla bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2398
-#: ../calendar/gui/dialogs/comp-editor.c:2445
-#: ../calendar/gui/dialogs/comp-editor.c:3290
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering kommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3319
+#: ../calendar/gui/dialogs/comp-editor.c:3377
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
@@ -6407,51 +6454,51 @@ msgstr "Målet är skrivskyddat"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ta bort detta objekt från alla andra mottagares brevlådor?"
 
-#: ../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 "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: ../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 "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: ../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 "Memot kunde inte tas bort på grund av ett corba-fel"
 
-#: ../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 "Objektet kunde inte tas bort på grund av ett corba-fel"
 
-#: ../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 "Evenemanget kunde inte tas bort på grund av att åtkomst nekades"
 
-#: ../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 "Uppgiften kunde inte tas bort på grund av att åtkomst nekades"
 
-#: ../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 "Memot kunde inte tas bort på grund av åtkomst nekades"
 
-#: ../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 "Objektet kunde inte tas bort på grund av åtkomst nekades"
 
-#: ../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 "Evenemanget kunde inte tas bort på grund av ett fel"
 
-#: ../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 "Uppgiften kunde inte tas bort på grund av ett fel"
 
-#: ../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 "Memot kunde inte tas bort på grund av ett fel"
 
-#: ../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 "Objektet kunde inte tas bort på grund av ett fel"
 
@@ -6468,189 +6515,167 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Alarm"
 
-#: ../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 "Klicka här för att ställa in eller ta bort alarm för detta evenemang"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "Upp_repning"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Gör detta till ett återkommande evenemang"
 
-#: ../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 "Alternativ för sändning"
 
-#: ../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 "Infoga avancerade sändningsalternativ"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Hel_dagsevenemang"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Växlar huruvida heldagsevenemang ska användas"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Visa tid som _upptagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Växlar huruvida tid ska visas som upptagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Ledig/Upptagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Fråga efter ledig-/upptageninformation för deltagarna"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "_Möte"
 
-#: ../calendar/gui/dialogs/event-page.c:735
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2725
 msgid "This event has alarms"
 msgstr "Detta evenemang har alarm"
 
-#: ../calendar/gui/dialogs/event-page.c:798
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisatör:"
 
-#: ../calendar/gui/dialogs/event-page.c:844
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:846
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Delta_gare"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Evenemang utan startdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1202
-#: ../calendar/gui/dialogs/memo-page.c:640
-#: ../calendar/gui/dialogs/task-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1212
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1235
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1405
-#: ../calendar/gui/dialogs/memo-page.c:681
-#: ../calendar/gui/dialogs/task-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: ../calendar/gui/dialogs/event-page.c:1411
-#: ../calendar/gui/dialogs/memo-page.c:687
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: ../calendar/gui/dialogs/event-page.c:1436
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Lägg till "
 
-#: ../calendar/gui/dialogs/event-page.c:2594
+#: ../calendar/gui/dialogs/event-page.c:2601
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan inte öppna kalendern \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2638
-#: ../calendar/gui/dialogs/memo-page.c:890
-#: ../calendar/gui/dialogs/task-page.c:1797
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du arbetar på uppdrag av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2918
+#: ../calendar/gui/dialogs/event-page.c:2925
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag före möte"
 msgstr[1] "%d dagar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2931
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d timme före möte"
 msgstr[1] "%d timmar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut före möte"
 msgstr[1] "%d minuter före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:2950
 msgid "Customize"
 msgstr "Anpassa"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2948
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158
-#: ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684
-#: ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2088
-#: ../widgets/misc/e-cell-date-edit.c:306
-#: ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Ingen"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dag före möte"
@@ -6726,17 +6751,17 @@ msgstr "Ko_ntakter..."
 msgid "Organizer:"
 msgstr "Organisatör:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141
-#: ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111
+#: ../calendar/gui/print.c:2485
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:851
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan inte öppna memon i \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1006
+#: ../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
@@ -6757,44 +6782,44 @@ msgid "T_o:"
 msgstr "T_ill:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:364
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../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 "Du ändrar ett återkommande evenemang. Vad vill du ändra?"
 
-#: ../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 "Du delegerar ett återkommande evenemang. Vad vill du delegera?"
 
-#: ../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 "Du ändrar en återkommande uppgift. Vad vill du ändra?"
 
-#: ../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 "Du ändrar ett återkommande memo. Vad vill du ändra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Endast denna instans"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Denna och tidigare instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Denna och framtida instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Alla instanser"
 
@@ -6806,9 +6831,13 @@ msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 msgid "Recurrence date is invalid"
 msgstr "Upprepningsdatumet är ogiltigt"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "vid"
 
@@ -6816,7 +6845,7 @@ msgstr "vid"
 #. * (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 "första"
 
@@ -6826,7 +6855,7 @@ msgstr "första"
 #. * (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 "sekund"
 
@@ -6834,7 +6863,7 @@ msgstr "sekund"
 #. * (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 "tredje"
 
@@ -6842,7 +6871,7 @@ msgstr "tredje"
 #. * (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 "fjärde"
 
@@ -6850,13 +6879,13 @@ msgstr "fjärde"
 #. * (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 "sista"
 
 #. 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 "Annat datum"
 
@@ -6864,7 +6893,7 @@ msgstr "Annat datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "Första till tionde"
 
@@ -6872,7 +6901,7 @@ msgstr "Första till tionde"
 #. * 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 "elfte till tjugonde"
 
@@ -6880,45 +6909,45 @@ msgstr "elfte till tjugonde"
 #. * 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 "tjugoförsta till trettiförsta"
 
 #. 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 "dag"
 
 #. 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 "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "förekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Lägg till undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Kunde inte få ett val att ändra."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Ändra undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Kunde inte få ett val att ta bort."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Datum/tid"
 
@@ -6969,6 +6998,10 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "år"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "Skicka mina alarm med denna händelse"
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6989,64 +7022,64 @@ msgstr "<span weight=\"bold\">Status</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:2561
+#: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Färdigt"
 
 #: ../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:1066
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Hög"
 
 #: ../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:2558
 msgid "In Progress"
 msgstr "Pågår"
 
 #: ../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:1064
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Låg"
 
 #: ../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:1065
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006
+#: ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:639
-#: ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-calendar-table.c:650
+#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Inte påbörjad"
 
@@ -7059,8 +7092,8 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../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 "Odefinierad"
 
@@ -7087,28 +7120,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "Klicka för att ändra eller visa statusdetaljer för uppgiften"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "Alternativ för _sändning"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Uppgiftsdetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:372
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organisa_tör:"
 
-#: ../calendar/gui/dialogs/task-page.c:785
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: ../calendar/gui/dialogs/task-page.c:1754
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
@@ -7205,59 +7238,59 @@ msgstr "%s klockan %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd utlösartyp"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73
-#: ../mail/em-folder-view.c:3312
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67
+#: ../mail/em-folder-view.c:3273
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177
+#: ../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 "Namnlös"
 
-#: ../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 "Startdatum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4
 #: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../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 "Webbsida:"
 
-#: ../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 "Sammanfattning:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Förfallodatum:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Prioritet:"
 
@@ -7271,13 +7304,13 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: ../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 "Ledig"
 
 #: ../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 "Upptagen"
 
@@ -7292,83 +7325,83 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029
-#: ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029
-#: ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nej"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350
+#: ../calendar/gui/e-cal-model.c:354
 #: ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123
 #: ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c: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
+#: ../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:2113
+#: ../plugins/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Tilldelad"
 
 #: ../calendar/gui/e-cal-popup.c:184
-#: ../mail/em-popup.c:416
+#: ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Spara som..."
 
 #: ../calendar/gui/e-cal-popup.c:200
-#: ../mail/em-format-html-display.c:2035
+#: ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Välj mapp att spara markerade bilagor i..."
 
 #: ../calendar/gui/e-cal-popup.c:232
-#: ../mail/em-popup.c:444
+#: ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namnlös_bild.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286
-#: ../calendar/gui/e-calendar-table.c:1578
-#: ../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-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1776
+#: ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1338
+#: ../mail/em-popup.c:559
+#: ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Spara som..."
 
 #: ../calendar/gui/e-cal-popup.c:287
-#: ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Spara som _bakgrund"
 
@@ -7377,7 +7410,7 @@ msgid "_Save Selected"
 msgstr "_Spara markerade"
 
 #: ../calendar/gui/e-cal-popup.c:430
-#: ../mail/em-popup.c:832
+#: ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
@@ -7388,7 +7421,7 @@ msgstr "* Ingen sammanfattning *"
 
 #. 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:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisatör: %s <%s>"
@@ -7396,7 +7429,7 @@ msgstr "Organisatör: %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:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisatör: %s"
@@ -7409,88 +7442,88 @@ msgstr "Start: "
 msgid "Due: "
 msgstr "Ska genomföras: "
 
-#: ../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:672
+#: ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: ../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:1172
+#: ../calendar/gui/e-calendar-view.c:837
+#: ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1350
-#: ../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:1360
+#: ../calendar/gui/e-calendar-view.c:1298
+#: ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "Ny _uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-memo-table.c:923
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: ../calendar/gui/e-calendar-table.c:1579
-#: ../calendar/gui/e-calendar-view.c:1656
-#: ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-memo-table.c:925
 msgid "P_rint..."
 msgstr "Skriv _ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1676
-#: ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-memo-table.c:929
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -7498,49 +7531,49 @@ msgstr "Skriv _ut..."
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1659
-#: ../calendar/gui/e-calendar-view.c:1678
-#: ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783
+#: ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19
 #: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1600
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark as Incomplete"
 msgstr "_Markera som ej färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Markera markerade uppgifter som ej färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: ../calendar/gui/e-calendar-table.c:1836
+#: ../calendar/gui/e-calendar-table.c:1847
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -7563,7 +7596,7 @@ msgid "Due date"
 msgstr "Förfallodatum"
 
 #: ../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 "Prioritet"
@@ -7572,112 +7605,162 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdatum"
 
-#: ../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:2307
+#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1341
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1650
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "Nytt sa_mmanträde"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Markera i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "Skri_v ut..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Delegera sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../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:1793
+#: ../mail/em-folder-view.c:1332
+#: ../mail/em-popup.c:564
+#: ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1799
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Accepterat"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Avslaget"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Preliminärt"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Delegerat"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "Behöver åtgärd"
+
 #. 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:2419
+#: ../calendar/gui/print.c:2517
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %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 %Y-%m-%d %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 %Y-%m-%d %H.%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"
@@ -7690,11 +7773,15 @@ 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 minutdivisioner"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Visa andra tidszonen"
+
 #. 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
@@ -7702,34 +7789,40 @@ msgstr "%02i minutdivisioner"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-day-view.c:1584
 #: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1674
+#: ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:800
-#: ../calendar/gui/e-week-view.c:540
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:805
+#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:803
-#: ../calendar/gui/e-week-view.c:543
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:808
+#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "em"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "Vecka %d"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja, (Komplex upprepning)"
 
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7739,7 +7832,7 @@ msgstr[1] "Var %d dag"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7749,7 +7842,7 @@ msgstr[1] "Var %d vecka"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: ../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 "
@@ -7757,16 +7850,16 @@ msgstr[0] "Varje vecka på "
 msgstr[1] "Var %d vecka på "
 
 #. 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 " och "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
@@ -7774,7 +7867,7 @@ msgstr "Den %s %s i "
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: ../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,354 +7877,342 @@ msgstr[1] "var %d månad"
 # Detta %d blir inte så lyckat med vissa språk, eftersom en
 # ordningsangivelse och inte bara en siffra krävs.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61082
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Varje år"
 msgstr[1] "Var %d år"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "totalt %d gång"
 msgstr[1] "totalt %d gånger"
 
 #. 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 ", med slut den "
 
 #. 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 "Börjar"
 
 #. 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 "Slutar"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Ska genomföras"
 
-#: ../calendar/gui/e-itip-control.c:1003
-#: ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998
+#: ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: ../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:2101
-msgid "Accepted"
-msgstr "Accepterat"
-
-#: ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Preliminärt accepterat"
 
-#: ../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:2107
-msgid "Declined"
-msgstr "Avslaget"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "Sammanträdet har avbrutits, men det kunde dock inte hittas i dina kalendrar"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "Uppgiften har avbrutits, men den kunde dock inte hittas i dina uppgiftslistor"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat sammanträdesinformation."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Sammanträdesinformation"
 
-#: ../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> begär att %s närvarar vid ett sammanträde."
 
-#: ../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> begär din närvaro vid ett sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Sammanträdesförslag"
 
 #. 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> önskar bli tillagd i ett befintligt sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Sammanträdesuppdatering"
 
-#: ../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> önskar få den senaste sammanträdesinformationen."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Begäran av sammanträdesuppdatering"
 
-#: ../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> har svarat på en sammanträdesbegäran."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Sammanträdessvar"
 
-#: ../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> har avbokat ett sammanträde."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Sammanträdesavbokning"
 
-#: ../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> har skickat ett obegripligt meddelande."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Felaktigt sammanträdesmeddelande"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat uppgiftsinformation."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: ../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> begär att %s genomför en uppgift."
 
-#: ../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> begär att du genomför en uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
 #. 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> önskar bli tillagd i en befintlig uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: ../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> önskar få den senaste uppgiftsinformationen."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: ../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> har svarat på en uppgiftstilldelning."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: ../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> har avbokat en uppgift."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Avbokning av uppgift"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: ../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> begär din ledig-/upptageninformation."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: ../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> har svarat på en ledig-/upptagenbegäran."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: ../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 "Meddelandet verkar inte vara korrekt utformat"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: ../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 "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\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 "Objektet är ogiltigt och kan inte uppdateras\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 "Detta svar är inte från en nuvarande deltagare. Lägg till som deltagare?"
 
-#: ../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 "Deltagarstatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Deltagarstatus är uppdaterad\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1301
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Deltagarstatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: ../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 "Objektet skickat!\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 "Objektet kunde inte skickas!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+# RSVP borde kanske förklaras med en kommentar?
+# http://bugzilla.ximian.com/show_bug.cgi?id=61071
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "OSA"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: ../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 "Avbryt"
@@ -8160,129 +8241,106 @@ msgstr "Läser in kalendern..."
 msgid "Server Message:"
 msgstr "Servermeddelande:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Resurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Deltagare"
 
-#: ../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 "Person"
 
-#: ../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
+#: ../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 "Grupp"
 
-#: ../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 "Resurs"
 
-#: ../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 "Rum"
 
-#: ../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 "Mötesordförande"
 
-#: ../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 "Nödvändig deltagare"
 
-#: ../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 "Valfri deltagare"
 
-#: ../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 "Icke-deltagare"
 
-#: ../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 "Behöver åtgärd"
 
-#: ../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 "Preliminärt"
-
-#: ../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:2110
-msgid "Delegated"
-msgstr "Delegerat"
-
 #. 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:546
 msgid "Attendee                          "
 msgstr "Deltagare                         "
 
-# RSVP borde kanske förklaras med en kommentar?
-# http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#. 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 "OSA"
-
-#: ../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 "Pågår"
 
 #. 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"
 
@@ -8291,7 +8349,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 %Y-%m-%d"
 
@@ -8301,67 +8359,67 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Del_tagare..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: ../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 "_Autovälj"
 
-#: ../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 "_Allt folk och resurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Slutti_d:"
 
@@ -8389,18 +8447,17 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-memo-table.c:940
 msgid "_Delete Selected Memos"
 msgstr "_Ta bort markerade memon"
 
-#: ../calendar/gui/e-memo-table.c:1092
+#: ../calendar/gui/e-memo-table.c:1091
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klicka för att lägga till ett memo"
 
 #: ../calendar/gui/e-memos.c:760
 #: ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8409,17 +8466,17 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Läser in memon"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Öppnar memon i %s"
 
-#: ../calendar/gui/e-memos.c:1062
-#: ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075
+#: ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
@@ -8427,20 +8484,20 @@ msgstr "Tar bort markerade objekt..."
 msgid "Loading tasks"
 msgstr "Läser in uppgifter"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Välj tidszon"
 
@@ -8448,44 +8505,44 @@ msgstr "Välj tidszon"
 #. 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/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "An_passad vy"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Spara anpassad vy"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Definiera vyer..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Läser in möten i %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Läser in uppgifter i %s"
 
 # DENNA BÖR FELRAPPORTERAS!
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Läser in memon på %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Tömmer"
 
@@ -8545,149 +8602,205 @@ msgstr "september"
 msgid "_Select Today"
 msgstr "_Välj idag"
 
-#: ../calendar/gui/itip-utils.c:404
-#: ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410
+#: ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en deltagare krävs"
 
-#: ../calendar/gui/itip-utils.c:626
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:778
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: ../calendar/gui/itip-utils.c:628
-#: ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:781
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: ../calendar/gui/itip-utils.c:630
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:784
 msgid "Memo information"
 msgstr "Memoinformation"
 
-#: ../calendar/gui/itip-utils.c:632
-#: ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638
+#: ../calendar/gui/itip-utils.c:802
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Accepterat"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Preliminärt accepterat"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Avslaget"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegerat"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: ../calendar/gui/memos-component.c:489
+#: ../calendar/gui/memos-component.c:508
 msgid "_New Memo List"
 msgstr "_Ny memolista"
 
-#: ../calendar/gui/memos-component.c:571
+#: ../calendar/gui/memos-component.c:591
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 
-#: ../calendar/gui/memos-component.c:573
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/tasks-component.c:584
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d markerad"
 msgstr[1] ", %d markerade"
 
-#: ../calendar/gui/memos-component.c:620
+#: ../calendar/gui/memos-component.c:640
 msgid "Failed upgrading memos."
 msgstr "Misslyckades med att uppgradera memon."
 
-#: ../calendar/gui/memos-component.c:980
+#: ../calendar/gui/memos-component.c:770
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Kan inte öppna memolistan \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/memos-component.c:993
+#: ../calendar/gui/memos-component.c:783
 msgid "There is no calendar available for creating memos"
 msgstr "Det finns ingen kalender tillgänglig för skapande av memon"
 
-#: ../calendar/gui/memos-component.c:1103
+#: ../calendar/gui/memos-component.c:893
 msgid "Memo Source Selector"
 msgstr "Väljare för memokälla"
 
-#: ../calendar/gui/memos-component.c:1287
+#: ../calendar/gui/memos-component.c:1072
 msgid "New memo"
 msgstr "Nytt memo"
 
-#: ../calendar/gui/memos-component.c:1288
+#: ../calendar/gui/memos-component.c:1073
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1289
+#: ../calendar/gui/memos-component.c:1074
 msgid "Create a new memo"
 msgstr "Skapa ett nytt memo"
 
-#: ../calendar/gui/memos-component.c:1295
+#: ../calendar/gui/memos-component.c:1080
 msgid "New shared memo"
 msgstr "Nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1296
+#: ../calendar/gui/memos-component.c:1081
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Delat memo"
 
-#: ../calendar/gui/memos-component.c:1297
+#: ../calendar/gui/memos-component.c:1082
 msgid "Create a shared new memo"
 msgstr "Skapa ett nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1303
+#: ../calendar/gui/memos-component.c:1088
 msgid "New memo list"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/memos-component.c:1304
+#: ../calendar/gui/memos-component.c:1089
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Memoli_sta"
 
-#: ../calendar/gui/memos-component.c:1305
+#: ../calendar/gui/memos-component.c:1090
 msgid "Create a new memo list"
 msgstr "Skapa en ny memolista"
 
-#: ../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 "Skriv ut memon"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Närmsta 7 dagarna"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
@@ -8734,273 +8847,273 @@ msgstr "Kan inte migrera uppgifterna \"%s\""
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1:a"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2:a"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20:e"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21:a"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22:a"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23:e"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24:e"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25:e"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26:e"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27:e"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28:e"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29:e"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30:e"
 
-#: ../calendar/gui/print.c:523
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31:a"
 
 #. 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 "Sö"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Må"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "On"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Lö"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2481
 msgid "Appointment"
 msgstr "Möte"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2483
 msgid "Task"
 msgstr "Uppgift"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2508
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammanfattning: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2531
 msgid "Attendees: "
 msgstr "Deltagare:"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2588
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2600
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2612
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2636
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasks-component.c:480
+#: ../calendar/gui/tasks-component.c:499
 msgid "_New Task List"
 msgstr "_Ny uppgiftslista"
 
-#: ../calendar/gui/tasks-component.c:562
+#: ../calendar/gui/tasks-component.c:582
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d uppgift"
 msgstr[1] "%d uppgifter"
 
-#: ../calendar/gui/tasks-component.c:611
+#: ../calendar/gui/tasks-component.c:631
 msgid "Failed upgrading tasks."
 msgstr "Misslyckades med att uppgradera uppgifter."
 
-#: ../calendar/gui/tasks-component.c:968
+#: ../calendar/gui/tasks-component.c:764
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan inte öppna uppgiftslistan \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:777
 msgid "There is no calendar available for creating tasks"
 msgstr "Det finns ingen kalender tillgänglig för skapande av uppgifter"
 
-#: ../calendar/gui/tasks-component.c:1092
+#: ../calendar/gui/tasks-component.c:888
 msgid "Task Source Selector"
 msgstr "Väljare för uppgiftskälla"
 
-#: ../calendar/gui/tasks-component.c:1352
+#: ../calendar/gui/tasks-component.c:1142
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1353
+#: ../calendar/gui/tasks-component.c:1143
 msgctxt "New"
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ../calendar/gui/tasks-component.c:1354
+#: ../calendar/gui/tasks-component.c:1144
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1360
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New assigned task"
 msgstr "Ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1361
+#: ../calendar/gui/tasks-component.c:1151
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tilldela_d uppgift"
 
-#: ../calendar/gui/tasks-component.c:1362
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new assigned task"
 msgstr "Skapa en ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1368
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New task list"
 msgstr "Ny uppgiftslista"
 
-#: ../calendar/gui/tasks-component.c:1369
+#: ../calendar/gui/tasks-component.c:1159
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Uppgif_tslista"
 
-#: ../calendar/gui/tasks-component.c:1370
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new task list"
 msgstr "Skapa en ny uppgiftslista"
 
-#: ../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"
 "\n"
@@ -9010,13 +9123,13 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: ../calendar/gui/tasks-control.c:455
-#: ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445
+#: ../mail/em-folder-view.c:1128
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: ../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 "Skriv ut uppgifter"
 
@@ -9025,21 +9138,21 @@ msgstr "Skriv ut uppgifter"
 msgid "% Completed"
 msgstr "% färdigt"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Pågår"
 
-#: ../calendar/gui/tasktypes.xml.h:50
-#: ../mail/em-filter-i18n.h:50
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "är större än"
 
-#: ../calendar/gui/tasktypes.xml.h:51
-#: ../mail/em-filter-i18n.h:51
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "är mindre än"
 
@@ -9049,7 +9162,7 @@ msgstr "Möten och sammanträden"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1635
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Öppnar kalender"
 
@@ -10630,51 +10743,51 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Kunde inte öppna autosparningsfil"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Infoga bilaga"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "_Bifoga"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Namnlöst meddelande"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:476
 #: ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
-#: ../composer/e-composer-actions.c:485
-#: ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483
+#: ../mail/em-folder-view.c:1339
 #: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:44
+#: ../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 "Skriv _ut..."
 
-#: ../composer/e-composer-actions.c:492
+#: ../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
@@ -10683,199 +10796,203 @@ msgstr "Skriv _ut..."
 msgid "Print Pre_view"
 msgstr "Förhands_granska"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Spara ut_kast"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
+msgstr "Spara som ut_kast"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Spara som utkast"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "S_kicka"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Skicka detta meddelande"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Infoga sändalternativ"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Nytt _meddelande"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Öppna Nytt meddelande-fönster"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Tecken_kodning"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Säkerhet"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP-_kryptera"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP-_signera"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Prioritera meddelande"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Ställ in meddelandeprioritet till hög"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "Be_gär läskvitto"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Få en leveranskvitto när ditt meddelande läses"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME-k_ryptera"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-sig_nera"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "_Blindkopia-fältet"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Växlar huruvida blindkopiefältet ska visas"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "_Kopia-fältet"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Växlar huruvida kopiefältet ska visas"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "_Från-fältet"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Växlar huruvida frånväljaren ska visas"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "_Posta till-fältet"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Växlar huruvida svara till-fältet ska visas"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Växlar huruvida svara till-fältet ska visas"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "_Ämne-fältet"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Växlar huruvida ämnesfältet ska visas"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "_Till-fältet"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Växlar huruvida kopiefältet ska visas"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Spara utkast"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: ../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 "Ange adresserna som ska få en kopia av meddelandet"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
 msgstr "Ange adresserna till de som ska ta emot en kopia av meddelandet utan att visas i mottagarlistan för meddelandet."
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "_Från:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Svara till:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Till:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Kopia:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Blindkopia:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Posta till:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "_Ämne:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -10895,22 +11012,22 @@ msgstr "Välj mappar att posta meddelandet till."
 msgid "Click here to select folders to post to"
 msgstr "Klicka här för att välja mappar att posta till"
 
-#: ../composer/e-composer-private.c:181
-#: ../composer/e-msg-composer.c:1553
+#: ../composer/e-composer-private.c:179
+#: ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Visa _bilageraden"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:866
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för detta konto"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:873
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet för detta konto"
 
-#: ../composer/e-msg-composer.c:1495
-#: ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411
+#: ../composer/e-msg-composer.c:1494
+#: ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2597
 #: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -10918,16 +11035,16 @@ msgid_plural "Attachments"
 msgstr[0] "Bilaga"
 msgstr[1] "Bilagor"
 
-#: ../composer/e-msg-composer.c:1551
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../composer/e-msg-composer.c:1568
-#: ../composer/e-msg-composer.c:2775
+#: ../composer/e-msg-composer.c:1567
+#: ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Skriv ett meddelande"
 
-#: ../composer/e-msg-composer.c:4050
+#: ../composer/e-msg-composer.c:4093
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(Redigeraren innehåller en meddelandetext som inte är text och som inte kan redigeras.)</b>"
 
@@ -11046,7 +11163,7 @@ msgstr "Du måste konfigurera ett konto innan du kan skriva meddelanden."
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Continue Editing"
-msgstr "_Fortsätt redigera"
+msgstr "Fortsätt _redigera"
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
@@ -11102,7 +11219,7 @@ msgid "Evolution Query"
 msgstr "Evolution-fråga"
 
 #. 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 "Internt fel, okänt fel \"%s\" begärt"
@@ -11115,10 +11232,69 @@ msgstr "Komponent"
 msgid "Name of the component being logged"
 msgstr "Namnet på komponenten som blir loggad"
 
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Felsökningsloggar"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Visa _fel i statusraden för"
+
+#. 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(er)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Loggmeddelanden:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Loggnivå"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Tid"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291
+#: ../mail/message-list.c:2523
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Meddelanden"
+
+#: ../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 "Stäng detta fönster"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Fel"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Fel"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Varningar och fel"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Felsök"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Meddelanden om fel, varningar och felsökning"
+
 #: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:798
+#: ../filter/rule-editor.c:799
 #: ../mail/em-account-prefs.c:482
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
@@ -11170,60 +11346,64 @@ msgstr "Skriv över fil?"
 msgid "_Overwrite"
 msgstr "Skriv _över"
 
-#: ../e-util/e-util.c:96
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Kunde inte öppna länken."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Kunde inte visa hjälp för Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "V_iktigt"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Jobb"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Personligt"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "A_tt-göra"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "Se_nare"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "Etikett_namn:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Redigera etikett"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Lägg till etikett"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Etikettnamnet får inte vara tomt."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "En etikett som har samma tagg finns redan på servern. Byt namn på din etikett."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-fel: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Alla ytterligare fel visas endast i terminalen."
 
@@ -11363,17 +11543,14 @@ msgid "Find items that meet the following conditions"
 msgstr "Visa objekt som matchar följande villkor"
 
 #: ../filter/filter-rule.c:915
-#, fuzzy
 msgid "A_dd Condition"
-msgstr "Lägg till åt_gärd"
+msgstr "Lägg till v_illkor"
 
 #: ../filter/filter-rule.c:921
-#, fuzzy
 msgid "If all conditions are met"
 msgstr "Om alla villkor uppfylls"
 
 #: ../filter/filter-rule.c:921
-#, fuzzy
 msgid "If any conditions are met"
 msgstr "Om några villkor uppfylls"
 
@@ -11510,7 +11687,7 @@ msgid "months"
 msgstr "månader"
 
 #: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "sekunder"
 
@@ -11523,10 +11700,11 @@ msgid "the time you specify"
 msgstr "den tid du anger"
 
 #: ../filter/filter.glade.h:22
+#: ../plugins/caldav/caldav-source.c:433
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-contacts-source.c:369
 msgid "weeks"
 msgstr "veckor"
 
@@ -11534,15 +11712,15 @@ msgstr "veckor"
 msgid "years"
 msgstr "år"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -11595,12 +11773,12 @@ msgid "Evolution Network configuration control"
 msgstr "Evolutions nätverkskonfigurationskontroll"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:605
+#: ../mail/em-folder-view.c:604
 #: ../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/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 "E-post"
@@ -11611,7 +11789,7 @@ msgid "Mail Accounts"
 msgstr "E-postkonton"
 
 #: ../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 "E-postinställningar"
 
@@ -11620,6 +11798,7 @@ msgid "Network Preferences"
 msgstr "Nätverksinställningar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "_Mail"
 msgstr "_E-post"
 
@@ -11641,7 +11820,7 @@ msgstr ""
 "och kryssa för kryssrutan för att godkänna det\n"
 
 #: ../mail/em-account-editor.c:465
-#: ../mail/em-filter-folder-element.c:239
+#: ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Välj mapp"
@@ -11649,7 +11828,7 @@ msgstr "Välj mapp"
 #: ../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
+#: ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
@@ -11658,12 +11837,12 @@ msgid "Ask for each message"
 msgstr "Fråga för varje meddelande"
 
 #: ../mail/em-account-editor.c:1809
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Identitet"
 
 #: ../mail/em-account-editor.c:1858
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
@@ -11676,7 +11855,7 @@ msgid "minu_tes"
 msgstr "minu_ter"
 
 #: ../mail/em-account-editor.c:2326
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Sändning av e-post"
 
@@ -11687,8 +11866,8 @@ msgstr "Standardvärden"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2451
-#: ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Säkerhet"
 
@@ -11709,7 +11888,7 @@ msgid "Account Editor"
 msgstr "Kontoredigerare"
 
 #: ../mail/em-account-editor.c:2931
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoguide"
 
@@ -11728,20 +11907,20 @@ msgstr "Protokoll"
 
 #: ../mail/em-composer-prefs.c:303
 #: ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158
+#: ../mail/mail-config.c:1190
 #: ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Språk"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Lägg till signaturskript"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -11750,18 +11929,26 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidarebefordrat meddelande --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "${AbbrevWeekdayName} ${Year}-${Month}-${Day} klockan ${24Hour}:${Minute} ${TimeZone} skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Ursprungligt meddelande-----"
 
@@ -11769,64 +11956,48 @@ msgstr "-----Ursprungligt meddelande-----"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
-#.
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
-#. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
-#. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
-#. *
-#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
-#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Justera poäng"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilldela färg"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Blindkopia"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Kopia"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Färdigt den"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
@@ -11836,222 +12007,225 @@ msgstr "Avsändningsdatum"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "finns inte"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "returnerar inte"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "låter inte som"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Utkast"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "slutar med"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "finns"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Uttryck"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Följ upp"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:29
 #: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "viktigt"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "är efter"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "är innan"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "är flaggad"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "är inte flaggad"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:38
 msgid "is not set"
 msgstr "är inte inställt"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:39
 msgid "is set"
 msgstr "är inställt"
 
-#: ../mail/em-filter-i18n.h:56
-#: ../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 "Skräppost"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Skräptest"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:42
 #: ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etikett"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Matcha alla"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Meddelanderubrik"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Meddelandet är skräppost"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Meddelandet är inte skräppost"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
 # Osäker.
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Skicka till program"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Spela ljud"
 
 # [Status] [är] [Läst]
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:69
-#: ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52
+#: ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Läst"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:53
 #: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "besvarad"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "returnerar"
 
-#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "returnerar större än"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "returnerar mindre än"
 
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Kör program"
 
-#: ../mail/em-filter-i18n.h:77
+#: ../mail/em-filter-i18n.h:60
 #: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Poäng"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:61
 #: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Avsändare"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Avsändare eller mottagare"
+
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Ställ in etikett"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: ../mail/em-filter-i18n.h:81
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: ../mail/em-filter-i18n.h:82
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "låter som"
 
-#: ../mail/em-filter-i18n.h:83
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: ../mail/em-filter-i18n.h:84
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Specifik rubrik"
 
-#: ../mail/em-filter-i18n.h:85
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "börjar med"
 
-#: ../mail/em-filter-i18n.h:87
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: ../mail/em-filter-i18n.h:88
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889
 #: ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:312
+#: ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../mail/em-filter-i18n.h:89
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Töm status"
 
@@ -12138,17 +12312,17 @@ msgid "Quota usage"
 msgstr "Kvotanvändning"
 
 #. 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
+#: ../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 "Inkorg"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Mappegenskaper"
@@ -12168,8 +12342,8 @@ msgstr "Mapp_namn:"
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204
 #: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:975
-#: ../mail/mail-vfolder.c:1042
+#: ../mail/mail-vfolder.c:980
+#: ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Sökmappar"
 
@@ -12180,22 +12354,28 @@ msgid "UNMATCHED"
 msgstr "OMATCHADE"
 
 #: ../mail/em-folder-tree-model.c:504
-#: ../mail/mail-component.c:160
+#: ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Utkast"
 
-#: ../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 "Mallar"
+
+#: ../mail/em-folder-tree-model.c:512
+#: ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: ../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 "Skickat"
 
-#: ../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 "Läser in..."
 
@@ -12235,13 +12415,13 @@ msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
 #: ../mail/em-folder-tree.c:909
-#: ../mail/message-list.c:2015
+#: ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
 #: ../mail/em-folder-tree.c:911
-#: ../mail/message-list.c:2017
+#: ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
@@ -12266,51 +12446,53 @@ msgstr "_Flytta till mapp"
 msgid "Scanning folders in \"%s\""
 msgstr "Söker igenom mappar på \"%s\""
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Öppna i _nytt fönster"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ../mail/em-folder-tree.c:2114
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Byt namn..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Upp_datera"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Tö_m utkorg"
 
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2140
 #: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Töm papperskor_gen"
 
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Skapa ny _sökmapp"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierar \"%s\" till \"%s\""
 
 #: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-view.c:1188
+#: ../mail/em-folder-view.c:1203
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Välj mapp"
 
 #: ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-view.c:1203
 msgid "C_opy"
 msgstr "_Kopiera"
 
@@ -12332,372 +12514,372 @@ msgstr "Skapa mapp"
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
-#: ../mail/em-folder-view.c:1090
+#: ../mail/em-folder-view.c:1091
 #: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Misslyckades att ta bort post"
 
-#: ../mail/em-folder-view.c:1091
+#: ../mail/em-folder-view.c:1092
 #: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har inte tillräckliga rättigheter för att ta bort den här posten. "
 
-#: ../mail/em-folder-view.c:1329
+#: ../mail/em-folder-view.c:1331
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Svara till avsän_daren"
 
-#: ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:568
-#: ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1333
+#: ../mail/em-popup.c:566
+#: ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
 #. 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
+#: ../mail/em-folder-view.c:1337
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1343
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1344
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1345
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as Un_important"
 msgstr "Markera som ovikt_igt"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Junk"
 msgstr "Markera som _skräppost"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Not Junk"
 msgstr "Markera som _inte skräppost"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark for Follo_w Up..."
 msgstr "Markera för _uppföljning..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "_Label"
 msgstr "E_tikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1357
 #: ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Ingen"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1360
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1364
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1368
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
 #. 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:1370
 msgid "Search Folder based on _Subject"
 msgstr "Sökmapp baserat på _ämne"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Se_nder"
 msgstr "Sökmapp baserat på _avsändare"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1372
 msgid "Search Folder based on _Recipients"
 msgstr "Sökmapp baserat på _mottagare"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Search Folder based on Mailing _List"
 msgstr "Sökmapp baserat på sänd_lista"
 
 #. 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:1378
 msgid "Filter based on Sub_ject"
 msgstr "Filtrera baserat på _ämne"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Sen_der"
 msgstr "Filtrera baserat på _avsändare"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1380
 msgid "Filter based on Re_cipients"
 msgstr "Filtrera baserat på _mottagare"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1381
 msgid "Filter based on _Mailing List"
 msgstr "Filtrera baserat på sä_ndlista"
 
 #. 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
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../mail/em-folder-view.c:2257
+#: ../mail/em-folder-view.c:2300
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:510
+#: ../plugins/google-account-setup/google-source.c:708
 msgid "Default"
 msgstr "Standard"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2518
 msgid "Unable to retrieve message"
 msgstr "Kan inte hämta meddelande"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2537
 msgid "Retrieving Message..."
 msgstr "Hämtar meddelande..."
 
-#: ../mail/em-folder-view.c:2791
+#: ../mail/em-folder-view.c:2756
 msgid "C_all To..."
 msgstr "R_ing till..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2759
 msgid "Create _Search Folder"
 msgstr "Skapa ny _sökmapp"
 
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2760
 msgid "_From this Address"
 msgstr "_Från denna adress"
 
-#: ../mail/em-folder-view.c:2796
+#: ../mail/em-folder-view.c:2761
 msgid "_To this Address"
 msgstr "_Till denna adress"
 
-#: ../mail/em-folder-view.c:3293
+#: ../mail/em-folder-view.c:3254
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
-#: ../mail/em-folder-view.c:3305
+#: ../mail/em-folder-view.c:3266
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicka för att ringa till %s"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3271
 msgid "Click to hide/unhide addresses"
 msgstr "Klicka för att dölja/visa adresser"
 
 #. 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 "Träffar: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Sö_k:"
 
 #. 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 "_Föregående"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Nästa"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "M_atcha versaler/gemener"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 #: ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Osignerat"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Detta meddelande är inte signerat. Det finns ingen garanti att detta meddelande är autentiskt."
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 #: ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Giltig signatur"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "Detta meddelande är signerat och giltigt, vilket betyder att det är mycket sannolikt att meddelandet är autentiskt."
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 #: ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ogiltig signatur"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "Signaturen för detta meddelande kan inte verifieras. Den kan ha ändrats under överföringen."
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 #: ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Giltig signatur men kan inte verifiera avsändaren"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "Detta meddelande är signerat med en giltig signatur, men meddelandets avsändare kan inte verifieras."
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 #: ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signaturen finns men behöver publik nyckel"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Detta meddelande är signerat med en signatur, men det finns ingen motsvarande publik nyckel."
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 #: ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Okrypterat"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "Detta meddelande är inte krypterat. Dess innehåll kan ses i överföringen på Internet."
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 #: ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Krypterat, svagt"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "Detta meddelande är krypterat, men med en svag krypteringsalgoritm. Det skulle vara svårt men inte omöjligt för en utomstående att se innehållet i detta meddelande inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 #: ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Krypterat"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "Detta meddelande är krypterat. Det skulle vara svårt för en utomstående att se innehållet i detta meddelande."
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 #: ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Krypterat, starkt"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "Detta meddelande är krypterat med en stark krypteringsalgoritm. Det skulle vara mycket svårt för en utomstående att se innehållet i detta meddelande inom en rimlig tid."
 
-#: ../mail/em-format-html-display.c:1063
+#: ../mail/em-format-html-display.c:1066
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Detta certifikatet är inte visningsbart"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Färdigställt den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Skulle ha genomförts:"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Anpassa till bredden"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Visa _originalstorlek"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Spara bilaga som"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Välj mapp att spara alla bilagor i"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Spara markerade..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d bi_laga"
 msgstr[1] "%d bi_lagor"
 
-#: ../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:2387
 msgid "S_ave"
 msgstr "Sp_ara"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "Spara _alla"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2383
 msgid "No Attachment"
 msgstr "Ingen bilaga"
 
-#: ../mail/em-format-html-display.c:2344
-#: ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2530
+#: ../mail/em-format-html-display.c:2569
 msgid "View _Unformatted"
 msgstr "Visa _oformaterat"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2532
 msgid "Hide _Unformatted"
 msgstr "Dölj o_formaterat"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2589
 msgid "O_pen With"
 msgstr "Ö_ppna med"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2665
 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 "Evolution kan inte rendera det här e-postmeddelandet eftersom det är för stort för att behandla. Du kan visa det oformaterat eller med en extern textredigerare."
 
@@ -12791,7 +12973,7 @@ 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 "Det här meddelandet skickades av <b>%s</b> på uppdrag av <b>%s</b>"
@@ -12800,7 +12982,7 @@ msgstr "Det här meddelandet skickades av <b>%s</b> på uppdrag av <b>%s</b>"
 #: ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75
 #: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Från"
 
@@ -12870,11 +13052,11 @@ msgstr "Fel vid verifiering av signatur"
 msgid "Unknown error verifying signature"
 msgstr "Okänt fel vid verifiering av signatur"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Kunde inte tolka PGP-meddelande"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunde inte tolka PGP-meddelande: Okänt fel"
 
@@ -12992,7 +13174,7 @@ msgstr "Kan inte kopiera POP3-behåll-på-server-data \"%s\": %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa lokalt e-postlager \"%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"
@@ -13003,50 +13185,50 @@ msgstr ""
 "\n"
 "Vänta medan Evolution migrerar dina mappar..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kan inte skapa lokala brevlådemappar på \"%s\": %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "Kan inte läsa inställningar från tidigare Evolution-installation, \"evolution/config.xmldb\" finns inte eller är skadad."
 
-#: ../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 "_Svara till avsändaren"
 
-#: ../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 "Svara till _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:629
-#: ../mail/em-popup.c:853
+#: ../mail/em-popup.c:625
+#: ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Lägg till i adressbok"
 
-#: ../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 "Detta lager stöder inte prenumerationer, eller så är de inte aktiverade."
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Mapp"
 
 #. 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 "Välj en server."
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
@@ -13107,10 +13289,6 @@ msgstr "Tillåter att Evolution visar textdelen av begränsad storlek"
 msgid "Always request read receipt"
 msgstr "Begär alltid läskvitto"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Den tidsperiod i sekunder som felet ska visas på statusraden."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk detektering av känsloikoner"
@@ -13248,7 +13426,8 @@ msgid "Directory for saving mail component files."
 msgstr "Katalog för sparning av postkomponentfiler."
 
 #: ../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 "Inaktivera eller aktivera ellipsering av mappnamn i mappträd"
 
 #: ../mail/evolution-mail.schemas.in.h:42
@@ -13308,500 +13487,504 @@ msgid "Enable/disable caret mode"
 msgstr "Aktivera/inaktivera markörläge"
 
 #: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Encode file names in the mail headers same as Outlook or GMail does, to let them understand localized file names sent by Evolution, because they do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "Höjd för meddelandelistpanelen"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "Höjd för meddelandelistpanelen."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Döljer mappförhandsvisningen och tar bort markeringen"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "Om en användare försöker att öppna 10 eller fler meddelanden på samma gång, fråga om användaren verkligen vill göra det."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 msgstr "Om \"Förhandsgranskning\"-panelen är aktiv visas det sida vid sida istället för vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 #, 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 "Om det inte finns en inbyggd visare för en viss mime-typ i Evolution kommer alla mime-typer som finns i denna lista och som mappas till en bonobo-komponentvisare i GNOME:s databas över mime-typer att kunna användas för att visa innehåll."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 msgstr "Initial höjd för \"Skicka och ta emot e-post\"-fönstret. Värdet uppdateras när användaren ändrar storlek på fönstret vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this 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 "Initialt maximerat tillstånd för \"Skicka och ta emot e-post\"-fönstret. Värdet uppdateras när användaren maximerar eller avmaximerar fönstret. Observera att detta specifika värde inte används av Evolution eftersom \"Skicka och ta emot e-post\"-fönstret inte kan maximeras. Denna nyckel finns endast för en framtida implementation."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
 msgstr "Initial bredd för \"Skicka och ta emot e-post\"-fönstret. Värdet uppdateras när användaren ändrar storlek på fönstret horisontellt."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Denna aktiverar/inaktiverar en fråga vid markering av flera meddelanden."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
 msgstr "Den inaktiverar/aktiverar funktionen för upprepade förfrågningar om frånkopplad synkronisering krävs innan frånkopplat läge aktiveras."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
 msgstr "Den inaktiverar/aktiverar funktionen för upprepade varningar om att borttagning av meddelanden från en sökmapp permanent tar bort meddelandet, inte att den helt enkelt tar bort det från sökresultaten."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "Senaste gången när tömning av skräpkorgen kördes"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "Senaste tid när tömning av papperskorgen kördes"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Nivå bortom vilken meddelandet ska loggas."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Lista med etiketter och deras associerade färger"
 
-#: ../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 med mime-typer att kontrollera med avseende på bonobo-komponentvisare"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Lista med accepterade licenser"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Lista med konton"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../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 med konton som är kända för Evolutions e-postkomponent. Listan innehåller strängar som namnger underkataloger relativa till /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista med anpassade rubriker och huruvida de är aktiverade."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista över ordboksspråkkoder som används för stavningskontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../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 med etiketter som är kända för Evolutions e-postkomponent. Listan innehåller strängar som innehåller namn:färg där färg använder den hexadecimala kodningen i HTML."
 
-#: ../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 med protokollnamn vars licens har accepterats."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Load images for HTML messages over HTTP"
-msgstr "Läs in bilder för HTML-meddelanden över http"
+msgstr "Läs in bilder för HTML-meddelanden över HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
-msgstr "Läs in bilder för HTML-meddelanden över http(s). Möjliga värden är: \"0\" - Läs aldrig in bilder från nätet, \"1\" - Läs in bilder i meddelanden från kontakter, \"2\" - Läs alltid in bilder från nätet."
+msgstr "Läs in bilder för HTML-meddelanden över HTTP(S). Möjliga värden är: \"0\" - Läs aldrig in bilder från nätet, \"1\" - Läs in bilder i meddelanden från kontakter, \"2\" - Läs alltid in bilder från nätet."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Logga filteråtgärder"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Logga filteråtgärder i den angivna loggfilen."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Markera som läst efter angiven tidsgräns"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Markera som läst efter angiven tidsgräns."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markera citat i meddelandeförhandsgranskningen"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markera citat i meddelandeförhandsgranskningen."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Standardhöjd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Standardbredd för meddelandefönstret"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på meddelandevisning (normal, \"full headers\" (fullständiga rubriker), \"source\" (källkod))"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minsta antalet dagar mellan tömning av skräpkorgen vid avslut"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minsta antalet dagar mellan tömning av papperskorgen vid avslut"
 
-#: ../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 "Minsta tiden mellan tömning av skräpkorgen vid avslut, i dagar."
 
-#: ../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 "Minsta tiden mellan tömning av papperskorgen vid avslut, i dagar."
 
-#: ../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 "Antal adresser att visa i Till/Kopia/Blindkopia"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Fråga vid tom ämnesrad"
 
-#: ../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 "Fråga användaren när han eller hon försöker att tömma en mapp."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Fråga användaren när han eller hon försöker att skicka ett meddelande utan en ämnesrad."
 
-#: ../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 "Fråga om att kontrollera om användaren omedelbart vill gå i frånkopplat läge"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Fråga när meddelanden tas bort från sökmappar"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Fråga när användaren tömmer"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Fråga när användaren endast fyller i blindkopia"
 
-#: ../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 "Fråga när användaren försöker att öppna tio eller fler meddelanden på samma gång"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Fråga när användaren försöker skicka HTML-brev till mottagare som kanske inte vill ha HTML-brev."
 
-#: ../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 "Fråga när användaren försöker skicka ett meddelande utan till- eller kopiemottagare."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Fråga när användaren försöker skicka oönskad HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Fråga vid markering av flera meddelanden"
 
-#: ../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 "Känn igen känsloikoner i text och ersätt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Känn igen länkar i text och ersätt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Kör skräptest på inkommande e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Spara katalog"
 
-#: ../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 "Sök efter avsändarens fotografi i lokala adressböcker"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Skicka HTML-brev som standard"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Skicka HTML-brev som standard."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Sender email-address column in the message list"
 msgstr "Kolumn för avsändarens e-postadress i meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Intervall för serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Visa animationer"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Visa animerade bilder som animationer."
 
-#: ../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 "Visa borttagna meddelanden (med en genomstrykning) i meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Visa borttagna meddelanden i meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Visa fotot på avsändaren"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Visa avsändarens e-postadress i en separat kolumn i meddelandelistan."
 
-#: ../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 "Visa avsändarens foto i meddelandets läsningspanel."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Stavningskontrollera inuti"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Färg för stavningskontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Språk för stavningskontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Standardhöjd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Standardbredd på prenumerationsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Terminaltypsnitt"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Gräns för textmeddelandedel"
 
 # Hook?
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "Standardinsticksmodul för skräpkrok"
 
-#: ../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 "Den senaste gången som tömning av skräpkorgen gjordes, i dagar sedan epoken."
 
-#: ../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 "Den senaste dagen som tömning av papperskorgen gjordes, i dagar sedan epoken."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "Terminaltypsnittet för e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "Det typsnitt med variabelt breddsteg som ska användas för e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "Denna kan ha tre möjliga värden. \"0\" för fel. \"1\" för varningar. \"2\" för felsökningsmeddelanden."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 #, 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 "Det här bestämmer maximal storlek på textdelen som kan formateras under Evolution. Standard är 4 MB / 4096 KB och anges i KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr "Det här är standardinsticksmodulen för skräppost, även om det finns flera aktiverade insticksmoduler. Om listad standardinsticksmodul är inaktiverad kommer den inte att falla tillbaka på andra tillgängliga insticksmoduler."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
-msgstr "Den här nyckeln läses bara en gång och återställs till \"falskt\" efter läsning. Det här avmarkerar meddelandet i listan och tar bort förhandsvisningen för den mappen."
+msgstr "Den här nyckeln läses bara en gång och återställs till \"false\" efter läsning. Det här avmarkerar meddelandet i listan och tar bort förhandsvisningen för den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "Denna nyckel bör innehålla en lista med XML-strukturer som anger anpassade rubriker, och huruvida de ska visas. Formatet på XML-strukturen är &lt;header enabled&gt; - ställ detta till \"enabled\" om rubriken ska visas i e-postvyn."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr "Detta alternativ är relaterat till nyckeln lookup_addressbook och används för att bestämma huruvida adresser endast ska slås upp i lokala adressböcker för att exkludera e-post skickad av kända kontakter från skräppostfiltrering."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "Det här alternativet hjälper till att förbättra hämtningshastigheten."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
 msgstr "Detta anger antalet adresser som skall visas i standardmeddelandelistan, utanför gränsen visas en \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
 msgstr "Den här inställningen anger huruvida trådarna ska vara utfällda eller infällda som standard. Evolution kräver en omstart vid ändring."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
 msgstr "Den här inställningen anger huruvida trådarna ska sorteras baserat på senaste meddelandet i varje tråd, istället för meddelandets datum. En omstart av Evolution krävs."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Tråda meddelandelistan."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Tråda meddelandelistan"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Tråda meddelandelistan baserat på ämnet"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgräns för markering av meddelande som läst"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Tidsgräns för markering av meddelande som läst."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "UID-sträng för standardkontot."
 
-#: ../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 "Understrykningsfärg för felstavade ord när stavningskontroll inuti används."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Använd SpamAssassin-demonen och klient"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Använd SpamAssassin-demonen och klient (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Använd anpassade typsnitt"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Använd anpassade typsnitt för visning av e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Använd endast lokala skräpposttest."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Använd endast de lokala skräpposttesten (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Använd sida-vid-sida eller bred layout"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Typsnitt med variabelt breddsteg"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "Menyobjektet Visa/Blindkopia är ikryssat"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "Menyobjektet Visa/Blindkopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "Menyobjektet Visa/Kopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "Menyobjektet Visa/Kopia är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "Menyobjektet Visa/Från är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "Menyobjektet Visa/Från är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "Menyobjektet Visa/Posta till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "Menyobjektet Visa/Posta till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "Menyobjektet Visa/Svara till är ikryssat."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "Menyobjektet Visa/Svara till är ikryssat."
 
-#: ../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 "Huruvida en begäran om läskvitto ska läggas till i varje meddelande som standard."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Huruvida ellipseringsfunktionen för mappnamn i mappträdet ska inaktiveras. "
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "Huruvida Evolution ska falla tillbaka på att tråda efter ämne när meddelandena inte innehåller \"In-Reply-To\"- eller \"References\"-rubriker."
 
-#: ../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 "Huruvida trådar sorteras baserat på senaste meddelandet i tråden"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Bredd på meddelandelistpanelen"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Bredd på meddelandelistpanelen."
 
@@ -13818,10 +14001,12 @@ msgid "Import mail from Elm."
 msgstr "Importera e-post från Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "Destination folder:"
 msgstr "Målmapp:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
 msgstr "Välj mapp att importera till"
 
@@ -13837,7 +14022,10 @@ msgstr "Importera mappar i Berkeley-brevlådeformat"
 msgid "Importing mailbox"
 msgstr "Importerar brevlåda"
 
+#. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563
 #: ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
@@ -13860,181 +14048,117 @@ msgstr "Evolutions Pine-importör"
 msgid "Import mail from Pine."
 msgstr "Importera e-post från Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post till %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 "E-post från %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnet är %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: ../mail/mail-component.c:163
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Mallar"
-
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d markerad, "
 msgstr[1] "%d markerade, "
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borttaget"
 msgstr[1] "%d borttagna"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d skräp"
 msgstr[1] "%d skräp"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d utkast"
 msgstr[1] "%d utkast"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d skickat"
 msgstr[1] "%d skickade"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d oskickat"
 msgstr[1] "%d oskickade"
 
-#: ../mail/mail-component.c:569
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d oläst, "
 msgstr[1] "%d olästa, "
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Ny e-postmapp"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mapp"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: ../mail/mail-component.c:1079
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Misslyckades med att uppgradera e-postinställningar eller e-postmappar."
 
-#: ../mail/mail-component.c:1595
-msgid "Error"
-msgstr "Fel"
-
-#: ../mail/mail-component.c:1595
-msgid "Errors"
-msgstr "Fel"
-
-#: ../mail/mail-component.c:1596
-msgid "Warnings and Errors"
-msgstr "Varningar och fel"
-
-#: ../mail/mail-component.c:1597
-msgid "Debug"
-msgstr "Felsök"
-
-#: ../mail/mail-component.c:1597
-msgid "Error, Warnings and Debug messages"
-msgstr "Meddelanden om fel, varningar och felsökning"
-
-#: ../mail/mail-component.c:1724
-msgid "Debug Logs"
-msgstr "Felsökningsloggar"
-
-#: ../mail/mail-component.c:1738
-msgid "Show _errors in the status bar for"
-msgstr "Visa _fel i statusraden för"
-
-#. 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(er)."
-
-#: ../mail/mail-component.c:1760
-msgid "Log Messages:"
-msgstr "Loggmeddelanden:"
-
-#: ../mail/mail-component.c:1801
-msgid "Log Level"
-msgstr "Loggnivå"
-
-#: ../mail/mail-component.c:1810
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "Tid"
-
-#: ../mail/mail-component.c:1820
-#: ../mail/message-list.c:2519
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Meddelanden"
-
-#: ../mail/mail-component.c:1829
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Stäng detta fönster"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
@@ -14312,123 +14436,123 @@ msgid "Empty trash folders on e_xit"
 msgstr "Töm papperskorgsmappar vid a_vslut"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
-msgstr "Aktivera Magiskt _blanksteg"
+msgid "Enable Magic S_pacebar"
+msgstr "Aktivera magiskt _blanksteg"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Aktivera sö_kmappar"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "_Krypteringscertifikat:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "Kryptera ut_gående meddelanden (som standard)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Typsnitt med fast b_reddsteg:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "_Fullständigt namn:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML-meddelanden"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Rubriker"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Inuti"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Inuti (Outlook-stil)"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 #: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Tabell över e-postrubriker"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy för:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "Observera: Understreck i etikettnamnet används som identifierare i menyn."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för första gången"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Alternativet ignoreras om en träff på anpassade skräppostrubriker hittas."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../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."
@@ -14436,135 +14560,135 @@ msgstr ""
 "Ange ett beskrivande namn för detta konto i utrymmet nedan.\n"
 "Detta namn kommer endast att användas för visningsändamål."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr "Ange information om hur du vill skicka e-post. Om du inte är säker bör du fråga din systemadministratör eller Internetleverantör."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr "Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan behöver du inte fylla i, såvida du inte vill inkludera denna information i den e-post du skickar."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
-#: ../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 "Fr_åga när meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Citerad"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "Ko_m ihåg lösenord"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Kom ihåg _lösenord"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "S_OCKS-värd:"
 
-#: ../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ö_k endast efter avsändarens fotografi i lokala adressböcker"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "_Välj..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "Skicka m_eddelandekvitton:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select Drafts Folder"
 msgstr "Välj utkastmapp"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Select Sent Folder"
 msgstr "Välj skickat-mapp"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Sändning av post"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Certifikat för sig_nering:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "Börja s_kriva längst ner vid svar"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Listan med språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: ../mail/mail-config.glade.h:151
+#: ../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"
@@ -14574,7 +14698,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: ../mail/mail-config.glade.h:154
+#: ../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\""
@@ -14582,27 +14706,27 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Använ_darnamn:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Använd aute_ntisering"
 
-#: ../mail/mail-config.glade.h:158
-#: ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.glade.h:159
+#: ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:615
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14612,124 +14736,124 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "Läs _alltid in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL för _automatisk proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "S_tandardinsticksmodul för skräppost:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "_Direktanslutning till Internet"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Signera inte sammanträdesbegäran (för kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behåll signaturen ovanför det ursprungliga meddelandet vid svar"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Läs in bilder i meddelanden från kontakter"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "Sl_å endast upp i lokal adressbok"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "Läs al_drig in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "I_nformera när HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga när meddelanden skickas med en _tom ämnesrad"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "HTTP_S-proxy:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "_Välj..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "_Visa bildanimeringar"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Visa fotografiet på avsändaren i förhandsvisningen av meddelandet"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Minska rubriker för Till / Kopia / Blindkopia till "
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "_Använd säker anslutning:"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "An_vänd systemets standard"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "färg"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "beskrivning"
 
@@ -14778,7 +14902,7 @@ msgid "Find in Message"
 msgstr "Sök i meddelande"
 
 #: ../mail/mail-dialogs.glade.h:12
-#: ../mail/message-tag-followup.c:277
+#: ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Flagga att följa upp"
 
@@ -14830,7 +14954,7 @@ msgstr "_Flagga:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryssa för detta för att acceptera licensavtalet"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14879,12 +15003,12 @@ msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att skicka %d av %d meddelanden"
 
 #: ../mail/mail-ops.c:764
-#: ../mail/mail-send-recv.c:698
+#: ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Avbruten."
 
 #: ../mail/mail-ops.c:766
-#: ../mail/mail-send-recv.c:700
+#: ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Färdig."
 
@@ -15037,40 +15161,40 @@ msgstr "Skicka och ta emot e-post"
 msgid "Cancel _All"
 msgstr "Avbryt a_llt"
 
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: ../mail/mail-send-recv.c:502
-#: ../mail/mail-send-recv.c:578
+#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: ../mail/mail-send-recv.c:804
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Kontrollerar ny e-post"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ange lösenfras för %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Ange lösenfras"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
@@ -15125,11 +15249,11 @@ msgstr "Uppdaterar sökmappar för \"%s:%s\""
 msgid "Updating Search Folders for '%s'"
 msgstr "Uppdaterar sökmappar för \"%s\""
 
-#: ../mail/mail-vfolder.c:1081
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Redigera sökmapp"
 
-#: ../mail/mail-vfolder.c:1170
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Ny sökmapp"
 
@@ -15661,90 +15785,90 @@ msgstr "_Töm"
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Oläst"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Besvarad"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Lägre"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Högre"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:1657
+#: ../mail/message-list.c:1656
 #: ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1664
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1663
+#: ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: ../mail/message-list.c:1673
+#: ../mail/message-list.c:1672
 #: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: ../mail/message-list.c:1685
+#: ../mail/message-list.c:1684
 #: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1693
+#: ../mail/message-list.c:1692
 #: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1695
+#: ../mail/message-list.c:1694
 #: ../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:3981
-#: ../mail/message-list.c:4452
+#: ../mail/message-list.c:3985
+#: ../mail/message-list.c:4450
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4289
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "Inga meddelanden matchar dina sökkriteria. Antingen töm sökningen med menyobjektet Sök->Töm eller ändra den."
 
-#: ../mail/message-list.c:4293
+#: ../mail/message-list.c:4291
 msgid "There are no messages in this folder."
 msgstr "Det finns inga meddelanden i denna mapp."
 
@@ -15782,42 +15906,42 @@ msgstr "Storlek"
 msgid "Subject - Trimmed"
 msgstr "_Ämne-fältet"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Vidarebefordra inte"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Följ upp"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "För information"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 #: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
-#: ../mail/message-tag-followup.c:64
+#: ../mail/message-tag-followup.c:63
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svara"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Granska"
 
@@ -15900,27 +16024,27 @@ msgstr "En formateringsinsticksmodul som visar infogade ljudbilagor och låter d
 msgid "Audio inline plugin"
 msgstr "Insticksmodul för infogade ljud"
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
 msgid "Select name of the Evolution backup file"
 msgstr "Välj namnet på Evolution-säkerhetskopian"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "Starta _om Evolution efter säkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Välj namnet på Evolution-säkerhetskopian att återställa"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "Starta _om Evolution efter återställning"
 
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Återställ från säkerhetskopia"
 
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "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."
@@ -15928,116 +16052,116 @@ msgstr ""
 "Du kan återställa Evolution från din säkerhetskopia. Den kan återställa all e-post, kalendrar, uppgifter, memon och kontakter. \n"
 "Den kan även återställa alla dina personliga inställningar, e-postfilter etc."
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
 msgid "_Restore Evolution from the backup file"
 msgstr "Å_terställ Evolution från säkerhetskopian"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Välj ett Evolution-arkiv att återställa:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "Choose a file to restore"
 msgstr "Välj en fil att återställa"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
 msgid "Backup Evolution directory"
 msgstr "Säkerhetskopiera Evolution-katalog"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
 msgid "Restore Evolution directory"
 msgstr "Återställ Evolution-katalogen"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
 msgid "Check Evolution Backup"
 msgstr "Kontrollera Evolution-säkerhetskopia"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
 msgid "Restart Evolution"
 msgstr "Starta om Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
 msgid "With Graphical User Interface"
 msgstr "Med grafiskt användargränssnitt"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
 msgid "Shutting down Evolution"
 msgstr "Stänger ner Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
 msgid "Backing Evolution accounts and settings"
 msgstr "Säkerhetskopierar konton och inställningar i Evolution"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Säkerhetskopierar Evolution-data (e-post, kontakter, kalender, uppgifter, memon)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
 msgid "Backup complete"
 msgstr "Säkerhetskopiering färdig"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
 msgid "Restarting Evolution"
 msgstr "Startar om Evolution"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
 msgid "Backup current Evolution data"
 msgstr "Säkerhetskopiera aktuellt Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
 msgid "Extracting files from backup"
 msgstr "Extraherar filer från säkerhetskopia"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
 msgid "Loading Evolution settings"
 msgstr "Läser in Evolutions inställningar"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
 msgid "Removing temporary backup files"
 msgstr "Tar bort temporära säkerhetskopior"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
 msgid "Ensuring local sources"
 msgstr "Försäkrar lokala källor"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Säkerhetskopierar till mappen %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Återställer från mappen %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Backup"
 msgstr "Evolutions säkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
 msgid "Evolution Restore"
 msgstr "Evolutions återställning"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
 msgid "Backing up Evolution Data"
 msgstr "Säkerhetskopierar Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vänta under tiden Evolution säkerhetskopierar ditt data."
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
 msgid "Restoring Evolution Data"
 msgstr "Återställer Evolution-data"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vänta under tiden Evolution återställer ditt data."
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Det kan ta lite tid beroende på mängden data som finns i ditt konto."
 
@@ -16137,27 +16261,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Fel inträffade vid start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-barnprocessen svarar inte, dödar..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Väntan på Bogofilter-barnprocessen avbröts, terminerar..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rör till Bogofilter misslyckades, felkod: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
 msgstr "Konvertera meddelandetext till _Unicode"
 
@@ -16181,22 +16305,32 @@ msgstr "Skräppostinsticksmodul för Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtrerar skräpmeddelanden med Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:66
-#: ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80
+#: ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:608
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "Use _SSL"
 msgstr "Använd _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:632
+#: ../plugins/google-account-setup/google-contacts-source.c:358
+msgid "Re_fresh:"
+msgstr "Upp_datera:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV-kalenderkällor"
@@ -16213,13 +16347,6 @@ msgstr "Lokala kalendrar"
 msgid "Provides core functionality for local calendars."
 msgstr "Tillhandahåller grundläggande funktionalitet för lokala kalendrar."
 
-#: ../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 "Upp_datera:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Säker anslutning"
@@ -16236,48 +16363,57 @@ msgstr "HTTP-kalendrar"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Tillhandahåller grundläggande funktionalitet för http-kalendrar."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Väder: Molnigt"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Väder: Dimma"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Väder: Delvis molnigt"
+msgid "Weather: Cloudy"
+msgstr "Väder: Molnigt"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Väder: Regn"
+msgid "Weather: Cloudy Night"
+msgstr "Väder: Molnig natt"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+msgid "Weather: Overcast"
+msgstr "Väder: Regn"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Väder: Regnskurar"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Väder: Snö"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Väder: Soligt"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "Väderkalendrar"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Väder: Åska"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Välj en plats"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Enheter:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metriska (Celsius, cm, osv.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Amerikanska (Fahrenheit, tum, osv.)"
 
@@ -16318,7 +16454,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vill du göra Evolution till din standardklient för e-post?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16389,6 +16525,11 @@ msgstr "Lista över anpassade rubriker"
 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 "Denna nyckel anger listan över anpassade rubriker som du kan lägga till i ett utgående meddelande. Formatet är att ange en rubrik och rubrikvärde är: Namn på anpassad rubrik följt av \"=\" och dess värden separerade med \";\""
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Öppna en annan användares mapp"
@@ -16423,11 +16564,11 @@ msgstr "Lösenord i klartext"
 msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "Detta alternativ kommer att ansluta till Exchange-servern genom att använda autentisering med lösenord i klartext."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16436,83 +16577,88 @@ msgstr ""
 "till varje person som skickar e-post till dig när du inte är\n"
 "på kontoret."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:282
-#: ../plugins/exchange-operations/exchange-account-setup.c:287
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Jag är inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/exchange-operations/exchange-account-setup.c:286
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Jag är på kontoret"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Byt lösenordet på Exchange-kontot"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Byt lösenord"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:341
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Hantera delegatinställningarna för Exchange-kontot"
 
 # Felstavat... borde buggrapporteras.
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 # Felstavat... borde buggrapporteras.
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Diverse"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:365
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Visa storleken på alla Exchange-mappar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Mappstorlek"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-inställningar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:696
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:722
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "A_utentisera"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:743
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+msgid "S_pecify the mailbox name"
+msgstr "Ange _filnamn:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Brevlåda:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:944
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "_Autentiseringstyp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "_Kontrollera vilka typer som stöds"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
@@ -16966,30 +17112,34 @@ msgid "Exchange Operations"
 msgstr "Exchange-åtgärder"
 
 #: ../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 "Kan inte byta lösenord på grund av konfigurationsproblem."
 
-#: ../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 "Kan inte visa mappar."
 
-#: ../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 "Kan inte genomföra åtgärden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
 msgstr "Ändringar i konfigurationen av Exchange-kontot \"{0}\" kommer att börja gälla efter att du har startat om Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Kunde inte autentisera till servern."
 
-#: ../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 "Kunde inte byta lösenord."
 
-#: ../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"
@@ -17000,59 +17150,59 @@ msgstr ""
 "Kontrollera URL:en, användarnamnet och \n"
 "lösenordet och försök igen."
 
-#: ../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 "Kunde inte ansluta till Exchange-server."
 
-#: ../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 "Kunde inte ansluta till servern {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 "Kunde inte avgöra mapprättigheterna för delegater."
 
-#: ../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 "Kunde inte hitta Exchange Web Storage-systemet."
 
-#: ../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 "Kunde inte hitta servern {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 "Kunde inte göra {0} till en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Kunde inte läsa mapprättigheter"
 
-#: ../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 "Kunde inte läsa mapprättigheter."
 
-#: ../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 "Kunde inte läsa inte-på-kontoret-tillstånd"
 
-#: ../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 "Kunde inte uppdatera mapprättigheter."
 
-#: ../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 "Kunde inte uppdatera inte-på-kontoret-tillstånd"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr "Evolution kräver en omstart för att läsa in användarens prenumererade postlåda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Exchange-kontot är frånkopplat."
 
-#: ../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"
@@ -17081,100 +17231,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 "Misslyckades med att uppdatera delegater:"
 
-#: ../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 "Mappen finns redan"
 
-#: ../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 "Mappen finns inte"
 
-#: ../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 "Mapp frånkopplad"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Allmänt fel"
 
-#: ../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 "Global katalogserver är inte nåbar"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
 msgstr "Om OWA körs på en annan sökväg måste du ange det i kontokonfigurationsdialogen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Brevlådan för {0} finns inte på denna server."
 
-#: ../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 "Försäkra dig om att URL:en stämmer och försök igen."
 
-#: ../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 "Försäkra dig om att servernamnet är rättstavat och försök igen."
 
-#: ../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 "Försäkra dig om att användarnamnet och lösenordet stämmer och försök igen."
 
-#: ../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 "Ingen global katalogserver är konfigurerad för detta konto."
 
-#: ../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 "Ingen brevlåda för användaren {0} på {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 "Det finns ingen användare {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 "Lösenordet byttes utan problem."
 
-#: ../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 "Ange ett delegat-id eller avmarkera alternativet Skicka som en 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 "Kontrollera att namnet på den globala katalogservern är korrekt."
 
-#: ../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 "Starta om Evolution för att ändringar ska börja gälla"
 
-#: ../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 "Välj en användare."
 
-#: ../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 "Servern avvisade lösenordet eftersom det är för enkelt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange-kontot kommer att inaktiveras när du avslutar Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange-kontot kommer att tas bort när du avslutar Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange-servern är inte kompatibel med 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."
@@ -17182,7 +17332,7 @@ msgstr ""
 "Servern kör Exchange 5.5. Exchange Connector\n"
 "stöder endast Microsoft Exchange 2000 och 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"
@@ -17196,80 +17346,80 @@ msgstr ""
 "\n"
 "Eller så har du kanske bara skrivit ditt lösenord fel."
 
-#: ../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 "Försök igen med ett annat lösenord."
 
-#: ../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 "Kan inte lägga till användaren i åtkomstkontrollistan."
 
-#: ../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 "Kan inte redigera delegater."
 
-#: ../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 "Okänt fel vid uppslag av {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:521
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: ../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 "Okänd 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 "Åtgärden stöds inte"
 
-#: ../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 "Du håller på att närma dig din tillgängliga kvot för lagring av post på denna server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You are permitted to send a message on behalf of only one delegator at a time."
 msgstr "Du tillåts endast att skicka ett meddelande på uppdrag av en delegat åt gången."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Du kan inte göra dig själv till din egen delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Du har överskridit din kvot för lagring av post på denna server."
 
-#: ../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 "Du kan endast konfigurera ett enstaka Exchange-konto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
 msgstr "Din nuvarande användning är: {0} KB. Prova att rensa upp en del utrymme genom att ta bort en del brev."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
 msgstr "Din nuvarande användning är: {0} KB. Du kommer varken att kunna skicka eller ta emot brev nu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
 msgstr "Din nuvarande användning är: {0} KB. Du kommer varken att kunna skicka brev till dess att du rensar upp en del utrymme genom att ta bort en del brev."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Ditt lösenord har gått ut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kan inte läggas till i en åtkomstkontrollista"
 
-#: ../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} är redan en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} finns redan i listan"
 
@@ -17322,11 +17472,11 @@ msgstr "Skriv i _extern redigerare"
 msgid "Compose messages using an external editor"
 msgstr "Skriv meddelanden med en extern redigerare"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando att köras för att starta redigeraren:"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17356,7 +17506,8 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%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."
+#, fuzzy
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr "Tillåter uppsägning av prenumeration på e-postmappar i mappträdsammanhangsmenyn."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
@@ -17367,24 +17518,12 @@ msgstr "Säg upp prenumeration på mappar"
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
-#: ../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
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Ange användarnamnet först."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:421
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Ange lösenordet för användaren %s för att komma åt lista över prenumererade kalendrar."
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:521
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17393,16 +17532,21 @@ msgstr ""
 "Kan inte läsa data från Google-server.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:683
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "Retrieve _list"
 msgstr "Hämta _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
@@ -17676,7 +17820,8 @@ msgstr "_Skriv"
 msgid "permission to read|_Read"
 msgstr "_Läst"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -17684,7 +17829,8 @@ msgstr "Proxy"
 msgid "<b>Account Name</b>"
 msgstr "<b>Kontonamn</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Proxyinloggning"
 
@@ -17714,9 +17860,8 @@ msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfliken kommer endast att vara åtkomlig när kontot är aktiverat."
 
 #: ../plugins/groupwise-features/send-options.c:214
-#, fuzzy
 msgid "Advanced send options"
-msgstr "Infoga avancerade sändningsalternativ"
+msgstr "Avancerade sändningsalternativ"
 
 #: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:751
@@ -17747,56 +17892,56 @@ msgstr "Lägg till   "
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../plugins/groupwise-features/status-track.c:107
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Meddelandestatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:121
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: ../plugins/groupwise-features/status-track.c:135
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "Från:"
 
-#: ../plugins/groupwise-features/status-track.c:150
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Skapat den:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Levererat: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Öppnat: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Accepterat: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Borttaget: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Avslaget: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Färdigt: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Inte levererat: "
 
-#: ../plugins/groupwise-features/status-track.c:251
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Spåra meddelandestatus..."
 
@@ -17942,617 +18087,626 @@ msgstr "Misslyckades med att läsa in kalendern \"%s\""
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ett möte i kalendern \"%s\" är i konflikt med detta sammanträde"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hittade mötet i kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:738
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "Kunde inte hitta några kalendrar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:745
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kunde inte hitta detta sammanträde i någon kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:749
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "Kunde inte hitta denna uppgift i någon uppgiftslista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "Kunde inte hitta detta memo i någon memolista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:824
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Söker efter en befintlig version av detta möte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "Kan inte tolka objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1051
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan inte skicka objekt till kalendern \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1063
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Skickade till kalendern \"%s\" som accepterat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1067
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Skickade till kalendern \"%s\" som preliminärt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1072
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Skickade till kalendern \"%s\" som avslaget"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1077
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Skickade till kalendern \"%s\" som avbrutet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1171
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatören har tagit bort delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1178
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Skickade ett avbokningsmeddelande till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1180
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunde inte skicka en avbokningsnotering till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltagarstatus kunde inte uppdateras eftersom statusen är ogiltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan inte uppdatera deltagare. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Deltagarstatusen är uppdaterad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1323
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Sammanträdesinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Uppgiftsinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1329
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Memoinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1338
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kunde inte skicka sammanträdesinformation, sammanträdet finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kunde inte skicka uppgiftsinformation, uppgiften finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1344
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kunde inte skicka memoinformation, memot finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1424
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "Den bifogade kalendern är inte giltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Meddelandet påstår sig innehålla en kalender, men kalendern är inte en giltig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1465
-#: ../plugins/itip-formatter/itip-formatter.c:1493
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "Objektet i kalendern är inte giltigt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1466
-#: ../plugins/itip-formatter/itip-formatter.c:1494
-#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "Meddelandet innehåller en kalender, men kalendern innehåller inga evenemang, uppgifter eller ledig-/upptageninformation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "Den bifogade kalendern innehåller flera objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "För att kunna behandla alla dessa objekt bör filen sparas och kalendern importeras"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2215
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Detta möte upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2218
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Denna uppgift upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Detta memo upprepas"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Ta bort meddelande efter åtgärd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2467
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Konfliktsökning"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Välj de kalendrar som ska genomsökas efter sammanträdeskonflikter"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Idag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Idag %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Idag %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Idag %H.%M.%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Imorgon"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Imorgon %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Imorgon %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Imorgon %H.%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Imorgon %H.%M.%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%a %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B %H.%M.%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y %H.%M.%S"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Svara på uppdrag av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Mottaget på uppdrag av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> genom %s har publicerat följande sammanträdesinformation:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publicerat följande sammanträdesinformation:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegerat följande sammanträde till dig:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> genom %s begär din närvaro vid följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> begär din närvaro vid följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> genom %s önskar lägga till i ett befintligt sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> önskar lägga till i ett befintligt sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> genom %s önskar få den senaste informationen för följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> önskar få den senaste informationen för följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> genom %s har skickat tillbaka följande sammanträdessvar:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har skickat tillbaka följande sammanträdessvar:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> genom %s har avbokat följande sammanträde:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avbokat följande sammanträde."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> genom %s har föreslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har föreslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> genom %s har avslagit följande sammanträdesändringar:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslagit följande sammanträdesändringar."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> genom %s har publicerat följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publicerat följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> begär att %s tilldelas följande uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> genom %s har tilldelat dig en uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har tilldelat dig en uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> genom %s önskar att lägga till i en befintlig uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> önskar lägga till i en befintlig uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> genom %s önskar få den senaste informationen för följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> önskar få den senaste informationen för följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> genom %s har skickat tillbaka följande svar på en tilldelad uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> har skickat tillbaka följande svar på en tilldelad uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> genom %s har avbokat följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avbokat följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> genom %s har föreslagit följande ändringar i uppgiftstilldelningen:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har föreslagit följande ändringar i uppgiftstilldelningen:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> genom %s har avslagit följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslagit följande tilldelade uppgift:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> genom %s har publicerat följande memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publicerat följande memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> genom %s önskar lägga till i ett befintligt memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> önskar lägga till i ett befintligt memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> genom %s har avbrutit följande delat memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har avbrutit följande delat memo:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Öppna kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "A_vslå"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "A_vslå"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "_Acceptera"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "A_vslå alla"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "_Preliminärt alla"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Preliminärt"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Acceptera alla"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Skicka information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Uppdatera svarandestatus"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Uppdatera"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Starttid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Sluttid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Kommentar: "
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "Sva_ra till avsändaren"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Skicka _uppdateringar till deltagarna"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "_Tillämpa på alla instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Visa tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Bilagepåminnare"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Uppgifter :"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Memon :"
 
@@ -18611,7 +18765,7 @@ msgstr "Genererar ett D-Bus-meddelande när nya meddelanden anländer."
 
 #: ../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 "Om \"sant\", använd pip, spela annars upp ljudfil när nya meddelanden anländer."
+msgstr "Om \"true\", använd pip, spela annars upp ljudfil när nya meddelanden anländer."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18653,20 +18807,20 @@ msgstr "Huruvida ikonen ska vara blinka eller inte."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huruvida notifiering av nya meddelanden endast ska göras för Inkorgen."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Generera ett _D-Bus-meddelande"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Evolutions e-postnotifiering"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Egenskaper för e-postnotifiering"
 
 #. 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"
@@ -18681,55 +18835,55 @@ msgstr[1] ""
 "Du har fått %d nya meddelanden\n"
 "i %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."
 msgstr[0] "Du har fått %d nytt meddelande."
 msgstr[1] "Du har fått %d nya meddelanden."
 
-#: ../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 "Nya e-postmeddelanden"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Visa ikon i _notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "B_linka med ikon i notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Visa popup_meddelande tillsammans med ikonen"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "Spela _upp ljud när nya meddelanden anländer"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Spela upp _ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Välj ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:750
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Spela u_pp"
 
-#: ../plugins/mail-notification/mail-notification.c:807
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifiera om nya meddelanden endast för _inkorgen"
 
@@ -18851,8 +19005,9 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Skicka e-postmeddelande till sändlista?"
 
 #: ../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 ""
@@ -19024,19 +19179,19 @@ msgstr "Klartextläge"
 msgid "Prefer plain-text"
 msgstr "Föredrar klartext"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Visa HTML om sådan finns"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Föredrar VANLIG TEXT"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Visa alltid bara VANLIG TEXT"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML-lä_ge"
 
@@ -19048,6 +19203,38 @@ msgstr "Evolution-profilering"
 msgid "Writes a log of profiling data events."
 msgstr "Skriver en logg över profildatahändelser."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importera Outlook-meddelanden från PST-fil."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Outlooks CSV and Tab-importör"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Personliga Outlook-mappar (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+msgid "_Address Book"
+msgstr "_Adressbok"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+msgid "A_ppointments"
+msgstr "M_öten"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+msgid "_Journal entries"
+msgstr "_Dagboksposter"
+
+#: ../plugins/pst-import/pst-importer.c:352
+msgid "Importing Outlook data"
+msgstr "Importerar Outlook-data"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Låter kalendrar publiceras på webben"
@@ -19065,9 +19252,8 @@ msgid "_Publish Calendar Information"
 msgstr "_Publicera kalendarinformation"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
-#, fuzzy
 msgid "Are you sure you want to remove this location?"
-msgstr "Är du säker på att du vill ta bort denna URL?"
+msgstr "Är du säker på att du vill ta bort denna plats?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19153,6 +19339,14 @@ msgstr ""
 "iCal\n"
 "Ledig/Upptagen"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "Ny plats"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Redigera plats"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hej Python"
@@ -19503,20 +19697,18 @@ msgstr "En insticksmodul för att konfigurera WebDAV-kontakter."
 msgid "WebDAV contacts"
 msgstr "WebDAV-kontakter"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Undvik IfMatch (behövs på Apache < 2.2.8)"
+msgstr "_Undvik IfMatch (behövs för Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19639,7 +19831,7 @@ msgid "Skip development warning dialog"
 msgstr "Hoppa över varningsdialogen för utveckling"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:27
-#: ../shell/main.c:471
+#: ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
@@ -19856,20 +20048,16 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolutions webbplats"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Fel vid öppnande av webbplats för frågor och svar."
-
-#: ../shell/e-shell-window-commands.c:1174
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-commands.c:1187
+#: ../shell/e-shell-window-commands.c:1183
 #: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-commands.c:1200
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -19898,30 +20086,30 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Växla till %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Okänt systemfel."
 
+#: ../shell/e-shell.c:838
 #: ../shell/e-shell.c:839
-#: ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1262
-#: ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261
+#: ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
@@ -19965,9 +20153,8 @@ msgid "Importer Type"
 msgstr "Importörstyp"
 
 #: ../shell/import.glade.h:6
-#, fuzzy
 msgid "Select Information to Import"
-msgstr "Välj mapp att importera till"
+msgstr "Välj information att importera"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -19984,7 +20171,7 @@ msgstr ""
 "importera externa filer till 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"
@@ -20021,7 +20208,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20029,43 +20216,43 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Starta Evolution och aktivera den angivna komponenten"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga fram ommigrering från Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Inaktivera inläsning av alla insticksmoduler."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Inaktivera förhandsvisningspanelen för e-post, kontakter och uppgifter."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Den personliga informationshanteraren och e-postklienten Evolution"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20079,9 +20266,8 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Är du säker på att du vill glömma alla ihågkomna lösenord?"
 
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "Starta om Evolution"
+msgstr "Kan inte starta Evolution"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Continue"
@@ -20702,8 +20888,8 @@ msgid "Copy"
 msgstr "Kopiera"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Kopiera markerade kontakter till en annan mapp..."
+msgid "Copy selected contacts to another folder"
+msgstr "Kopiera markerade kontakter till en annan mapp"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -20754,8 +20940,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Flyt_ta alla kontakter till..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Flytta markerade kontakter till en annan mapp..."
+msgid "Move selected contacts to another folder"
+msgstr "Flytta markerade kontakter till en annan mapp"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -20799,8 +20985,8 @@ msgid "Save as VCard..."
 msgstr "Spara som VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "Spara markerade kontakter som ett VCard."
+msgid "Save selected contacts as a VCard"
+msgstr "Spara markerade kontakter som ett VCard"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
@@ -20820,16 +21006,16 @@ msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "Skicka ett meddelande till de markerade kontakterna."
+msgid "Send a message to the selected contacts"
+msgstr "Skicka ett meddelande till de markerade kontakterna"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Skicka meddelande till kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "Skicka markerade kontakter till en annan person."
+msgid "Send selected contacts to another person"
+msgstr "Skicka markerade kontakter till en annan person"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -20852,7 +21038,7 @@ msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
 #: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Åtgärder"
@@ -21012,14 +21198,24 @@ msgid "View the current appointment"
 msgstr "Visa det aktuella mötet"
 
 #: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Visa felsökningskonsollen för loggmeddelanden"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Vecka"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "_Felsökningsloggar"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Öppna möte"
 
@@ -21089,10 +21285,6 @@ msgstr "Visa förhandsgranskningsfönster för meddelanden"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Visa felsökningskonsollen för loggmeddelanden"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Klassisk vy"
@@ -21101,10 +21293,6 @@ msgstr "_Klassisk vy"
 msgid "_Copy Folder To..."
 msgstr "_Kopiera mapp till..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Felsökningsloggar"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Hämta ner meddelanden för frånkopplad användning"
@@ -21129,8 +21317,8 @@ msgstr "F_örhandsgranskning"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "_Prenumerationer"
+msgid "_Subscriptions..."
+msgstr "_Prenumerationer..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -21209,10 +21397,6 @@ msgstr "Ta bort alla borttagna meddelanden från denna mapp permanent"
 msgid "Permanently remove this folder"
 msgstr "Ta bort denna mapp permanent"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "Up_pdatera..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Uppdatera mappen"
@@ -22160,42 +22344,42 @@ msgid "_Replace existing view"
 msgstr "_Ersätt befintlig vy"
 
 #. 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 "Anpassad vy"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Spara anpassad vy"
 
-#: ../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 "Definiera vyer..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Aktu_ell vy"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Välj vy: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Aktuell vy är en anpassad vy"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Spara anpassad vy..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Spara aktuell anpassad vy"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Skapa eller redigera vyer"
 
@@ -22219,7 +22403,7 @@ msgstr "Typ av vy"
 msgid "Type of view:"
 msgstr "Typ av vy:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Bilagerad"
 
@@ -22330,16 +22514,16 @@ msgstr "Minsta bredd"
 msgid "Spacing"
 msgstr "Mellanrum"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Nu"
 
-#: ../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 "Tiden måste anges i formatet: %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 "Procentvärdet måste vara mellan 0 och 100"
 
@@ -22839,7 +23023,7 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Klicka här för att gå till url"
 
@@ -22879,23 +23063,23 @@ msgstr "Fokuserad kolumn"
 msgid "Unselected Column"
 msgstr "Omarkerad kolumn"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Genomstryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Understryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Gör kolumn fet"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Färglägg kolumn"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Bakgrundsfärga kolumn"
 
@@ -23372,17 +23556,84 @@ msgstr "Rita knapp"
 msgid "Cursor position"
 msgstr "Markörposition"
 
-#: ../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 "IM-sammanhang"
 
 # Skum. Kolla denna
-#: ../widgets/text/e-text.c:3787
-#: ../widgets/text/e-text.c:3788
+#: ../widgets/text/e-text.c:3789
+#: ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Hantera popupfönster"
 
+#~ 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 ""
+#~ "Vi kunde inte öppna denna adressbok. Detta betyder antingen att du har "
+#~ "angett en felaktig URI eller att LDAP-servern inte går att komma åt."
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Test av stilredigeraren för kontaktutskrifter"
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright © 2000, Ximian, Inc."
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Detta bör testa redigerarwidgeten för stilen på kontaktutskrifter"
+#~ msgid "Contact Print Test"
+#~ msgstr "Test av utskrift av kontakter"
+#~ msgid "This should test the contact print code"
+#~ msgstr "Detta bör testa koden för utskrift av kontakter"
+#~ msgid "Business"
+#~ msgstr "Arbete"
+#~ msgid "Competition"
+#~ msgstr "Konkurrans"
+#~ msgid "Favourites"
+#~ msgstr "Favoriter"
+#~ msgid "Gifts"
+#~ msgstr "Presenter"
+#~ msgid "Goals/Objectives"
+#~ msgstr "Mål"
+#~ msgid "Holiday"
+#~ msgstr "Semester"
+#~ msgid "Holiday Cards"
+#~ msgstr "Semestervykort"
+#~ msgid "Hot Contacts"
+#~ msgstr "Viktiga kontakter"
+#~ msgid "Ideas"
+#~ msgstr "Idéer"
+#~ msgid "International"
+#~ msgstr "Internationellt"
+#~ msgid "Key Customer"
+#~ msgstr "Viktig kund"
+
+# Felstavat... borde buggrapporteras.
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+#~ msgid "Next 7 days"
+#~ msgstr "Närmsta 7 dagarna"
+#~ msgid "Phone Calls"
+#~ msgstr "Telefonsamtal"
+#~ msgid "Strategies"
+#~ msgstr "Strategier"
+#~ msgid "Suppliers"
+#~ msgstr "Leverantörer"
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Tid och utlägg"
+#~ msgid "VIP"
+#~ msgstr "VIP"
+#~ msgid "Waiting"
+#~ msgstr "Väntar"
+#~ msgid "Next 7 Days"
+#~ msgstr "Närmsta 7 dagarna"
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Väder: Delvis molnigt"
+#~ msgid "Please enter user name first."
+#~ msgstr "Ange användarnamnet först."
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Fel vid öppnande av webbplats för frågor och svar."
+#~ msgid "Re_fresh..."
+#~ msgstr "Up_pdatera..."
 #~ msgid "A_dd Filter Criteria"
 #~ msgstr "Lägg til_l filterkriteria"
 #~ msgid "Mark calendar offline"
@@ -23453,7 +23704,6 @@ msgstr "Hantera popupfönster"
 #~ msgstr "_Spara meddelande"
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
 #, fuzzy
 #~ msgid ""
 #~ "The selected folder does not have enough permissions to create the file"
@@ -23742,8 +23992,6 @@ msgstr "Hantera popupfönster"
 #~ msgstr "Denna dagbokspost har tagits bort."
 #~ msgid "This journal entry has been changed."
 #~ msgstr "Denna dagbokspost har ändrats."
-#~ msgid "Journal entry - %s"
-#~ msgstr "Dagbokspost - %s"
 #~ msgid "The journal entry could not be deleted due to a corba error"
 #~ msgstr "Dagboksposten kunde inte tas bort på grund av ett corba-fel"
 #~ msgid "The journal entry could not be deleted because permission was denied"
diff --git a/po/ta.po b/po/ta.po
index 4a16a4dc12..805a2e7cf1 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,3 +1,4 @@
+# translation of evolution.HEAD.po to Tamil
 # translation of evolution.HEAD.ta.po to
 # translation of evo-ta.po to
 # translation of ta.po to
@@ -5,43 +6,44 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-#: ../shell/main.c:589
+#: ../shell/main.c:603
 # Jayaradha N <jaya@pune.redhat.com>, 2004.
 # Felix <ifelix@redhat.com>, 2006.
 # Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
 # Dr.T.vasudevan <agnihot3@gmail.com>, 2008.
+# I. Felix <ifelix@redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.ta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-18 08:39+0000\n"
-"PO-Revision-Date: 2008-09-18 18:01+0530\n"
-"Last-Translator: \n"
-"Language-Team:  <en@li.org>\n"
+"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-19 17:15+0000\n"
+"PO-Revision-Date: 2009-01-29 13:55+0530\n"
+"Last-Translator: I. Felix <ifelix@redhat.com>\n"
+"Language-Team: Tamil <fedora-trans-ta@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
 "\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "எவல்யூஷன் முகவரி புத்தகம்"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "புதிய தொடர்பு"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "புதிய தொடர்பு பட்டியல்"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -158,7 +160,7 @@ msgid "calendar view for one or more days"
 msgstr "ஒன்று அல்லது அதற்கு மேற்பட்ட நாட்களின் நாள்காட்டி பார்வை"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -169,8 +171,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c: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:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -178,9 +180,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 +190,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 +203,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%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 "க்னோம் நாள்காட்டி"
 
@@ -273,19 +275,19 @@ msgstr "மாற்று"
 msgid "toggle the cell"
 msgstr "அறைகளுக்கிடையே மாற்று"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "விரிவு"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "இந்த அறை உள்ள வரியை ஈடிரீயில் விரிவாக்குகிறது."
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "குறுக்கு"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "இந்த அறை உள்ள வரியை ஈடிரீயில் குறுக்குகிறது."
 
@@ -419,7 +421,7 @@ msgstr "எல்டிஏபி(LDAP) சேவகனில் சான்ற�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "தொடர்பினை அழிக்க முடியவில்லை"
 
@@ -432,6 +434,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "எல்டிஏபி(LDAP) சேவகன் சரியான மாதிரி தகவலுக்கு பதில் தராமல் உள்ளது."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "சேவையகப பதிப்பு"
 
@@ -553,7 +556,7 @@ msgstr "(_U) இருப்பது போலவே பயன்படுத�
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -562,21 +565,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "இயல்பான ஒத்திசைந்த முகவரி:"
 
-#: ../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 "முகவரி புத்தகத்தை ஏற்ற முடியவில்லை"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "பைலட் முகவரி பயன்பாட்டு பகுதியை படிக்க முடியவில்லை"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "தானியங்கிமுடிவு"
 
@@ -594,9 +598,9 @@ msgstr "தானாக சரிபார்தல் பகுதியை இ
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../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 "தொடர்புகள்"
@@ -637,13 +641,13 @@ msgstr "இங்கே உங்கள் 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/calendar-component.c:244
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "இந்த கணிப்பொறியில்"
 
@@ -654,13 +658,12 @@ msgstr "இந்த கணிப்பொறியில்"
 #. 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 "தனிப்பட்ட"
 
@@ -691,7 +694,7 @@ msgid "Create a new contact list"
 msgstr "புதிய தொடர்பு பட்டியலை உருவாக்கு"
 
 #: ../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 "புதிய முகவரிப்புத்தகம்"
 
@@ -709,61 +712,61 @@ msgstr "புதிய முகவரி புத்தகத்தை உர
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "முகவரிப்புத்தக அமைவுகள் மற்றும் அடைவுகளை மேம்படுத்த முடியவில்லை"
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "அடிப்படை"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_வகை:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "(_b) இணைப்பில் இல்லாமல் பணிபுரிய புத்தக உள்ளடக்கங்களை நிலைவட்டில் நகலெடு "
 
-#: ../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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "பொது"
 
-#: ../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 "முகவரி புத்தகம்"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "சேவையக தகவல்"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "அங்கீகாரம்"
 
-#: ../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 "விவரம்"
 
-#: ../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 "தேடுகிறது"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "பதிவிறக்குகிறது"
 
-#: ../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 "முகவரி புத்தகத்தின் பண்புகள்"
@@ -830,53 +833,60 @@ msgstr ""
 "\n"
 "எவல்யூஷன் உங்கள் கையடக்க கணினி தகவல் ஒத்திசைதல் இடம்பெயர்க்கும் வரை காத்திருக்கவும்..."
 
-#: ../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 "\"%s\" அடைவை இப்படி மறுபெயரிடு:"
 
-#: ../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 "அடைவிற்கு மறுபெயரிடு"
 
-#: ../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 "அடைவு பெயர் '/'ஐ கொண்டிருக்கக்கூடாது"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_ப புதிய முகவரிப்புத்தகம்"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "விகார்ட் ஆக சேமிக்கவும்..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "(_R)மறுபெயரிடு"
+
+#: ../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:1693 ../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
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_ந நீக்கு"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "(_P)பண்புகள்"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "மூல தேர்வாளரை தொடர்பு கொள்ளவும்"
 
@@ -897,8 +907,8 @@ msgstr " %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 "கடவுச்சொல்லை உள்ளிடு"
@@ -924,32 +934,52 @@ msgstr ""
 "பலகத்தின் நிலை, பிக்ஸல்களில்."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "முன்பார்வை பலகத்தை காட்டு"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "எவல்யூஷன் தானாக முடிக்க, நீங்கள் தட்டச்சு செய்ய வேண்டிய எழுத்துக்களின் எண்ணிக்கை"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "பெயர்களை தேர்ந்தெடு உரையாடலுக்கு  கடைசியாக பயன்படுத்திய அடைவுக்கான யூஆர்ஐ(URI) "
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "பெயர்களை தேர்ந்தெடு உரையாடலுக்கு  கடைசியாக பயன்படுத்திய அடைவுக்கான யூஆர்ஐ(URI) "
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "செங்குத்து பலக நிலை"
 
-#: ../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 "முன்பார்வை பலகத்தை காட்டு வேண்டுமா."
 
+#: ../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 "_Lookup in local address book only"
+msgid "Look up in address books"
+msgstr "(_L) உள் முகவரி புத்தக த்தில் மட்டும் தேடு"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -960,7 +990,7 @@ msgstr "3268"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
-msgstr " "
+msgstr "389"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
@@ -1136,14 +1166,17 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 "தேடலின் எல்லை நீங்கள் எவ்வளவு ஆழமாக அடைவுகளுக்குள் தேட விரும்புகிறீர்கள் என்பதை "
-"குறிப்பிடும். \"உப\" இன் எல்லை கீழ்கண்ட பாதைகளில் தேடும். \"ஒன்று\" ஒரே ஒரு மட்டத்தில் "
+"குறிப்பிடும். \"sub\" இன் எல்லை கீழ்கண்ட பாதைகளில் தேடும். \"one\" ஒரே ஒரு மட்டத்தில் "
 "மட்டும் தேடல் பணியை செய்யும்."
 
 #: ../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"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "இது உங்கள் எல்டாப் சேவகனின் முழு பெயர். உதாரணம், \"ldap.mycompany.com"
+msgstr "இது உங்கள் LDAP சேவகனின் முழு பெயர். உதாரணம், \"ldap.mycompany.com\""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1154,13 +1187,17 @@ msgstr ""
 "முகவரிப்புத்தகத்தை அணுகுவதில் தாமதம் ஏற்படும்."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#| msgid ""
+#| "This is the method Evolution will use to authenticate you.  Note that "
+#| "setting this to \"Email Address\" requires anonymous access to your ldap "
+#| "server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"எவல்யூஷன் உங்களை அனுமதிக்க பயன்படுத்தும் முறை. இதை \" மின்னஞ்சல் முகவரியாக \"அமைக்க "
-"ldap சேவையகத்திற்கு யார்வேண்டுமானாலும் அணுகுவதற்கான பெயரில்லா அனுமதியை தரவேண்டும்."
+"எவல்யூஷன் உங்களை அனுமதிக்க பயன்படுத்தும் முறை. இதை \"Email Address\"அமைக்க "
+"LDAP சேவையகத்திற்கு யார்வேண்டுமானாலும் அணுகுவதற்கான பெயரில்லா அனுமதியை தரவேண்டும்."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1208,7 +1245,7 @@ msgstr "உள் நுழையும் முறை: (_L)"
 
 #: ../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:"
@@ -1223,7 +1260,7 @@ msgid "_Search scope:"
 msgstr "(_S)தேடல் எல்லை:"
 
 #: ../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 "(_S)சேவகன்:"
@@ -1241,13 +1278,14 @@ msgid "cards"
 msgstr "அட்டைகள்"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "நிமிடங்கள்"
 
@@ -1288,8 +1326,8 @@ msgid "<b>Work</b>"
 msgstr "<b>வேலை</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1300,16 +1338,16 @@ msgid "Ca_tegories..."
 msgstr "(_t)வகைகள்..."
 
 #: ../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 "தொடர்பு"
 
 #: ../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 "தொடர்பு தொகுப்பி"
 
@@ -1318,11 +1356,12 @@ msgid "Full _Name..."
 msgstr "முழு பெயர்(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "உரு"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN செய்தி அனுப்பி"
 
@@ -1335,1251 +1374,1266 @@ msgid "Nic_kname:"
 msgstr "புனைப்பெயர்(_k):"
 
 #: ../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
+#, fuzzy
+#| msgid "Novell Groupwise"
+msgid "Novell GroupWise"
+msgstr "பழைமையான குழுவாரியாக"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "பழைமையான குழுவாரியாக"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "சொந்த தகவல்"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "தொலைபேசி"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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 "வேலை"
 
-#: ../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 "(_A)முகவரி"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "ஆண்டு விழா: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "உதவியாளர்: (_A)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "பிறந்தநாள்:(_B)"
 
-#: ../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:1893
 msgid "_Calendar:"
 msgstr "நாள்காட்டி:(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "நகரம்: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "நிறுவனம்: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "நாடு: (_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "துறை: (_D)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "(_F)கோப்பின் கீழ்:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "ஓய்வு/பணியில்: (_F)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "முதன்மை பக்கம்: (_H)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "மேலாளர்: (_M)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "குறிப்புகள்: (_N)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "அலுவலகம்: (_O)"
 
-#: ../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 "(_P)தபால் பெட்டி எண்:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "வேலை: (_P)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "துணைவர்: (_S)"
 
-#: ../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 "(_S)மாநிலம்/பிரதேசம்:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "(_T)தலைப்பு:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "வீடியோ அரட்டை: (_V)"
 
-#: ../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 "HTML மின்னஞ்சலை பெற வேண்டுமா (_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "இணைய பதிவு: (_W)"
 
-#: ../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 "(_W) எங்கே:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "அஞ்சல் குறியீடு: (_Z)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "முகவரி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "தொகுக்கக்கூடிய"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "அமெரிக ஐக்கிய நாடுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "ஆப்கானிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "அல்பேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "அல்ஜீரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "அமெரிக்கன் சமோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "அன்டோரா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "அங்கோலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "அங்குல்லா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "அண்டார்ட்டிக்கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "ஆன்டிக்குவா மற்றும் பார்புடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "அர்ஜென்டினா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "அர்மெனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "அருபா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "ஆஸ்திரேலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "ஆஸ்திரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "அசர்பஜான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "பஹாமா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "பஹ்ரெயின்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "பங்ளாதேஷ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "பார்படாஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "பெலாருஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "பெல்ஜியம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "பெலிஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "பெனின்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "பெர்முடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "பூட்டான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "பொலிவியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "போஸ்னியா மற்றும் ஹர்சேகோவினா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "போஸ்வானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "போவெட் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "ப்ரேசில்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "ப்ரிடீஸ் இந்திய பெருங்கடல் பிரதேசம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "ப்ரூனே தருசலம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "பல்கேரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "ப்ருகினா பாசோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "ப்ருன்டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "கம்போடியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "கேமரூன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "கனடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "கேப் வெர்டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "சைமன் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "மத்திய ஆப்ரிக்க குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "சாட்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "சிலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "சீனா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "கிறிஸ்துமஸ் தீவுதீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "கோகோஸ்(கீலிங்) தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "கொலம்பியா்பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "கோமொரொஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "காங்கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "காங்கோ குடியரசின்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "குக் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "கோஸ்டா ரிக்கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "கோட் டில்வொரி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "கொரிட்டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "க்யூபா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "சைப்ரஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "செக் குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "டென்மார்க்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "டிஜ்பொட்டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "டொம்னிக்கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "சொமினிக் குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "ஈக்வடார்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "எகிப்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "எல் சால்வடார்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "ஈக்வடோசியல் கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "எரிட்ரிய"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "எஸ்தோனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "எதியோப்பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "ஃபிளாங்லான் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "ஃபோரி தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "பிஜி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "பின்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "ஃப்ரான்ஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "ஃப்ரெஞ்ச் கையானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "ஃப்ரெஞ்ச் பாலினேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "ஃப்ரெஞ்ச் தெற்கு பிரதேசம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "கபான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "ஜாம்பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "ஜியார்ஜியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "ஜெர்மனி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "கானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "கிப்ரால்டர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "க்ரீஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "க்ரீன்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "க்ரெனடா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "க்வாடிலோப்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "க்கம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "க்வாதிமாலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "க்ரென்சி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "கினியா-பிசாயு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "கயானா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "ஹைடி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "ஹார்ட் மற்றும் மெக்டொனால் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "ஹோலி சீ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "ஹோன்டுராஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "ஹாங்காங்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "ஹங்கேரி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "ஐஸ்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "இந்தியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "இந்தோனேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "ஈரான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "ஈராக்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "அயர்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "இஸ்லி ஆஃப் மேன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "இஸ்ரேல்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "இத்தாலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "ஜமைக்கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "ஜப்பான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "ஜெர்சி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ஜோர்டான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "கசகிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "கென்யா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "க்ரிபட்டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "கொரியா, குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "கொரியா, குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "குவைத்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "கிரிகிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "லாவோஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "லாத்வியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "லெபனான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "லெஸத்தோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "லாபேரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "லிபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "லிசன்ஸ்டைன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "லிதுவேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "லக்ஸம்பர்க்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "மகாவோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "மெசிடோனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "மடகாஸ்கர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "மாலாவி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "மலேசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "மாலதீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "மாலி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "மால்டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "மார்ஷெல் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "மார்டினிக்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "மாரிடேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "மொரீஷியஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "மயோதி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "மெக்ஸிகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "மெக்ரோனிசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "மால்டோவா குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "மொனாக்கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "மங்கோலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "மோன்ஸிராட்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "மொரோக்கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "மொசாம்பிக்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "மியான்மர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "நமீபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "நௌரு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "நேபால்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "நெதர்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "நெதர்லாந்து ஆன்டிலிஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "நியூ காலிடொனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "நியூசிலாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "நிகராகுவா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "நிகெர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "நைஜீரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "நியு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "நொர்ஃபோக் தீவு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "வடக்கு மெரைனா தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "நார்வே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "ஓமன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "பாகிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "பாலௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "பாலஸ்தீனிய பிரதேசம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "பனாமா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "பாபௌ நியூ கினியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "பராகுவே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "பெரு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "பிலிப்பைன்ஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "பிட்கேரின்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "போலந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "போர்சுகல்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "பௌட்டோ ரிக்கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "கதார்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ரீயூனியன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "ரோமானியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ரஸ்யன் ஃபெடரேஷன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "ருவான்டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "செயின் கிட்ட்ஸ் மற்றும் நெவிஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "செயின்ட் லூசியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "செயின்ட் வின்ஸ்சென்ட் மற்றும் க்ரீனாடைன்ஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "சாமௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "சான் மரினோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "சயோ டோம் மற்றும் பிரின்ஸ்ப்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "சௌதி அரேபியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "செனெகல்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "செர்பியா மற்றும் மொன்டெனெங்ரோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "செய்செல்லெஸ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "சியரா லியோன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "சிங்கபூர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "ஸ்லோவோக்கியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "ஸ்லோவேனியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "சாலமொன் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "சோமாலியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "தென் ஆப்ரிக்கா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "தெற்கு ஜியார்ஜியா மற்றும் தெற்கு சான்விச் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "ஸ்பெயின் "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "இலங்கை"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "செயின்ட் ஹெலெனா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "செயின்ட் பிரி மற்றும் மிஃயூலான்்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "சூடான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "சுரினாம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "ஸ்வால்பார் மற்றும் ஜான் மாயென் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "ஸ்வாசிலாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ஸ்வீடன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "சுவிசர்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "சிரியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "தாய்வான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "தஜிகிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "தான்சானியா குடியரசு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "தாய்லாந்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "திமோர்-லெஸ்டி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "டோகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "டோகெலௌ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "தாங்கோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "டிரினிடாட் மற்றும் டொபாகோ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "டுனீஷியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "துருக்கி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "துர்க்மெனிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "துர்க்ஸ் மற்றும் காய்கோஸ் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "துவாலு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "உகாண்டா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "உக்ரெயின்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "யுனெய்டர் அரப் எமிரேட்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "யுனைட்டட் கிங்டம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "அமெர்க்க ஐக்கிய மைனர் அவுட்லேயிங் தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "உருகுவே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "உஸ்பெகிஸ்தான்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "வனாட்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "வெனிசூலா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "வியட்னாம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "வெர்ஜின் தீவுகள், ப்ரிடீஷ்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "வெர்ஜின் தீவுகள் , U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "வாலிஸ் மற்றும் ஃபுட்னா தீவுகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "மேற்கு சஹாரா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "யேமன்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "ஜாம்பியா்பியா"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "ஜிம்பாப்வே"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "பெயர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL உடனுக்குடன் செய்தி அனுப்பி"
 
-#: ../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 "ஜப்பார்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "யாகூ செய்தி அனுப்பி"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu செய்தி அனுப்புபவர்"
 
-#: ../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
+#, fuzzy
+#| msgid "Type"
+msgid "Skype"
+msgstr "வகை"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "சேவைகள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "இடம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "பயனீடாளர் பெயர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "இல்லம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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:2259
 msgid "Other"
 msgstr "மற்றவை"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "யாகூ"
 
-#: ../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 "குழுக்களாக"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "மூல புத்தகம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "சேரும் புத்தகம்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "புதிய தொடர்பு"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "எழுதக்கூடிய புலங்கள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "தேவையான புலங்கள்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "மாற்றப்பட்டது"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ஆசிரியரை தொடர்பு கொள்ளவும் - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "இந்த தொடர்பிலிருந்து படத்தை தேர்வு செய்யவும்"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "படங்கள் இல்லை (_N)"
 
-#: ../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"
@@ -2587,43 +2641,43 @@ msgstr ""
 "தொடர்பின் தகவல் செல்லாது:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ஒரு தவறான வடிவத்தை கொண்டுள்ளது"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' தவறான வடிவத்தை கொண்டுள்ளது"
 
-#: ../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' வெற்றாக உள்ளது"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "செல்லாத தொடர்பு"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "தொடர்பு வேகமாக- சேர்"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "(_E)முழுவதும் திருத்து"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "முழுப் பெயர் (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "மின்னஞ்சல் (_m)"
 
-#: ../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 "முகவரிப்புத்தகத்தை தேர்ந்தெடு (_S)"
 
@@ -2760,9 +2814,9 @@ msgstr "(_I)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 "(_L)இடம்:"
 
@@ -2776,6 +2830,9 @@ msgid "Contact List Editor"
 msgstr "தொடர்பு பட்டியல் தொகுப்பி"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "தேர்ந்தெடு..."
 
@@ -2803,9 +2860,9 @@ msgid "_Members"
 msgstr "உறுப்பினர்கள் (_M)"
 
 #: ../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"
@@ -2863,23 +2920,23 @@ msgstr "தொடர்புகளை ஒன்றாகச் சேர்க"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "மின்னஞ்சல் முகவரி"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "எந்த புலத்திலும்"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "மின்னஞ்சல் துவக்கத்தில்"
 
@@ -2887,35 +2944,35 @@ msgstr "மின்னஞ்சல் துவக்கத்தில்"
 msgid "Name contains"
 msgstr "பெயரில் உள்ளது"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "தொடர்புகள் எதுவும் இல்லை"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d தொடர்பு"
 msgstr[1] "%d தொடர்புகள்"
 
-#: ../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 "கேள்வி"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "புத்தக பார்வையில் பிழை"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c: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/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "மாதிரி"
 
@@ -2923,31 +2980,31 @@ msgstr "மாதிரி"
 msgid "Error modifying card"
 msgstr "அட்டையை திருத்தும் போது பிழை"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "பெயரின் துவக்கத்தில்"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "மூலம்"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "வகை"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "விகார்ட் என சேமி..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "(_O)திற"
@@ -3001,12 +3058,12 @@ msgid "Cu_t"
 msgstr "(_t)வெட்டு"
 
 #: ../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:1678 ../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
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3017,14 +3074,20 @@ msgid "P_aste"
 msgstr "ஒட்டு (_a)"
 
 #. 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 "ஏதாவது ஒரு வகை"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "பொருந்தவில்லை"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "உதவியாள்"
 
@@ -3054,7 +3117,7 @@ msgstr "கார் தொலைபேசி எண்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3062,7 +3125,7 @@ msgid "Categories"
 msgstr "வகைகள்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "நிறுவனம்"
 
@@ -3111,22 +3174,22 @@ msgid "Journal"
 msgstr "இதழ்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "மேலாளர்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "மொபைல் தொலைபேசி"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "புனைபெயர்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "குறிப்பு"
 
@@ -3155,14 +3218,14 @@ msgid "Radio"
 msgstr "வானொலி"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "பங்கு"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "மனைவி"
 
@@ -3192,55 +3255,55 @@ msgstr "அலகு"
 msgid "Web Site"
 msgstr "இணைய தளம்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-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 "அகலம்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c: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 "உயரம்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "துவக்கதில்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "புலம்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "புலத்தின் பெயர்"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "மாதிரி உரை"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "புலத்தின் பெயரின் அதிக பட்ச நீளம்"
 
@@ -3310,83 +3373,83 @@ msgstr ""
 msgid "Adapter"
 msgstr "ஏற்பி"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "பணி மின்னஞ்சல்"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "வீட்டு மின்னஞ்சல்"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "வேறு மின்னஞ்சல்"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "தேர்வு செய்யப்பட்ட"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "கர்சர் உள்ளது"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "(_O)இணைப்பை உலாவியில் திற"
 
-#: ../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 "(_C)இணைப்பை நகலெடு"
 
-#: ../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 "செய்தியை அனுப்பு... (_S)"
 
-#: ../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 "மின்னஞ்சல் முகவரிகளை நகலெடுக்கவும் (_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(வரைபடம்)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "வரைபடம்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "உறுப்பினர்களின் பட்டியல்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "துறை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "பணி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "நிலை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "வீடியோ அரட்டை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c: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:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3397,206 +3460,215 @@ msgstr "வீடியோ அரட்டை"
 msgid "Calendar"
 msgstr "நாள்காட்டி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ஓய்வு/பணியில்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "தொலைபேசி எண்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "தொலை நகலி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "முதன்மை பக்கம்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "இணைய பதிவு"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "பிறந்தநாள்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "ஆண்டு விழாநாள்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "வேலையின் தலைப்பு"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "வீட்டுப்பக்கம்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "வலைப்பூ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "வெற்றி"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "பின்னே வேலையாக "
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "கிடங்கு இயக்கதில் இல்லை"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "முகவரி புத்தகம் இல்லை"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "சுய தொடர்பு தகவல் இல்லை"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "அனுமதி மறுக்கப்பட்டது"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "தொடர்பு காணவில்லை"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "தொடர்பு அடையாள எண் ஏற்கெனவே உள்ளது"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "விதிமுறைக்கு ஆதரவு இல்லை"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-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:2561
 msgid "Canceled"
 msgstr "ரத்து செய்யப்பட்டது"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "ரத்து செய்ய முடியாது"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "அனுமதி சோதிப்பு தோல்வியுற்றது"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "அனுமதியை சோதிக்க வேண்டும்"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS கிடைக்கவில்லை"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "இது போன்ற மூலம் இல்லை"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "இணைப்பில்லா முறையில் இல்லை"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "மற்ற பிழை"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "தவறான சேவையக பதிப்பு"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "துணையில்லாத உறுதி செய்யும் செயல்பாடு"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+#| 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"
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "முகவரிப்புத்தகத்தை திறக்க  இயலவில்லை. இதனால் தெரிவது இணைப்பு விலகி பயன்படுத்த அதை "
 "குறிக்கவில்லை அல்லது தரவிறக்கவில்லை்லை. தயவு செய்து முகவரிப்புத்தகத்தை இணைப்பில் மீண்டும் "
 "ஏற்றி தரவிறக்கவும்."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
-#, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, fuzzy, 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."
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "இந்த முகவரி புத்தகத்தை திறக்க முடியவில்லை. பாதை %s யை சோதிக்கவும். உங்களுக்கு அணுக "
 "அனுமதி உள்ளதாதா எனவுமபாருங்கள்.் "
 
-#: ../addressbook/gui/widgets/eab-gui-util.c: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 ""
-"இந்த முகவரி புத்தகத்தை திறக்க முடியவில்லை . அதாவது நீங்கள் தவறான யூஆர்ஐ(URI) ஐ "
-"உள்ளிட்டுள்ளீர் அல்லது எல்டிஏபி(LDAP) சேவகனை அணுக முடியவில்லை."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+#| 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."
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "எவல்யூஷனின் இந்த பதிப்பில் எல்டிஏபி(LDAP)  சேவகனின் ஆதரவு இல்லை. நீங்கள் எல்டிஏபி(LDAP) "
 "ஐ எவல்யூஷனில் பயன்படுத்த விரும்பினால் எல்டிஏபி(LDAP)-ஆதரவுள்ள எவல்யூஷனை நிறுவவும்."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
+#| msgid ""
+#| "We were unable to open this address book.  This either means you have "
+#| "entered an incorrect URI, or the server is unreachable."
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "முகவரி புத்தகத்தை திறக்க முடியவில்லை. நீங்கள் தவறான யூஆர்ஐ(URI) ஐ உள்ளிட்டுள்ளீர்கள் அல்லது "
 "சேவகனை தொடர்புகொள்ள முடியவில்லை."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
-msgid "Detailed error:"
+#, fuzzy
+#| msgid "Detailed error:"
+msgid "Detailed error message:"
 msgstr "விவரமான பிழை ்"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:171
@@ -3612,9 +3684,15 @@ msgstr ""
 "அடைவு சேவையகத்தின் விடை வரையரையை அதிகரிக்கவும்"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
+#| 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"
+#| "more specific or raise the time limit in the directory server\n"
+#| "preferences for this address book."
 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 ""
@@ -3737,22 +3815,22 @@ msgstr "தொடர்புகளை நகர்த்து"
 msgid "Copy contacts to"
 msgstr "தொடர்புகளை நகர்த்து"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "பல விகார்ட்கள்"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "%s க்கான விகார்ட்"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "தொடர்பு தகவல்"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sக்கு தொடர்பு தகவல்"
@@ -3761,23 +3839,23 @@ msgstr "%sக்கு தொடர்பு தகவல்"
 msgid "Querying Address Book..."
 msgstr "முகவரி புத்தகத்தில் கேள்வி கேட்க்கப்படுகிறது..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "வேறு ஒரு தொடர்பு உள்ளது."
 msgstr[1] "%d வேறு தொடர்புகள் உள்ளன."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "முழு விகார்ட் ஐ காட்டு"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "கையடக்க விகார்ட்"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "முகவரி புத்தகத்தில் சேமி"
 
@@ -3786,10 +3864,10 @@ msgid "Card View"
 msgstr "அட்டை காட்சி"
 
 #: ../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 "ஏற்றுகிறது...."
 
@@ -3817,19 +3895,19 @@ msgstr "எவலுஷன் CSV அல்லது Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "எவலுஷன் CSV மற்றும் Tab இறக்கி"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "எல்டிஏபி(LDAP) தகவல் பறிமாற்ற வடிவம் (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "எவல்யூஷன் LDIF ஏற்றி"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "விகார்ட் (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "எவல்யூஷன் விகார்ட் ஏற்றி"
 
@@ -3878,7 +3956,7 @@ msgstr "வடிவம்"
 #: ../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 "தலைப்பு"
@@ -3981,9 +4059,9 @@ msgstr "நிழல்"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c: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 "அளவு:"
 
@@ -4012,29 +4090,8 @@ msgstr "அகலம்:"
 msgid "_Font..."
 msgstr "(_F)எழுத்துரு..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "தொடர்புகளின்அச்சு பாணி தொகுப்பியின் சோதனை"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "இது அச்சின் பாணியின் சாளர அளவை சோதிக்கும்"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "தொடர்பு அச்சு சோதனை"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "தொடர்பு அச்சு எண்ணை சோதிக்கும்"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c: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 "கோப்பை திறக்க முடியவில்லை"
@@ -4047,57 +4104,57 @@ msgstr "முகவரி புத்தகங்களின் பட்ட�
 msgid "failed to open book"
 msgstr "புத்தகத்தை திறக்கும் போது தோல்வி"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "நிலையான விளைவுக்கு பதிலாக தற்போதைய விளைவை காட்டு"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "உள் முகவரி புத்தக அடைவுகளை பட்டியலிடு"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "அட்டைகளை vcard அல்லது csv ஆக காட்டு"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "ஒருங்கிணைப்பில்லா முறையில் ஏற்று"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "ஒத்திசையா பாணியில் ஒரு வெளியீட்டு கோப்பில் அட்டைகளின் எண்  முன்னிருப்பு அளவு 100"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "கட்டளை வரி அளவுரு பிழை; --help தேர்வை பயன்படுத்தி பயன்பாட்டை தெரிந்துகொள்ளவும்"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "csv அல்லது vcard க்கு மட்டும் ஆதரவு உண்டு"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "ஒரே காலமல்லா பாங்கில் விளைவுக்கோப்பு"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "இயல்பான முறையில், அளவு விருப்பத்திற்கு அவசியமில்லை."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "கையாள முடியாத பிழை"
 
@@ -4198,19 +4255,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "இந்த நேர ஒதுக்கத்தை நீக்க வேண்டுமா?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "இந்த கூட்டத்தை நீக்க விருப்பமா?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "நிச்சயமாக இந்த குறிப்பை நீக்க வேண்டுமா?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "நிச்சயமாக இந்த பணியை நீக்க  வேண்டுமா?"
@@ -4228,66 +4285,79 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "பணியை சுருக்கம் இல்லாமல் அனுப்ப வேண்டுமா?"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+#| msgid "Repository offline"
+msgid "Calendar repository is offline."
+msgstr "கிடங்கு இயக்கதில் இல்லை"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "ஒரு புதிய நிகழ்வினை உருவாக்க முடியவில்லை"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr " நிகழ்வினை சேமிக்க முடியவில்லை"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "நாள்காட்டியை அழிக்க வேண்டுமா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "குறிப்பு பட்டியலை அழிக்க வேண்டுமா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "பணி பட்டியலை அழிக்க வேண்டுமா '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "அனுப்ப வேண்டாம் (_n)"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "பதிவிறக்கும் நடைபெறுகிறது. நேர ஒதுக்கம் ஏற்பாட்டினை சேமிக்க வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "பதிவிறக்கும் நடைபெறுகிறது. பணியினை சேமிக்க வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "தொகுப்பியை ஏற்ற முடியவில்லை."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "இந்த பணியை ஏற்பதற்கான அனைத்து பங்கேற்பாளர்களுக்கும் அழைப்பு அனுப்பபடும்"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "மின்னஞ்சல் மூலம் அனைத்து பங்கு கொள்வோருக்கும் அழைப்புகள் அனுப்பபடும். அவர்கள் பதில் அனுப்ப "
 "அனுமதிக்கப்படுவார்கள்."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "நாள்காட்டியை ஏற்றும் போது பிழை"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "குறிப்பு பட்டியலை ஏற்றும் போது பிழை"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "பணி பட்டியலை ஏற்றும் போது பிழை"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+#| msgid "Error while {0}."
+msgid "Error on '{0}'"
+msgstr "{0}.போது பிழை"
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4295,7 +4365,7 @@ msgstr ""
 "இரத்து செய்த தகவலை மற்றவர்களுக்கு தெரிவிக்காவிட்டால் அவர்கள் கூட்டம் இரத்து செய்யபட்டதை "
 "அறியமாட்டார்கள்."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4303,7 +4373,7 @@ msgstr ""
 "இரத்து செய்த தகவலை மற்றவர்களுக்கு தெரிவிக்காவிட்டால் அவர்கள் குறிப்பு நீக்கப்பட்டதை "
 "அறியமாட்டார்கள்."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4311,19 +4381,42 @@ msgstr ""
 "இரத்து செய்த தகவலை மற்றவர்களுக்கு தெரிவிக்காவிட்டால் அவர்கள் பணி நீக்கப்பட்டதை "
 "அறியமாட்டார்கள்."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+#, fuzzy
+#| msgid "New Appointment"
+msgid "Save Appointment"
+msgstr "புதிய நேர ஒதுக்க ஏற்பாடு"
+
+#: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgid "Save Memo"
+msgstr "(_S) பங்கிடும் குறிப்புகள்"
+
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save Task"
+msgstr "எனச்சேமி..."
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "மாற்றப்பட்ட தகவல்களை பங்கேற்பாளர்களின் நாள்காட்டியில் மாற்றங்கள் செய்யும்"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "திருத்தப்பட்ட பணி பங்கேற்பாளர்களின் நாள்காட்டியில் தேவையான மாற்றங்கள் செய்யும்."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4331,7 +4424,7 @@ msgstr ""
 "சில இணைப்புகள் பதிவிறக்கம் செய்ய வேண்டியுள்ளது. நேர ஒதுக்கத்தை சேமித்தால் இந்த இணைப்புகள் "
 "இழக்கப்படும்."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4339,83 +4432,95 @@ msgstr ""
 "சில இணைப்புகள் பதிவிறக்கம் செய்ய வேண்டியுள்ளது. பணிகளை சேமித்தால் இந்த இணைப்புகள் "
 "இழக்கப்படும்."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "உங்கள் நடப்பு சேவையகத்தில் சில அம்சங்கள் வேலை செய்யாது."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "எவல்யூஷன் நாள்காட்டி எதிர்பாராமல் வெளியேறியது"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "எவல்யூஷன் நாள்காட்டி எதிர்பாராமல் வெளியேறியது"
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "எவல்யூஷன் குறிப்பு எதிர்பாராமல் வெளியேறியது."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "எதிர்பாராமல் எவல்யூஷன் வெளியேறியது"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "நாள்காட்டி இணைப்பில்லாமல் பயன்படுத்த குறிக்கப்படவில்லை."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "குறிப்பு பட்டியல் இணைப்பில்லாமல் பயன்படுத்த குறிக்கப்படவில்லை."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "பணி பட்டியல் இணைப்பில்லாமல் பயன்படுத்த குறிக்கப்படவில்லை."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "இந்த நாள்காட்டி நிரந்தரமாக நீக்கப்படும்"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "இந்த குறிப்பு பட்டியல் நிரந்தரமாக நீக்கப்படும்."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "இந்த பணி பட்டியல் நிரந்தரமாக நீக்கப்படும்."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+#| msgid "Failed to load the calendar '%s'"
+msgid "Unable to load the calendar"
+msgstr "நாள்காட்டியை ஏற்ற முடியவில்லை '%s'"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "இந்த நேர ஒதுக்கத்தில் உள்ள மாற்றங்களை சேமிக்க வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "இந்த குறிப்பில் உங்கள் மாற்றங்களை சேமிக்க வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "இந்த நேர ஒதுக்கத்தில் உள்ள மாற்றங்களை சேமிக்க வேண்டுமா?"
 
-#: ../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 "இந்த குறிப்புக்கு இரத்து செய்த அறிக்கை அனுப்ப விரும்புகிறீர்களா?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "அனைத்து பங்கு கொள்வோருக்கும் இரத்து செய்த அறிக்கை அனுப்ப விரும்புகிறீர்களா?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "கூட்ட அழைப்பை பங்கீட்டாளர்களுக்கு அனுப்ப வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "இந்த பணியை பங்கேற்பாளர்களுக்கு அனுப்ப வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "திருத்தப்பட்ட கூட்டம் பற்றிய தகவல்களை பங்கேற்பாளர்களுக்கு அனுப்ப வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "திருத்தப்பட்ட பணியை பங்கேற்பாளர்களுக்கு அனுப்ப வேண்டுமா?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4424,107 +4529,107 @@ msgstr ""
 "ஆதரவில்லாத க்ரூப்வைஸ் சேவயகத்துக்கு நீங்கள் இணைகிறீர்கள். எவலுஷன் பயன்படுத்துவதில் சில "
 "பிரச்சினைகள் நேரலாம். நல்லபடி நடக்க சேவையகத்தை ஆதரவுள்ள பதிப்புக்கு மேம்படுத்தவும். "
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "நேர ஒதுக்கம் ஏற்பாட்டில் மாற்றங்கள் செய்துள்ளீர்கள், ஆனால் இதுவரை சேமிக்கவில்லை."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "நீங்கள் இந்த பணியை மாற்றி விட்டீர்கள் ஆனால் சேமிக்கவில்லை"
 
-#: ../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 "நீங்கள் இந்த குறிப்பை மாற்றி விட்டீர்கள் ஆனால் சேமிக்கவில்லை."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "எவல்யூஷனை மீண்டும் துவக்காமல் நாள்காட்டியை பார்க்க முடியாது"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "எவல்யூஷன் மறு துவங்கும் வரை உங்கள் குறிப்புகள் கிடைக்கப்பெறா."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "எவல்யூஷனை மீண்டும் துவக்கும் வரை பணிவிவரம் கிடைக்காது"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "மாற்றங்களை நிராகரிக்கவும் (_D)"
 
-#: ../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 "(_S)சேமி"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "மாற்றங்களை சேமி (_S)"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "(_S)அனுப்பு"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "அறிவிப்பு அனுப்பு (_S)"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "பல நாட்களுக்கான நிகழ்வுகளை பிரி"
 
-#: ../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 "எவல்யூஷன் தகவல் சேவகனை திறக்க முடியவில்லை"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "பைலட் நாள்காட்டியை படிக்க முடியவில்லை"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "பைலட் குறிப்பு செயல்பாடு தொகுதி ஐ படிக்க இயலவில்லை."
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "பைலட் குறிப்பு செயல்பாடு தொகுதி இல் எழுத இயலவில்லை."
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "இயல்பான முன்னிரிமை:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "பைலட் செய்யவேண்டிய பயன்பாட்டு வேலையை படிக்க முடியவில்லை"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "பைலட் செய்யவேண்டிய பயன்பாட்டு வேலையில் எழுத முடியவில்லை"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "நாள்காட்டி மற்றும் பணிகள்"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "நாள்காட்டிகள்"
 
@@ -4565,22 +4670,22 @@ msgid "Memo_s"
 msgstr "குறிப்புகள் (_s)"
 
 #: ../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:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "குறிப்புகள்"
 
 #: ../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:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../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
@@ -4601,26 +4706,27 @@ msgstr "(_T)பணிகள்"
 msgid "Evolution Calendar alarm notification service"
 msgstr "எவல்யூஷன் நாள்காட்டி நினைவூட்டல் சேவை"
 
-#: ../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] "நிமிடம்"
 msgstr[1] "நிமிடங்கள்"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "மணிகள்"
 msgstr[1] "மணிகள்"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "துவக்க நேரம்"
 
@@ -4631,10 +4737,10 @@ msgstr "நேர ஒதுக்க ஏற்பாடுகள்"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "இடம்:"
 
@@ -4643,52 +4749,56 @@ msgid "Snooze _time:"
 msgstr "தூக்க நேரம்: (_t)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "திருத்து (_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "தூங்கு (_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "நேர ஒதுக்க ஏற்பாடு இடம்"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "சுருக்கம் இல்லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "விளக்கம் இல்லை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "இட விவரம் இல்லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "உங்களிடம் %d அலாரங்கள் உள்ளன"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4700,7 +4810,7 @@ msgstr ""
 "அனுப்பும் வசதி அமைக்கப்பட்டுள்ளது, எவல்யூஷன் \n"
 "சாதாரன நினைவூட்டல் உரையாடல் பெட்டியை காட்டும்."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4716,7 +4826,7 @@ msgstr ""
 "\n"
 "இந்த நிரலை இயக்க விருப்பமா?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "இந்த நிரல் பற்றி இனி என்னிடம் கேட்க வேண்டாம்."
 
@@ -4735,7 +4845,7 @@ msgid "invalid time"
 msgstr "செல்லாத நேரம்"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4744,7 +4854,7 @@ msgstr[0] "%d மணி"
 msgstr[1] "%d மணிகள்"
 
 #. 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"
@@ -4755,7 +4865,7 @@ msgstr[1] "%d நிமிடங்கள்"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4768,154 +4878,178 @@ msgid "Alarm programs"
 msgstr "அலாரம் நிரல்கள்"
 
 #: ../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 "நிலைப்பட்டியில் பிழை காட்டப்பட வேண்டிய நேரம் - வினாடிகளில்."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "உருப்படிகளை அழிக்கும் போது உறுதிப்படுத்து"
 
-#: ../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 "\"#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 "\"#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 "நாள்காட்டி எச்சரிக்கையை இயக்கவும்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "மார்கஸ் பைன்ஸ் கோட்டினை நேர பட்டையில் வரையும் நிறம் (முன்னிருப்பாக வெற்று)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "மார்கஸ் பைன்ஸ் கோட்டினை நாள் பார்வையில் வரையும் நிறம்."
 
-#: ../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 "மாத பார்வையில் வார கடைசிகளை குறுக்கவும்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "நீக்குதலை உறுதிபடுத்து"
 
-#: ../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 "ஆரம்ப மற்றும் முடிவு வேலை நேரத்தின் நாட்களை குறிப்பிட வேண்டும்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "முன்னிருப்பு நேர ஒதுக்க ஏற்பாடு நினைவூட்டல்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "முன்னிருப்பு நினைவூட்டு அலகுகள்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "முன்னிருப்பு நினைவூட்டல் மதிப்பு"
 
-#: ../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 "எச்ச்சரிக்கை ஒலி கோப்புகளுக்கு சேமிக்க அடைவு"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "நிகழ்வு படித்திறன்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "நிகழ்வு ஊடுருவல்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "ஓய்வு/பணியில் சேவையக URLகள்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "ஓய்வு/பணியில் மாதிரிஉரு URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "நாள்காட்டி பார்வையில் நிகழ்வுகளின் புரி."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "முடிந்த பணிகளை மறை"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "பணி அலகுகளை மறை"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "பணி மதிப்பினை மறை"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "கிடைமட்ட பலக நிலை"
 
-#: ../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 "வேலை நாள் முடிந்த நேரம், 24 மணிநேர வடிவத்தில், 0 முதல் 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 "வேலை நாள் ஆரம்ப நேரம், 24 மணிநேர வடிவத்தில், 0 முதல் 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 "நாள் மற்றும் வார வேலை நாள் பார்வையில் காட்டப்படும் இடைவேளை நேரம், நிமிடங்களில்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "கடைசி அலார நேரம்"
 
-#: ../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 "செய்தி பதிவு செய்யப்பட வேண்டிய மட்டம்"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "ஓய்வு/பணியில் இருக்கிறார் என காட்ட வழங்கன் URL களுக்கு பட்டியல்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "மார்கஸ் பைன்ஸ் கோடு"
 
-#: ../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 "மார்கஸ் பைன்ஸ் கோடு நிறம் - நாள் பார்வை"
 
-#: ../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 "மார்கஸ் பைன்ஸ் கோடு நிறம் - நேர பட்டை"
 
-#: ../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 "வேலை நாள் முடியும் நிமிடம், 0 லிருந்து 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 "வேலை நாள் துவங்கும் நிமிடம், 0 லிருந்து 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 "மாதப் பார்வை கிடைமட்ட பலகத்தின் நிலை"
 
-#: ../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 "மாதப் பார்வை செங்குத்து பலகத்தின் நிலை"
 
-#: ../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 "முன்னிருப்பு நினைவூட்டலுக்கான அலகுகளின் எண்ணிக்கை."
 
-#: ../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 "பணிகளை மறைப்பதை நிர்ணயிக்க உருப்படிகளின் எண்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "முடிக்காத பணிகள் நிறம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4923,7 +5057,7 @@ msgstr ""
 "தேதி நகர்த்தி நாள்காட்டி மற்றும் பணி பட்டியலுக்கிடையே, மாத பார்வை இல்லாத போது, "
 "பிக்சல்களில், கிடைமட்ட பலகத்தின் நிலை."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4931,13 +5065,13 @@ msgstr ""
 "பார்வை மற்றும் தேதி நகர்த்தி நாள்காட்டி மற்றும் பணி பட்டியலுக்கிடையே, மாத பார்வையில், "
 "பிக்சல்களில், கிடைமட்ட பலகத்தின் நிலை."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "நாள்காட்டி பட்டியல் மற்றும் தேதி நாள்காட்டி.மாலுமி இடையே செங்குத்து பலகத்தின் இடம்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4945,7 +5079,7 @@ msgstr ""
 "பணி பட்டியல் மற்றும் பணி முன்பார்வை பலகத்துக்கு இடையே, பிக்சல்களில், செங்குத்து பலகத்தின் "
 "நிலை."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4953,7 +5087,7 @@ msgstr ""
 "பார்வை மற்றும் தேதி நகர்த்தி நாள்காட்டி மற்றும் பணி பட்டியலுக்கிடையே, மாத பார்வையில், "
 "பிக்சல்களில், செங்குத்து பலகத்தின் நிலை."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4961,69 +5095,85 @@ msgstr ""
 "பார்வை மற்றும் தேதி நகர்த்தி நாள்காட்டி மற்றும் பணி பட்டியலுக்கிடையே, மாத பார்வையில் "
 "இல்லாத போது, பிக்சல்களில், செங்குத்து பலகத்தின் நிலை."
 
-#: ../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 "அலாரங்களோடு இயங்க அனுமதிக்கப்படும் நிரல்கள்."
 
-#: ../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 "எச்சரிக்கை ஒலிகளை சேமிக்க அடைவு"
 
-#: ../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 "RSVP புலத்தை நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் காட்டு"
 
-#: ../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 "பங்கு புலத்தை நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் காட்டு"
 
-#: ../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 "நேர ஒதுக்கம் ஏற்பாடு முடிந்த நேரத்தை வார மற்றும் மாதகாட்சிகளில் காட்டு"
 
-#: ../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 "வகைகள் புலத்தை நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் காட்டு"
 
-#: ../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 "அறிவிப்பு இழுப்பறையில் அலாரங்களை காட்டு"
 
-#: ../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 "நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் நிலை புலத்தினை காட்டு"
 
-#: ../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 "\"முன்தோற்ற\"பலகத்தை காட்டு"
+msgstr "\"Preview\"பலகத்தை காட்டு"
 
-#: ../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 "\"முன்தோற்ற\"பலகத்தை காட்டு"
+msgstr "\"Preview\"பலகத்தை காட்டு"
 
-#: ../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 "நிகழ்வு/சந்திப்பு தொகுப்பியில் நேர மண்டல புலத்தை காட்டு"
 
-#: ../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 "நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் வகை புலத்தை காட்டு"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Show week numbers in date navigator"
+msgid "Show week number in Day and Work Week View"
+msgstr "தேதி நகர்த்தியில் வார எண்களை காட்டு"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "தேதி நகர்த்தியில் வார எண்களை காட்டு"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "நிலுவையில் இன்று உள்ள பணிகளின் நிறம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "பணிகள் செங்குத்து பலக நிலை"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5032,28 +5182,44 @@ msgstr ""
 "ஓய்வு/பணியில் இருக்கிறார் என காட்ட வழங்கன் URL களுக்கு வார்புரு. %u  இல் அஞ்சல் "
 "முகவரியும் மற்றும் %d இல் களமும் குறிப்பிடப்படும்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 "நாள்காட்டிக்கு முன்னிருப்பு கால மண்டலம். மொழிமாற்று அமைக்காத ஒல்ஸன் கால மண்டல தரவிறக்க "
-"இடம் \"அமெரிக்கா/ந்யூயார்க்\"."
+"இடம் \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#, fuzzy
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"இதற்கு மூன்று  மதிப்புகள் இருக்ககூடும். \"0\" வழுக்கள். \"1\" எச்சரிக்கை. \"2\" "
+"வழுநீக்கி செய்திகள் ."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "நேர பகுப்புகள்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "கடைசியாக அலாரம் ஒலித்தது. (_t)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "நேரம் மண்டலம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5061,41 +5227,39 @@ msgstr ""
 "நாள்காட்டி உள்ளே நிகழ்ச்சிகளின் வெளிப்பாடு. மதிப்பு 0 (வெளியே தெரியும்) க்கும் 1 "
 "(வெளியே தெரியாது) இடையே"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "இருபத்தி நான்கு மணிநேர வடிவம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "முன்னிருப்பு நினைவூட்டிக்கான அலகுகள், \"நிமிடங்கள்\", \"மணிநேரங்கள்\" அல்லது \"நாட்கள்\"."
+msgstr "முன்னிருப்பு நினைவூட்டிக்கான அலகுகள், \"minutes\", \"hours\" அல்லது \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"பணியை மறைப்பதை கண்டறிய தேவையான அலகு,  \"நிமிடங்கள்\", \"மணி நேரம்\" அல்லது \"நாட்கள்"
-"\"."
+msgstr "பணியை மறைப்பதை கண்டறிய தேவையான அலகு,  \"minutes\", \"hours\" அல்லது \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "வாரம் துவங்குகிறது"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "வாரத்தின் வாரநாட்கள் ஞாயிறு (0) முதல் சனி (0) வரை ஆகும்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "எச்சரிக்கைகளை காட்ட அறிவிப்பு தட்டை பயன்படுத்துவதா இல்லையா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ஒரு நேர ஒதுக்க ஏற்பாடு அல்லது பணியை நீக்கும் போது உறுதிப்படுத்த வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ஒரு நேர ஒதுக்க ஏற்பாடு அல்லது பணியை பகுதி நீக்கும் போது உறுதிப்படுத்த வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5103,142 +5267,143 @@ msgstr ""
 "மாத காட்சியில் வாரகடைசி நாட்களை குறிக்க வேண்டுமா அதாவது சனிக்கிழமை மற்றும் "
 "ஞாயிற்றுக்கிழமை ஒரு நாள் இடைவெளியில் வைக்கும்."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "நிகழ்வின் முடிவு நேரத்தை வார மற்றும் மாத காட்சிகளில் காட்ட வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "நாள்காட்டியில் மார்கஸ் பைன்ஸ் கோட்டினை (நடப்பு நேரத்தில் உள்ள கோடு) வரைய வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "முழு பணி விவரத்தையும் பணிகள் பார்வையில் மறைக்க வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "நேர ஒதுக்கம் க்கு முன்னிருப்பு நினைவூட்டலை அமைக்க வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் RSVP புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "நிகழ்வு/சந்திப்பு தொகுப்பியில் வகைகள் புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் பங்கு புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "நிகழ்வு/பணி/சந்திப்பு தொகுப்பியில் நிலை புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "am/pm க்கு பதிலாக 24 மணிநேர முறையில் நேரங்களை காட்ட வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "நிகழ்வு/சந்திப்பில் நேர மண்டல புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "நிகழ்வு/பணி/சந்திப்பில் வகை புலத்தை காட்ட வேண்டுமா"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#, fuzzy
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "நாள் நகர்த்தியில் வார எண்களை காட்ட வேண்டுமா."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "நாள் நகர்த்தியில் வார எண்களை காட்ட வேண்டுமா."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "நிகழ்வுகளை காட்டும் போது பகல் நேர சேமிப்பை பயன்படுத்த வேண்டுமா?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "வேலை நாட்கள்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "வேலைநாள் கடைசி மணிநேரம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "வேலைநாள் கடைசி நிமிடம"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "வேலைநாள் துவங்கும் நேரம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "வேலைநாள் துவங்கும் நிமிடம்"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "பகல் நேர சேமிப்பு"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "சுருக்கத்தில்"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "விளக்கத்தில்"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "வகை"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "கருத்தில்"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "இடத்தில்"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "பொருந்தவில்லை"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "அடுத்த 7 தினங்களின் பணிகள்"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "நடப்பில் உள்ள பணிகள்"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "நிலுவை பணிகள்"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "நிறைவேறிய பணிகள்"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "இணைப்புகள் உடன் பணிகள்"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "நடப்பில் உள்ள நேர ஒதுக்க ஏற்பாடுகள்"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "அடுத்த 7 நாட்கள் நேர ஒதுக்க ஏற்பாடுகள்"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "அச்சிடு"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5247,16 +5412,17 @@ msgstr ""
 "தேர்வு செய்யப்பட்ட நிகழ்வுகள் தவிர மற்ற நிகழ்வுகள் முடிந்து போன நிகழ்வுகள் நீக்கப்படும். "
 "தொடர்ந்தால் இந்த நிகழ்வுகள் பற்றி இனி தெரிந்துகொள்ள முடியாது"
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "நீக்க வேண்டிய பழைய நிகழ்வுகள்"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "நாட்கள்"
@@ -5265,99 +5431,109 @@ msgstr "நாட்கள்"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
 #: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "இணையத்தில்"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "பிறந்த நாள் & ஆண்டு துவக்க நாள்"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "வானிலை"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "புதிய நாள்காட்டி (_N)"
 
-#: ../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 "(_C)நகல்..."
 
-#: ../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 "இணைப்பில்லாத போது பயனுக்கு என  அமை (_M)"
+
+#: ../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 "(_D) இணைப்பில்லாத போது பயனுக்கு என  அமைக்க வேண்டாம்"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "நாள்காட்டியை புதுப்பிக்க முடியாது"
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "புதிய நிகழ்வுகள் மற்றும் கூட்டத்தை உருவாக்க '%s' நாள்காட்டியை திறக்க முடியவில்லை"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "நிகவுகள் மற்றும் கூட்டத்தை உருவாக்க இதில் நாள்காட்டி எதுவும் இல்லை"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "நாள்காட்டி மூல தேர்வாளர்"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "புதிய நேரஒதுக்கம்"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1522
 msgctxt "New"
 msgid "_Appointment"
 msgstr "(_A)நேர ஒதுக்கம்"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "புதிய நேர ஒதுக்கத்தை உருவாக்கு"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "புதிய கூட்டம்"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1530
 msgctxt "New"
 msgid "M_eeting"
 msgstr "(_M)கூட்டம்"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "புதிய கூட்டத்தை உருவாக்க கோரிக்கை"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "முழுநாட்களுக்குமான புதிய நேர ஒதுக்கம்"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1538
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "(_p) முழு நாளுக்குமான நேர ஒதுக்கம்"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "முழு நாளுக்குமான நேர ஒதுக்கத்தை உருவாக்கு"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "புதிய நாள்காட்டி"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1546
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "(_N)நாள்காட்டி"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "புதிய நாள்காட்டியை உருவாக்கு"
 
@@ -5377,217 +5553,114 @@ msgstr "வாரநாட்களை பார்"
 msgid "Month View"
 msgstr "மாதத்தை பார்"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ஏதேனும் ஒரு புலம்"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "இணைப்புகள்"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "கலந்துகொள்பவர்கள்"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "வணிகம்"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "வகை"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "வகைப்படுத்துதல்"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "போட்டி"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c: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:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "நம்பகமான"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "விவரணம்"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "இது விவரத்தில் உள்ளது"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "இது இல்லை"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "உள்ளது"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "விருப்பங்கள்"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "அன்பளிப்பு"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "குறிக்கோள்/நோக்கம்"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "விடுமுறை்று"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "விடுமுறை அட்டைகள்"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "முக்கிய தொடர்புகள்"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "யோசனைகள்்கள்"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "சர்வததேசான"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "முக்கிய வாடிக்கையாளர்"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "மற்றவை"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "அடுத்த 7 தினங்களின் பணிகள்"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "ஒருங்கிணைப்பாளர்"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "தொலைபேசி அழைப்புகள்"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c: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:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "தனிப்பட்ட"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/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:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "பொதுவான"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "மீண்டும் தோன்றுகிறது"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "நிலை"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "திட்டங்கள்"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "சுருக்கம்"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "சுருக்கத்தில் உள்ளது இது"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "பரிமாறுவோர்"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "நேரம் &amp; செலவுகள்"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "முக்கியஸ்தர்"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "காத்திருக்கிறது...."
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "உள்ளது"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "இதில் இல்லை"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "இல்"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "இல்லை"
 
@@ -5603,7 +5676,7 @@ msgstr "நாள்காட்டியை திறக்க இந்த ம
 msgid "Permission denied to open the calendar"
 msgstr "நாள்காட்டியை திறப்பதற்கான அனுமதி மறுக்கப்பட்டது"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "தெரியாத பிழை"
 
@@ -5640,17 +5713,17 @@ msgid "Mes_sage:"
 msgstr "(_s)செய்தி:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ஒலியை இயக்கு"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "எச்சரிக்கை ஒலியை தோன்றச்செய்"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "நிரலை இயக்கு"
 
@@ -5663,7 +5736,7 @@ msgid "Send To:"
 msgstr "அனுப்பு :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "மின்னஞ்சல் அனுப்பு"
 
@@ -5727,25 +5800,54 @@ msgid "A_dd"
 msgstr "(_d)சேர்"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "எச்சரிக்கை மணி"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "இணைப்பை தானாக காட்ட வலியுறுத்து (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "கோப்பு(களை) இணை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "எதுவுமில்லை"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "நாள்காட்டிகளை அலாரங்களுக்காக தேர்ந்தெடுக்கவும்"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+#| msgid "Show _field in View"
+msgid "(Shown in a Day View)"
+msgstr "(_f) பார்வையில் புலத்தை காட்டு"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5759,57 +5861,57 @@ msgstr ""
 "10 நிமிடங்கள்\n"
 "05 நிமிடங்கள்"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u மற்றும் %d பயனர் மற்றும் களம் மின்னஞ்சல் முகவரியால் மாற்றப்படும்.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">எச்சரிக்கைகள்</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">முன்னிருப்பு ஓய்வு/பணியில் சேவையகம்</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">பொதுவான</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">பணி பட்டியல்</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">நேரம்</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">வேலை வாரம்</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "பகல் சேமிப்பு நேரத்துக்கு சீரமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "(_e) நாட்கள் முடிந்தது:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "காட்சி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5819,13 +5921,13 @@ msgstr ""
 "மணிநேரங்கள்\n"
 "நாட்கள்"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "திங்கட்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5843,242 +5945,264 @@ msgstr ""
 "சனிக்கிழமை\n"
 "ஞாயிற்றுக்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "நிறத்தை தேர்வு செய்"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "(_u)ஞாயிறு"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "சனிக்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+#| msgid "Send To:"
+msgid "Se_cond zone:"
+msgstr "அனுப்பு :"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "அலார அறிவிப்புக்கு நாள்காட்டிகளை தேர்ந்தெடு"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "(_o) நினைவூட்டலை காட்டு"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+#| msgid "Sh_ow a reminder"
+msgid "Show a _reminder"
+msgstr "(_o) நினைவூட்டலை காட்டு"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "(_n) தேதி நகர்த்தியில் வார எண்களை காட்டு"
 
-#: ../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:43
+#, fuzzy
+#| msgid "Show week numbers in date navigator"
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "தேதி நகர்த்தியில் வார எண்களை காட்டு"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "ஞாயிற்றுக்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "(_a)இன்று நிலுவையில் உள்ள பணிகள்"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "(_h)வியாழன்"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "மாதிரிஉரு:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "வியாழக்கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "நேரம் காட்டி (_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "நேரத்தின் அமைப்பு:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "செவ்வாய் கிழமை"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "புதன் கிழமை"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "வாரம் துவங்குகிறது: (_k)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "வேலை நாட்கள்:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 மணி (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 மணி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "(_A)உருப்படிகளை நீக்கும் போது உறுதிப்படுத்து"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "(_C) மாத செய்திகளை காட்டும் போது வார செய்திகளை சுருக்கி காட்டு"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "(_D) நாள் துவங்கியது:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "(_F) வெள்ளி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "(_H) முடிந்த பணிகளை மறை"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "(_M) திங்கள்"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "(_O) நிலுவையில் உள்ள பணிகள்:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "(_S)சனி"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "வாரம் மற்றும் மாதம் காட்சியில் நேர ஒதுக்கத்தின் முடிவு காட்டு"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "(_T) நேர பகுப்பு :"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "(_T)செவ்வாய்"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "(_W)புதன்"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "ஒவ்வொரு நேர ஒதுக்கத்துக்கு முன்னும்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_y இணைப்பு விலகிய செயல்களுக்கு நாள்காட்டி உள்ளடக்கத்தை நகலெடு."
 
-#: ../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 "_y இணைப்பு விலகிய செயல்களுக்கு பட்டியல் உள்ளடக்கத்தை நகலெடு."
 
-#: ../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 "_y இணைப்பு விலகிய செயல்களுக்கு  குறிப்பு பட்டியல் உள்ளடக்கத்தை நகலெடு."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "(_r) நிறம்:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "பணிகளின் பட்டியல்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "குறிப்புகளின் பட்டியல்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "நாள்காட்டி பண்புகள்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "புதிய நாள்காட்டி"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "பணி பட்டியல் பண்புகள்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "புதிய பணிபட்டியல்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "பணி பட்டியல் பண்புகள்"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "புதிய குறிப்பு பட்டியல்"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "இந்த நிகழ்வு நீக்கப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "இந்த பணி நீக்கப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "இந்த குறிப்பு நீக்கப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s மாற்றங்கள் செய்துள்ளார். இந்த மாற்றங்களை மறக்கச்செய்து தொகுப்பியை மூட வேண்டுமா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s நீங்கள் மாற்றம் எதுவும் செய்யவில்லை. தொகுப்பியை மூட வேண்டுமா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "இந்த நிகழ்வு மாற்றப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "இந்த பணி மாற்றப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "இந்த குறிப்பு மாற்றப்பட்டது"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s மாற்றங்கள் செய்துள்ளார். இந்த மாற்றங்களை மறக்கச்செய்து தொகுப்பியை மூட வேண்டுமா?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s நீங்கள் மாற்றம் எதுவும் செய்யவில்லை. தொகுப்பியை மூட வேண்டுமா?"
@@ -6088,292 +6212,297 @@ msgstr "%s நீங்கள் மாற்றம் எதுவும் ச
 msgid "Validation error: %s"
 msgstr "சரிபார்க்கும் போது பிழை: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr "பெறுநர்"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr "(முடிந்தது"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "முடிந்தது"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr "(நிலுவையில்"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "நிலுவையில்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "செய்தியை இணை - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "இணைக்கப்பட்ட செய்தி"
 msgstr[1] "%d இணைக்கப்பட்ட செய்தி"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "(_M)நகர்த்து"
 
-#: ../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 "(_D)இழுப்பதை ரத்து செய்"
 
-#: ../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:3301 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "இணைப்பு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "பொருளை திருத்த முடியவில்லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "நேர ஒதுக்கத்தை மாற்று"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "சந்திப்பு - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "நேர ஒதுக்கம் - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ஒதுக்கப்பட்ட பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "குறிப்புகள் - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "சுருக்கம் இல்லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "நடப்பு சாளரத்தை மூட இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "தேர்வு செய்த உரையை தற்காலிக நினைவிடத்தில் நகலெடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "தேர்வு செய்த உரையை ஒட்டுப்பலகத்தில் படியெடு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "உதவியை பெற இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "தற்காலிக நினைவிடத்தில் உள்ள உரையை ஒட்டு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "நடப்பு சாளரத்தை சேமிக்க இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "எல்லா உரையையும் தேர்வுசெய்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "பிரிவுகள் (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "(_F)கோப்பு"
 
-#: ../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:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "(_H)உதவி..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "நுழை (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "விருப்பங்கள் (_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "(_V)பார்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "(_A)இணைப்பு...."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "ஒரு கோப்பினை இணைக்க இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "(_C)வகைகள்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "வகைகள் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "நேரம் மண்டலம்: (_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "நேர மண்டலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "பொது (_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "பொது என வகைப்படுத்து"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "தனிப்பட்ட (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "தனிபட்டது என வகைப்படுத்து"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "இரகசியமானது (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "இரகசியமானதாக வகைப்படுத்துக"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "பங்கு புலம் (_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "பங்கு புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "நிலை புலம் (_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "நிலை புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "வகை புலம் (_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "கலந்துகொள்பவர்கள் வகை காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../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:1820
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "(_D) அண்மை ஆவணங்கள்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1839
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "இணைக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1934
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> இணைப்பு"
 msgstr[1] "<b>%d</b> இணைப்புகள்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1966
 msgid "Hide Attachment _Bar"
 msgstr "இணைப்புகள் பட்டையை மறை (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1969
+#: ../calendar/gui/dialogs/comp-editor.c:2272
 msgid "Show Attachment _Bar"
 msgstr "இணைப்புகள் பட்டையை காட்டு (_B)"
 
-#: ../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:2083
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "(_R)நீக்கு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "இணைப்பினை சேர்... (_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "இணைப்புகள் காட்டு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2295
 msgid "Press space key to toggle attachment bar"
 msgstr "இணைப்பு பட்டைகளுக்கிடையே மாற்ற இடைவெளி விசையை அழுத்தவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2488
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "இந்த உருப்படியில் செய்த மாற்றங்கள் புதிப்பிக்கும் போது நீக்கப்படும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3363
 msgid "Unable to use current version!"
 msgstr "தற்போதைய பதிப்பை பயன்படுத்துவதற்காக மேம்படுத்தவும்"
 
@@ -6389,55 +6518,55 @@ msgstr "சேரும் இடத்தை திறக்க முடிய
 msgid "Destination is read only"
 msgstr "சேரும் இடத்தின் பண்பு படிக்க மட்டும் என உள்ளது"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "இந்த உருப்படியை மற்ற அனைத்து பெறுநர் அஞ்சல் பெட்டிகளிலிருந்தும் அழிக்க வேண்டாமா? (_D)"
 
-#: ../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 "கோப்ரா பிழையால் இந்த நிகழ்வை நீக்க முடியாது"
 
-#: ../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 "கோப்ரா பிழையால் இந்த வேலையை நீக்க முடியாது"
 
-#: ../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 "கோர்பா பிழையால் இந்த குறிப்பை நீக்க முடியாது"
 
-#: ../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 "கோப்ரா பிழையால் இந்த உருப்படியை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "அனுமதி இல்லாததால் இந்த நிகழ்வை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "அனுமதி இல்லாததால் இந்த பணியை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "அனுமதி இல்லாததால் இந்த குறிப்பை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "அனுமதி இல்லாததால் இந்த உருப்படியை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "ஒரு பிழையால் இந்த நிகழ்வை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "ஒரு பிழையால் இந்த பணியை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "ஒரு பிழையால் இந்த குறிப்பை நீக்க முடியாது"
 
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "பிழை உள்ளதால் இந்த உருப்படியை நீக்க முடியாது"
 
@@ -6454,184 +6583,167 @@ msgstr "முக்கிய விருந்தினர்களுக்�
 msgid "Enter Delegate"
 msgstr "முக்கிய விருந்தினர்களை உள்ளிடு"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "அலாரங்கள் (_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "இந்த நிகழ்வுக்கு எச்சரிக்கையை அமைக்க அல்லது நீக்க இங்கு சொடுக்கு"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "மீண்டும் தோன்றல் (_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "இந்த நிகழ்வை சுருள் நிகழ்வாகச் செய்"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "அனுப்பு விருப்பங்கள்"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "கூடுதல் அனுப்பும் விருப்பங்களை நுழை"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "அனைத்து நாள் நிகழ்வு"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "அனைத்து நாள் நிகழ்வு வைத்துக்கொள்ளலாமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "(_b) வேலையில் உள்ள நேரம் எனக்காட்டு"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "பெறுவது நேரத்தை வேலையில் என காட்டலாமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "ஓய்வு/பணியில் (_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "பங்கேற்போருக்கு வேலை அல்லது ஓய்வு தகவலை கேட்கவும்"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "சந்திப்பு ஏற்பாடு (_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "இந்த நிகழ்வு அலாரங்களை கொண்டுள்ளது."
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "(_g)ஒருங்கிணைப்பாளர்:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "பேராளர்கள் (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "கலந்துகொள்பவர்கள் (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "துவக்க தேதி இல்லாத நிகழ்வுகள்"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "முடிவு தேதி இல்லாத நிகழ்வுகள்"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "துவக்க தேதி தவறாக உள்ளது"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "முடியும் தேதி தவறாக உள்ளது"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "துவக்க நேரம் தவறாக உள்ளது"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "முடியும் நேரம் தவறாக உள்ளது"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "நீங்கள் தேர்வு செய்த நாள்காட்டியில் எந்த கணக்கும் இல்லை"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "நாள்காட்டி தேவை"
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "குறைந்தது ஒரு பங்கேற்பாளராவது இருக்க வேண்டும்"
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "சேர் (_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "நாள்காட்டியை திறக்க முடியவில்லை '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s சார்பாக நீங்கள் வேலை செய்கிறீர்கள்"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d நேரம் ஒதுக்குவதற்கு முந்தைய நாள்"
 msgstr[1] "%d நேரம் ஒதுக்குவதற்கு முந்தைய நாட்கள்"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "நேரம் ஒதுக்குவதற்கு %d மணிக்கு முன்"
 msgstr[1] "நேரம் ஒதுக்குவதற்கு %d மணிகளுக்கு முன்"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "நேரம் ஒதுக்குவதற்கு %d நிமிடம் முன்"
 msgstr[1] "நேரம் ஒதுக்குவதற்கு %d நிமிடங்களுக்கு முன்"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "தனிபயனாக்கு"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c: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 "எதுவுமில்லை"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "நேரம் ஒதுக்குவதற்கு ஒரு நாளைக்கு முன்"
@@ -6707,19 +6819,19 @@ msgstr "தொடர்புகள்... (_n)"
 msgid "Organizer:"
 msgstr "ஒருங்கிணைப்பாளர்:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "குறிப்பு"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'. இல் குறிப்புகளை திறக்க முடியவில்லை"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "பெறுநர்"
 
@@ -6733,60 +6845,64 @@ msgid "T_o:"
 msgstr "முன்னால்_o:"
 
 #: ../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 "(_G)குழு:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "நீங்கள் மீண்டும் காட்டிய நிகழ்வில் மாற்றம் செய்கிறீர்கள். என்ன மாற்றம் செய்ய விரும்புகிறீர்கள்?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "நீங்கள் ஒரு நிகழ்வுக்கு பிரதிநிதி அமைகிறீர்கள். எதற்கு பிரதிநிதி அமைக்க வேண்டும்?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "நீங்கள் ஒரு சுழல் வேலையை மாற்றி அமைகிறீர்கள். எதை மாற்றி அமைக்க வேண்டும்?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "நீங்கள் மீண்டும் நிகழும் சுழல் குறிப்பில் மாற்றம் செய்கிறீர்கள். என்ன மாற்றம் செய்ய "
 "விரும்புகிறீர்கள்?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "இந்த நிகழ்வு மட்டும்"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "இந்த மற்றும் முந்தைய நிகழ்வுகள்"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "இந்த மற்றும் இனிவரும் நிகழ்வுகள்"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "எல்லா நிகழ்வுகளும்"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "இந்த நேர ஒதுக்கீட்டில் மீண்டும் வந்துள்ளதால் எவல்யூஷனால் திருத்த முடியாது"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "மீண்டும் வந்த தேதி செல்லாது"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "இயக்கு"
 
@@ -6794,7 +6910,7 @@ msgstr "இயக்கு"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "முதல்"
 
@@ -6803,7 +6919,7 @@ msgstr "முதல்"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "இரண்டாவது"
 
@@ -6811,7 +6927,7 @@ msgstr "இரண்டாவது"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "மூன்றாவது"
 
@@ -6819,7 +6935,7 @@ msgstr "மூன்றாவது"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "நான்காவது"
 
@@ -6827,13 +6943,13 @@ msgstr "நான்காவது"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "கடைசி"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "மற்ற தேதிகள்"
 
@@ -6841,7 +6957,7 @@ msgstr "மற்ற தேதிகள்"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1 முதல் 10 வரை"
 
@@ -6849,7 +6965,7 @@ msgstr "1 முதல் 10 வரை"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11 முதல் 20 வரை"
 
@@ -6857,45 +6973,45 @@ msgstr "11 முதல் 20 வரை"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21 முதல் 31 வரை"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "நாள்"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "மேல்"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "நிகழ்வுகள்"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "விதிவிலக்கை சேர்"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "மாற்ற ஒரு தேர்வு இல்லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "விதிவிலக்கை மாற்றியமை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "நீக்க ஒரு தேர்வு இல்லை"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "தேதி/நேரம்"
 
@@ -6946,6 +7062,10 @@ msgstr "வாரம்(கள்)"
 msgid "year(s)"
 msgstr "வருடம்(கள்)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6966,55 +7086,55 @@ msgstr "<span weight=\"bold\">நிலை</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:247
 #: ../calendar/gui/e-cal-model-tasks.c:362
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c: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:2558 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "முடிவுற்றது"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c: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 "அதிக"
 
 #: ../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:2555
 msgid "In Progress"
 msgstr "நடந்துகொண்டிருக்கிறது"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c: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 "குறைவாக"
 
 #: ../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:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "இயல்பாக"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "துவங்கவில்லை"
 
@@ -7027,7 +7147,7 @@ msgid "Stat_us:"
 msgstr "நிலை: (_u)"
 
 #: ../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 "குறிப்பில்லா"
 
@@ -7053,28 +7173,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "பணியின் நிலை விவரங்களை மாற்ற / பார்வையிட சொடுக்கவும்"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "அனுப்பும் விருப்பங்கள் (_S) "
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "(_T)பணி"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "பணி விவரங்கள்"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "(_z) ஒருங்கிணைப்பாளர்:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "நிலுவை தேதி தவறாக உள்ளது"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'. இல் பணியை திறக்கமுடியவில்லை"
@@ -7096,7 +7216,7 @@ msgid "Time zone:"
 msgstr "நேரம் மண்டலம்:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7104,123 +7224,123 @@ msgstr[0] "%d நாள்"
 msgstr[1] "%d நாட்கள்"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d வாரம்"
 msgstr[1] "%d வாரங்கள்"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "தெரியாத செயல் நிகழ்ந்தது"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s நேர ஒதுக்கத்தை துவக்கும் முன்"
 
 #. 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 நேர ஒதுக்கத்தை துவக்கிய பின்"
 
 #. 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 நேரஒதுக்கம் துவங்கும் போது"
 
 #. 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 நேர ஒதுக்கம் முடியும் போது"
 
 #. 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 நேர ஒதுக்கம் முடிந்த பின்"
 
 #. 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 நேர ஒதுக்கம் முடியும் போது"
 
 #. 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 %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 தெரியாத துவக்க வகை"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "%s திறக்க க்ளிக் செய்யவும்"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "தலைப்பில்லா"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "துவக்க தேதி:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "விளக்கம்:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "இணைய பக்கம்:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "சுருக்கம்:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "நிலுவை தேதி:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "நிலை:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "முன்னுரிமை:"
 
@@ -7234,13 +7354,13 @@ msgid "Start Date"
 msgstr "துவக்க தேதி"
 
 #: ../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 "வேலையில் இல்லை்"
 
 #: ../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 "வேலையில்"
 
@@ -7254,67 +7374,67 @@ 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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ஆம்"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "இல்லை"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c: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-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:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "தெரியாது"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "மீண்டும்நடக்கிறது"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "ஒதுக்கப்பட்ட"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "எனச்சேமி......"
 
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "தேர்ந்தெடுத்த இணைப்புகளை சேமிக்க அடைவினை தேர்தெடு"
 
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "(_i)தலைப்பில்லா பிம்பம்.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1672 ../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:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "(_S)எனச்சேமி..."
 
-#: ../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 "(_B)பின்னனியாக அமை"
 
@@ -7322,7 +7442,7 @@ msgstr "(_B)பின்னனியாக அமை"
 msgid "_Save Selected"
 msgstr "தேர்ந்தெடுத்ததை சேமி (_S)"
 
-#: ../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 "%s இல் திற..."
@@ -7333,7 +7453,7 @@ msgstr "* சுருக்கம் இல்லை *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ஒருங்கிணைப்பாளர்: %s <%s>"
@@ -7341,7 +7461,7 @@ msgstr "ஒருங்கிணைப்பாளர்: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "ஒருங்கிணைப்பாளர்: %s"
@@ -7354,125 +7474,125 @@ msgstr "துவக்கு:"
 msgid "Due: "
 msgstr "நிலுவை:"
 
-#: ../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:665 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "தேர்வு செய்யப்பட்ட பொருள் நீக்கப்படுகிறது"
 
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "பொருள் புதுப்பிக்கப்படுகிறது"
 
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1221 ../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:1298 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "எனச்சேமி..."
 
-#: ../calendar/gui/e-calendar-table.c:1570
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "புதிய பணி (_T)"
 
-#: ../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 "(_W)இணைய பக்கத்தை திற"
 
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "(_r)அச்சடி..."
 
-#: ../calendar/gui/e-calendar-table.c:1580
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "(_u)வெட்டு"
 
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "(_P)ஒட்டு"
 
-#: ../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 "(_A)பணியை ஒதுக்கு"
 
-#: ../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 "(_F)iநாள்காட்டியாக அனுப்பு"
 
-#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "(_M)முடிவுற்றது என குறி"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "(_M)தேர்வு செய்யப்பட்ட பணி முடிந்தது என குறி"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "முடிவுறாதது என குறிக்கவும் (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "தேர்வு செய்யப்பட்ட பணி முடியாதது என குறிக்கவும் (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "தேர்ந்தெடுக்கப்பட்ட பணியை அழிக்கவும் (_D)"
 
-#: ../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 "ஒரு பணியை சேர்க்க சொடுக்கவும்"
@@ -7495,7 +7615,7 @@ msgid "Due date"
 msgstr "நிலுவை தேதி"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:20
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "முன்னுரிமை"
@@ -7504,108 +7624,155 @@ msgstr "முன்னுரிமை"
 msgid "Start date"
 msgstr "துவக்க தேதி"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "நிலை"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "உருப்படிகளை நகர்த்துகிறது"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "உருப்படிகளை நகலெடுக்கிறது"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "(_A)புதிய நேர ஒதுக்கங்கள்..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "(_E)எல்லா நாட்களுக்குமான நிகழ்வுகள்"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "புதிய சந்திப்பு (_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "(_C)தற்போதைய காட்சி"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "இன்றைய தேதியை தேர்ந்தெடு (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "(_S)தேதியை தேர்வு செய்.."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "(_n)அச்சடி..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "(_y)நாள்காட்டியில் நகலெடு..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "(_v)நாள்காட்டிக்கு நகர்த்து..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "பேராளர் சந்திப்பு... (_D)"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "சந்திப்பினை திட்டமிடு... (_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "(_F)iநாள்காட்டியாக அனுப்பு..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "பதில் (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "(_A) அனைவருக்கும் பதிலலி"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "(_M)இந்த தருவாயை நகர்த்தகூடியதாக்கு"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "(_O)இந்த மறுநிகழ்வை நீக்கு"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "(_A)எல்லா மறுநிகழ்வுகளையும் நீக்கு"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "ஏற்கப்பட்டது"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "நிராகரிக்கப்பட்டது"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "தோராயமாக"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "விருந்தினராக"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+#, fuzzy
+#| msgid "Needs Action"
+msgid "Needs action"
+msgstr "செயல் தேவை"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "இடம்: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "நேரம்: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%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 %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7618,53 +7785,66 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i நிமிட பகுப்புகள்"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the second time zone"
+msgstr "\"முன்தோற்ற\"பலகத்தை காட்டு"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c: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:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 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:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "முப"
 
 #. 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:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "பிப"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, fuzzy, c-format
+#| msgid "Week"
+msgid "Week %d"
+msgstr "வாரம்"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "ஆம் (கடினமான மறுநிகழ்வு)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "தினமும்"
 msgstr[1] "எல்லா %d  நாட்களும்"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ஒவ்வொரு வாரமும்"
 msgstr[1] "எல்லா %d வாரங்களும்"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7672,369 +7852,361 @@ msgstr[0] "ஒவ்வொரு வாரத்திலும் இந்த
 msgstr[1] "ஒவ்வொரு %d வாரங்களிலும் இந்த நாள்"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " மற்றும் "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s நாளில்"
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr " %s %s இல்"
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ஒவ்வொரு மாதமும்"
 msgstr[1] "எல்லா %d மாதங்களும்"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ஒவ்வொரு வருடமும்"
 msgstr[1] "எல்லா %d வருடங்களும்"
 
-#: ../calendar/gui/e-itip-control.c:874
-#, 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 "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "மொத்தம் %d நேரம்"
 msgstr[1] "மொத்தம் %d நேரங்கள்"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", முடிந்த"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "துவங்கிய"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "முடிந்த"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "நிலுவை"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iநாள்காட்டி தகவல்"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iநாள்காட்டி பிழை"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "தெரியாத நபர்"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> இந்த தகவலை பார்த்த பிறகு அதற்காக செயலை கீழுள்ள மெனுவிலிருந்து தேர்வு செய்யவும்"
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "ஏற்கப்பட்டது"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "ஏற்கப்படலாம்"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "நிராகரிக்கப்பட்டது"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "சந்திப்பு ரத்து செய்யப்பட்டது, இது உங்கள் நாள்காட்டிகளில் காட்டப்படவில்லை"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "பணி ரத்துசெய்யப்பட்டது, இந்த பணி உங்கள் பணிபட்டியல்களில் இல்லை"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> கூட்டம் பற்றிய தகவல் பதிப்பிக்கப்பட்டது"
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "கூட்டம் பற்றிய தகவல்"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> கூட்டத்தின் போது %s இன் வருகை முக்கியம்"
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> கூட்டத்திற்கு உங்கள் வருகை அவசியம்"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "கூட்ட அனுமதி"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> இருப்பில் உள்ள சந்திப்புக்கு சேர்க்கப்பட விரும்புகிறார்."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "கூட்ட நிகழ்வுகள்"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> சமீபத்திய கூட்ட தகவலை பெற விரும்புகிறார்"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "கூட்ட தகவல் கோரிக்கை"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> கூட்ட தகவலுக்கு பதிலலித்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "கூட்ட பதில்"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> கூட்டத்தை ரத்து செய்துவிட்டார்."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "சந்திப்பு ரத்து செய்யப்படுகிறது"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> தவறான செய்தி அனுப்பி உள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "தவறான கூட்ட செய்தி"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> பணி தகவலை பதிப்பித்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "பணி தகவல்"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>இந்த வேலையை %s செய்ய கோரிக்கை விடுத்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> இந்த வேலையை நீங்கள் செய்யவேண்டும் என்கிறார்"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "பணி கோரிக்கை"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> இருப்பில் உள்ள பணிக்கு சேர்க்கப்பட விரும்புகிறார்."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "பணி திருத்தம்"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> சமீபத்திய பணி பற்றிய தகவலை தெரிந்துகொள்ள விரும்புகிறார்."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "பணி புதுப்பித்தல் கோரிக்கை"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>பணி ஒதுக்கத்துக்கு பதிலலித்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "பணி பதில்"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> பணியை ரத்து செய்து விட்டார்"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "பணி ரத்து செய்யப்படுகிறது"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "தவறான பணி செய்தி"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> வேலையில்/வேலையில் இல்லை செய்தியை பதிப்பித்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "வேலையிலில்லை/வேலையில் தகவல்"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>நீங்கள் வேலையில்இருக்கிறீர்களா/இல்லையா தகவலை கேட்டுள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "வேலையில்/இல்லை கோரிக்கை"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>வேலையில்/இல்லை தகவலுக்கு பதிலலித்துள்ளார்"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "வேலையில்/இல்லை பதில்"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "தவறான வேலையில்/இல்லை செய்தி"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "செய்தி சரியாக அமைக்கப்படவில்லை என தெரிகிறது"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "செய்தியில் ஆதரவு இல்லாத கோரிக்கைகள் உள்ளது"
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "இணைப்பு செய்தியில் சரியான நாள்காட்டி செய்தி இல்லை"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "இணைப்பில் பார்க்க முடிந்த நாள்காட்டி இல்லை"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "மேம்படுத்தல் முடிந்தது\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "பொருள் செல்லாது அதனால் மேம்படுத்த முடியாது\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "இந்த பதில் தற்போதைய பங்கேற்பாளரிடமிருந்து அல்லது. இவரை சேர்க்கலாமா?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "பங்கேற்பாளரின் நிலை செல்லாது அதனால் புதுப்பிக்க முடியவில்லை\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "பங்கேற்பாளர் நிலை புதுப்பிக்கபட்டது\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "பங்கேற்பாளர் நிலை புதுப்பிக்கப்படாதற்கு காரணம் இவர் பட்டியலில் இல்லை"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "உருப்படி அனுப்பப்பட்டது\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "உருப்படி அனுப்ப முடியவில்லை!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "செயலை தேர்வு செய்:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "திருத்து"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "ஏற்கப்பட்டது"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "ஏற்கப்படலாம்"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "நிராகரிக்கப்பட்டது"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "வேலைஇல்லை /வேலையில் தகவலை அனுப்பு"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "பதில் தருபவரின் நிலையை புதுப்பி"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "தற்போதைய தகவலை அனுப்பு"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ரத்து செய்"
 
@@ -8062,112 +8234,93 @@ msgstr "நாள்காட்டி ஏற்றப்படுகிறத�
 msgid "Server Message:"
 msgstr "சேவகன் செய்தி:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "நடுவர்"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "தேவையான பங்களிப்பு"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "மற்ற பங்கேற்பாளர்கள் "
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "மூலங்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "கலந்துகொள்பவர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "தனிநபர்"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "குழு"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "மூலங்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "அறை"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "நடுவர்"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "தேவையான பங்கேற்பாளர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1002
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "பங்கேற்பாளர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1003
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "பங்கேற்காதவர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "செயல் தேவை"
 
-#: ../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 "தோராயமாக"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "விருந்தினராக"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "கலந்து கொள்பவர்கள்                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "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 "செயலில் உள்ளது"
 
 #. 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, %B %d, %Y"
 
@@ -8176,7 +8329,7 @@ msgstr "%A, %B %d, %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 %m/%d/%Y"
 
@@ -8186,67 +8339,67 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "அலுவலகத்திற்கு வெளியில்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "தகவல் இல்லை"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "கலந்துகொள்பவர்கள்... (_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "விருப்பங்கள் (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "வேலை நேரத்தை மட்டும் காட்டு (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "(_z) பெரிதாக்கபப்ட்டது"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "(_U)வேலை/வேலையில்லை தகவலை புதுப்பி"
 
-#: ../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 "(_A)வேகமாகதேர்வு செய்"
 
-#: ../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 "(_A)எல்லோரும் மற்றும் மூலங்கள்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "(_p)எல்லோரும் மற்றும் ஒரே ஒரு மூலம் மட்டும்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "(_R)தேவையானவர்கள் மட்டும்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "(_o)தேவையானவர்கள் மற்றும் ஒரு மூலம்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "(_S)துவக்க நேரம்"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "(_E)முடியும் நேரம்:"
 
@@ -8283,7 +8436,6 @@ msgid "Click to add a memo"
 msgstr "ஒரு குறிப்பினை சேர்க்க சொடுக்கவும்"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8292,16 +8444,16 @@ msgstr ""
 "%s: இல் பிழை\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "குறிப்பினை ஏற்றுகிறது"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s இல் குறிப்பினை திறக்கிறது"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "தேர்வு செய்யப்பட்ட பொருள் நீக்கப்படுகிறது..."
 
@@ -8309,63 +8461,63 @@ msgstr "தேர்வு செய்யப்பட்ட பொருள்
 msgid "Loading tasks"
 msgstr "பணியை ஏற்றுகிறது"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s இல் பணியை திறக்கிறது"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "பணி முடிகிறது..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "அழிக்கிறது"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "நேர மண்டலத்தை தேர்ந்தெடு"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "தனிபயன் காட்சி (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "தனிப்பயன் காட்சியை சேமி (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "காட்சிகளை குறிப்பிடு... (_D)"
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr " %s இல் நேர ஒதுக்கத்தை ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s இல் வேலையை ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ல் குறிப்புகளை ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "%sஐ திறக்கிறது"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "தூய்மை படுத்துகிறது"
 
@@ -8434,19 +8586,19 @@ msgstr "ஒருங்கிணைப்பாளர் அமைக்கப�
 msgid "At least one attendee is necessary"
 msgstr "ஒரு பங்கேற்பாளராவது தேவை"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "நிகழ்வு தகவல்"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "பணி தகவல்"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "குறிப்பு இல்லை"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "வேலை/வேலையிலில்லை தகவல்"
 
@@ -8454,113 +8606,184 @@ msgstr "வேலை/வேலையிலில்லை தகவல்"
 msgid "Calendar information"
 msgstr "நாள்காட்டி தகவல்"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+#, fuzzy
+#| msgid "Accepted"
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "ஏற்கப்பட்டது"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+#, fuzzy
+#| msgid "Tentatively Accepted"
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "ஏற்கப்படலாம்"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+#, fuzzy
+#| msgid "Declined"
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "நிராகரிக்கப்பட்டது"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+#, fuzzy
+#| msgid "Delegated"
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "விருந்தினராக"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+#, fuzzy
+#| msgid "Updated"
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "புதுப்பிக்கப்படுகிறது"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+#, fuzzy
+#| msgid "Cancel"
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "ரத்து செய்"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+#, fuzzy
+#| msgid "Refresh"
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "புதுப்பி"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+#, fuzzy
+#| msgid "Counter-proposal"
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "எதிர்-கோரிக்கை"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "வேலை/வேலையில்லை தகவல்(%s %s க்கு)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "iநாள்காட்டி தகவல்"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "இந்த நிகழ்வில் நீங்கள் கலந்துகொள்ள வேண்டும்"
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "புதிய குறிப்பு பட்டியல் (_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d குறிப்பு"
 msgstr[1] "%d குறிப்புகள்"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d தேர்வு செய்யப்பட்டது"
 msgstr[1] ", %d தேர்வு செய்யப்பட்டன"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "குறிப்புகளை மேம்படுத்த முடியவில்லை."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "'%s' நிகழ்வு மற்றும் சந்திப்பினை உருவாக்க குறிப்பு பட்டியலை திறக்க முடியவில்லை"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "குறிப்புகளை உருவாக்க நாள்காட்டி எதுவுமில்லை"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "குறிப்பு மூல தேர்வாளர்"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "புதிய குறிப்பு"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1176
 msgctxt "New"
 msgid "Mem_o"
 msgstr "குறிப்பு (_o)"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "புதிய குறிப்பினை உருவாக்கு"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "புதிய குறிப்பின் பங்கு"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1184
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "(_S) பங்கிடும் குறிப்புகள்"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "புதிய குறிப்பினை பற்றி உருவாக்கு"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "புதிய குறிப்பு பட்டியல்"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1192
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "குறிப்பு பட்டியல் (_s)"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "ஒரு புதிய குறிப்பு பட்டியலை உருவாக்கு"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "குறிப்புகளைஅச்சிடு"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "அடுத்த 7 தினங்கள்"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8608,273 +8831,273 @@ msgstr "%s' பணியை நகர்த்த முடியவில்ல
 msgid "Notes"
 msgstr "குறிப்புகள்"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "முதல்"
 
-#: ../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 "28வது"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "29வது"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29வது"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30வது"
 
-#: ../calendar/gui/print.c:523
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31வது"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "ஞா"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "தி"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "செ"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "பு"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "வி"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "வெ"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "ச"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "நேர ஒதுக்கங்கள்"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "பணி"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "சுருக்கம்: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "கலந்துகொள்பவர்கள்:"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "நிலை : %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "முன்னுரிமை: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "முடிந்த விகிதம் : %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "வகைகள்: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "தொடர்புகள்:"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "புதிய பணிபட்டியல் (_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d பணி"
 msgstr[1] "%d பணிகள்"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "பணியை மேம்படுத்தல் தோல்வியில் முடிந்தது"
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "'%s' நிகழ்வு மற்றும் கூட்டத்தை உருவாக்க பணி பட்டியலை திறக்க முடியவில்லை"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "பணியை உருவாக்க நாள்காட்டி எதுவுமில்லை"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "பணி மூல தேர்வாளர்"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "புதிய பணி"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1240
 msgctxt "New"
 msgid "_Task"
 msgstr "(_T) பணி"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "புதிய பணியை உருவாக்கு"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "புதிய பணியை ஒதுக்கு"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1248
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "(_d) ஒதுக்கிய பணி"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "ஒதுக்கப்பட்ட புதிய பணியை உருவாக்கு"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "புதிய பணிபட்டியல்"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1256
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "பணி பட்டியல் (_i)"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "புதிய பணிபட்டியலயை உருவாக்கு"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8886,11 +9109,11 @@ msgstr ""
 "\n"
 "பணிகளை அழிக்க விரும்புகிறீர்களா?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "என்னிடம் மீண்டும் கேட்காதே"
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "பணியை அச்சடி"
 
@@ -8899,57 +9122,57 @@ msgstr "பணியை அச்சடி"
 msgid "% Completed"
 msgstr "% முடிந்தது"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "ரத்து செய்யப்பட்டது"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "நடந்துகொண்டிருக்கிறது"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "விடப்பெரிய"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "விட சிறிய"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "நேர ஒதுக்கங்கள் மற்றும் கூட்டங்கள்"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "நாள்காட்டியை திறக்கிறது"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iநாள்காட்டி கோப்புகள் (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "எவல்யூஷன் iநாள்காட்டி ஏற்றி"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "நினைவில்கொள்!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vநாள்காட்டி கோப்புகள் (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "எவல்யூஷன்vநாள்காட்டி ஏற்றி"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "நாள்காட்டி நிகழ்வுகள்"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "எவல்யூஷன் நாள்காட்டி ஏற்றி"
 
@@ -10502,247 +10725,255 @@ msgstr "பசிபிக்/வாலிஸ்"
 msgid "Pacific/Yap"
 msgstr "பசிபிக்/யேப்"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "தானியங்கியாக சேமித்த கோப்பை திறக்க முடியவில்லை"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "தொகுப்பியிலிருந்து செய்தியை பெற முடியவில்லை"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "இணைப்பினை நுழை"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "இணை (_t)"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "தலைப்பில்லா செய்தி"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "கோப்பை இணைக்கவும்"
 
-#: ../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 "(_C)மூடு"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "தற்போதைய கோப்பை தேர்வு செய்யவும்"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "(_P)அச்சடி..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "(_v)அச்சு முன்தோற்றம்"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "தற்போதைய கோப்பை சேமி"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "(_A)எனச்சேமி..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "தற்போதைய கோப்பை வேறு பெயரில் சேமி"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "வரைவை சேமி (_D)"
+#: ../composer/e-composer-actions.c:511
+#, fuzzy
+#| msgid "Save as draft"
+msgid "Save as _Draft"
+msgstr "வரைவாக சேமி"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "வரைவாக சேமி"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "_அனுப்புக"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "இந்த செய்தியை அனுப்பு"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "அனுப்பு விருப்பங்களை சொருகுக"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "புதிய செய்தி (_M)"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "புதிய செய்தி சாளரத்தை திறS)"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "(_E) எழுத்துரு குறிமுறை"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "(_S)பாதுகாப்பு"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP மறையாக்கு"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "PGP யை பயன்படுத்தி இந்த செய்தியை குறிமுறையாக்கவும்"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP கையொப்பம்"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "PGP விசையை பயன்படுத்தி இந்த செய்திக்கு கையொப்பமிடவும்"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "முன்னுரிமை செய்தி (_P)"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "செய்தி முன்னுரிமையை உயர்ந்ததாக அமை"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "படிக்க பெற்றதற்கு சான்று கோரவும் (_q)"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "உங்கள் செய்தியை படித்தவுடன் பெற்ற அறிவிப்பினை பெறு"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "S/MIME குறிமுறையாக்க சான்றிதழை பயன்படுத்தி இந்த செய்தியை குறியாக்கவும்"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "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 "S/MIME கையொப்ப சான்றிதழ் பயன்படுத்து இந்த செய்திக்கு கையொப்பமிடவும்"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "(_B)மறை நகல் புலம்"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "மறைநகல் புலம் காட்டப்பட வேண்டுமா என்பதை மாற்ற"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "(_C)கரிநகல் புலம்"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "கரிநகல் புலம் காட்டப்படவேண்டுமா என்பதை மாற்ற"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "(_F)புலத்திலிருந்து"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "அனுப்புநரை தேர்வு செய்ய வேண்டுமா புலத்தை மாற்ற"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "(_P) இங்கு அனுப்பு"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "செல்லுமிடம்புநர் புலம் காட்டப்பட வேண்டுமா என்பதை மாற்றும்்புன"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "(_R) இங்கு பதிலலி"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "பதிலலிநர் புலம் காட்டப்படவேண்டுமா என்பதை மாற்றும்"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "(_S) பொருள் புலம்"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "பொருள்லை புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "(_T)புலத்தில்"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "புலங்கள் காட்டப்பட வேண்டுமா என்பதை மாற்று"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#, fuzzy
+#| msgid "Save _Draft"
+msgid "Save Draft"
+msgstr "வரைவை சேமி (_D)"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "அனுப்புவதற்கான செய்தியை உள்ளிடவும்"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "இதே செய்தியை கரிநகலாக அனுப்ப வேண்டிய முகவரியை உள்ளிடவும்"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "இதே செய்தியை மறை நகலாக அனுப்ப வேண்டிய முகவரியை உள்ளிடவும்"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "அனுப்புநர்: (_o)"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "பதில் : (_R)"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "பெறுநர்: (_T)"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "நகல்: (_C)"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "மறைநகல்: (_B)"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "சமர்பி: (_P)"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "பொருள்: (_u)"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "கையொப்பம்: (_g)"
 
@@ -10762,15 +10993,15 @@ msgstr "செய்தியை சமர்பிப்பதற்கான �
 msgid "Click here to select folders to post to"
 msgstr "சமர்ப்பிக்க வேண்டிய அடைவை தேர்வு செய்ய இங்கே க்ளிக் செய்யவும்"
 
-#: ../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 "இணைப்பு பட்டைகளை காட்டு (_A)"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:866
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "வெளி செல்லிம் செய்திகளை கையொப்பமிட முடியாது. இந்த கணக்கிற்கென சான்றிதழ் எதுவும் இல்லை"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10778,23 +11009,23 @@ msgstr ""
 "வெளியில் செல்லும் செய்திகளை குறிமுறையாக்க முடியாது : இந்த கணக்கிற்கு குறிமுறையாக்க "
 "சான்றிதழ் எதுவுமில்லை"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "இணைப்பு"
 msgstr[1] "இணைப்புகள்"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "இணைப்பு பட்டைகளை மறை (_A)"
 
-#: ../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 "செய்தியை உருவாக்கு"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10880,8 +11111,12 @@ msgstr ""
 "உங்கள் செய்தியை மீட்டு தொடர முடியும்."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
+#| msgid ""
+#| "Send options available only for Novell Groupwise and Microsoft Exchange "
+#| "accounts."
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr "நோவெல் க்ரூப்வைஸ் மற்றும் மைக்ரோஸாப்ட் எக்ஸ்சேஞ்ச் கணக்குகளுக்கு மட்டும் உள்ள அனுப்பு விருப்பங்கள்"
 
@@ -10985,23 +11220,80 @@ msgid "Evolution Query"
 msgstr "எவல்யூஷன் கேள்வி"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:450
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "உள்ளார்ந்த பிழை, தெரியாத பிழை '%s' கோரப்பட்டது"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "உள்ளடக்கம்"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "பதிவிடும் உள்ளடக்கத்தின் பெயர் "
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "பிழை நீக்கு பதிவு"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "(_e) இதற்கு நிலைப்பட்டியில் பிழைகளை காட்டு"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "வினாடி(கள்)"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "பதிவு செய்திகள்"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "உள்நுழை நிலை"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "நேரம்"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "செய்திகள்"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "இந்த சாளரத்தை மூடவும்"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "பிழை"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "தவறுகள்"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "எச்சரிக்கைகள் மற்றும் தவறுகள்"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "பிழை நீக்கு"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "பிழை எச்சரிக்கைகள் மற்றும் பிழை நீக்கு செய்திகள்"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "செயலில் உள்ள"
 
@@ -11049,51 +11341,57 @@ msgstr "கோப்பை மேலெழுத வேண்டுமா"
 msgid "_Overwrite"
 msgstr "(_O)மேலெழுது"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+#, fuzzy
+#| msgid "Could not open autosave file"
+msgid "Could not open the link."
+msgstr "தானியங்கியாக சேமித்த கோப்பை திறக்க முடியவில்லை"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "எவலூஷனுக்கு உதவியை காட்ட முடியவில்லை."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "முக்கியமானது (_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "வேலை (_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "தனிப்பட்ட (_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "செய்ய வேண்டியவை (_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "பிறகு (_L)"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "(_N)  குறியீட்டின் பெயர்யர்:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "குறியீட்டை திருத்துக"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "குறியீட்டை சேர்க்க"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "விளக்கச்சீட்டு பெயர் வெற்றாக இருக்கலாகாது"
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11101,128 +11399,128 @@ msgstr ""
 "அதே குறி கொண்ட விளக்கச்சீட்டு ஏற்கெனவே சேவையகத்தில் உள்ளது. தயவு செய்து விளக்கச்சீட்டு "
 "பெயரை மாற்றவும்."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "ஜிகான்ஃப் பிழை: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "இனி வரும் பிழைகளை முனையத்தில் மட்டுமே காட்டப்படும்"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 வினாடிக்கு முன்"
 msgstr[1] "%d வினாடிகளுக்கு முன்"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வினாடியில்"
 msgstr[1] "எதிர்காலத்தில் %d வினாடிகளில்"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 நிமிடத்திற்கு முன்"
 msgstr[1] "%d நிமிடங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு நிமிடத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d நிமிடங்களில்"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 மணி நேரத்திற்கு முன்"
 msgstr[1] "%d மணிகள் நேரத்திற்கு முன்"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு மணியில்"
 msgstr[1] "எதிர்காலத்தில் %d மணிகளில்"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 நாளைக்கு முன்"
 msgstr[1] "%d நாட்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு நாளில்"
 msgstr[1] "எதிர்காலத்தில் %d நாட்களில்"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "எதிர்காலத்தில் ஒரு வாரத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வாரங்களில்"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வாரத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வாரங்களில்"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 மாதத்திற்கு முன்"
 msgstr[1] "%d மாதங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு மாதத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d மாதங்களில்"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 வருடத்திற்கு முன்"
 msgstr[1] "%d வருடங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வருடத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வருடங்களில்"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<தேதியை தேர்வு செய்ய இங்கே க்ளிக் செய்யவும்>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "இப்போது"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "ஒப்பிட வேண்டிய நேரத்தை தேர்வு செய்யவும்"
 
@@ -11235,56 +11533,64 @@ msgstr "கோப்பை தேர்வு செய்யவும்"
 msgid "Test"
 msgstr "சோதனை"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "(_u) விதியின் பெயர்"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+#| msgid "Find items that meet the following criteria"
+msgid "Find items that meet the following conditions"
 msgstr "பின்வரும் சூழலை எதிர்கொள்ளும் உருப்படிகளை தேடு"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "வடிகட்டி விதிமுறையை சேர் (_d) "
+#: ../filter/filter-rule.c:915
+#, fuzzy
+#| msgid "Add Ac_tion"
+msgid "A_dd Condition"
+msgstr "(_t) செயலை சேர்"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+#| msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "எல்லா சுழலிலும்"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+#| msgid "If any criteria are met"
+msgid "If any conditions are met"
 msgstr "ஏதாவது ஒரு சுழலில்"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_த உருப்படிகளை தேடுக:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "எல்லா தொடர்புடைய"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "பதில்கள்"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "பதில்கள் மற்றும் முந்தையவை"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "பதில் இல்லை அல்லது பெற்றோர்"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "_இழைகளை உள்ளடக்கி"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "உள்வரும்"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "வெளி செல்லும்"
 
@@ -11384,7 +11690,7 @@ msgstr "எதிர்காலத்தின் உள்ளே"
 msgid "months"
 msgstr "மாதங்கள்"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "நிமிடம்"
 
@@ -11396,10 +11702,11 @@ msgstr "தற்போதைய நேரம்"
 msgid "the time you specify"
 msgstr "நீங்கள் குறிப்பிட்ட நேரம்"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "வாரங்கள்"
 
@@ -11407,15 +11714,15 @@ msgstr "வாரங்கள்"
 msgid "years"
 msgstr "வருடங்கள்"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "விதியை சேர்"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "விதியை திருத்து"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "விதியின் பெயர்"
 
@@ -11467,10 +11774,10 @@ msgstr "எவல்யூஷன் மின்னஞ்சல் முன்�
 msgid "Evolution Network configuration control"
 msgstr "எவல்யூஷன் வலை இணைப்பு அமைப்பு கடடுப்பாடு"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:763
+#: ../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 "மின்னஞ்சல்"
@@ -11481,7 +11788,7 @@ msgid "Mail Accounts"
 msgstr "மின்னஞ்சல் கணக்கு"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "மின்னஞ்சல் முன்னுரிமை"
 
@@ -11511,13 +11818,13 @@ msgstr ""
 "%s இல் காட்டப்பட்ட\n"
 "சோதனைப்பெட்டியை க்ளிக் செய்து ஏற்க்கவும்\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "அடைவை தேர்வு செய்"
 
 #: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "தானாக உருவாக்கப்பட்ட"
 
@@ -11525,11 +11832,11 @@ msgstr "தானாக உருவாக்கப்பட்ட"
 msgid "Ask for each message"
 msgstr "ஒவ்வொரு செய்திக்கும் கேட்கவும்"
 
-#: ../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 "உறுப்பினர்கள்"
 
-#: ../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 "மின்னஞ்சல் பெறப்படுகிறது"
 
@@ -11541,7 +11848,7 @@ msgstr "புதிய மின்னஞ்சல்களை கால இட
 msgid "minu_tes"
 msgstr "(_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 "மின்னஞ்சல் அனுப்பப்படுகிறது"
 
@@ -11550,8 +11857,8 @@ msgid "Defaults"
 msgstr "இயல்பானவைகள்"
 
 #. 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 "பாதுகாப்பு"
 
@@ -11568,7 +11875,7 @@ msgstr "புதிய மின்னஞ்சலுக்காக சோத�
 msgid "Account Editor"
 msgstr "கணக்கு தொகுப்பி"
 
-#: ../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 "எவல்யூஷன் கணக்கு உதவி"
 
@@ -11586,19 +11893,19 @@ msgid "Protocol"
 msgstr "விதிமுறை"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "பெயரில்லா"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "மொழி(கள்)"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "கையொப்ப நிரலை சேர்க்கவும்"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "கையொப்பம்(ங்கள்)"
 
@@ -11606,14 +11913,22 @@ msgstr "கையொப்பம்(ங்கள்)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- அனுப்பும் செய்தி --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "தெரியாத அனுப்புநர்"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11621,7 +11936,7 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----மூல செய்தி----"
 
@@ -11671,7 +11986,7 @@ msgid "Date sent"
 msgstr "தகவல் அனுப்பபட்டது"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11750,7 +12065,7 @@ msgstr "அமைக்கவில்லை"
 msgid "is set"
 msgstr "அமைக்கப்பட்டது"
 
-#: ../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 "தேவையற்ற"
@@ -11759,7 +12074,7 @@ msgstr "தேவையற்ற"
 msgid "Junk Test"
 msgstr "தேவையற்றவை சோதனை"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "விளக்கச்சீட்டு"
 
@@ -11799,48 +12114,53 @@ msgstr "நிரலுக்கு வழி"
 msgid "Play Sound"
 msgstr "ஒலியை இயக்கு"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "படி"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "பெறுநர்"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Regex பொருத்தம்"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "பதிலலி"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "திருப்பவும்"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "பெரியதை தந்தது"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "சிறியதை தந்தது"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "நிரலை இயக்கு"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "மதிப்பு"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "அனுப்பியவர்"
 
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+#| msgid "Send Receipt"
+msgid "Sender or Recipients"
+msgstr "ரசீது அனுப்பு"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "விளக்கச்சீட்டு அமை"
@@ -11875,9 +12195,9 @@ msgstr "செயல்படுத்துவதை நிறுத்து"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "தலைப்பு"
 
@@ -11894,51 +12214,51 @@ msgstr "பின்"
 msgid "Add Ac_tion"
 msgstr "(_t) செயலை சேர்"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "தேடலிருந்து தேடும் அடைவை உருவாக்கு... (_r)"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "முழுமையான செய்திகள்"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "படிக்கப்படாத  செய்திகள்:"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "விவரச்சீட்டு இல்லை"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "படிக்கப்பட்ட செய்திகள்"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "புதிதான செய்திகள்"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "கடைசி 5 நாட்களின் செய்திகள்"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "இணைப்புடன் கூடிய செய்திகள்"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr " முக்கியமான செய்திகள்"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "பயனற்ற செய்திகள் எதுவும் இல்லை"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "கணக்கை தேடு"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "அனைத்து கணக்குகளையும் தேடு"
 
@@ -11968,15 +12288,15 @@ msgid "Quota usage"
 msgstr "ஒதுக்கீடு பயன் "
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:581
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "உள்பெட்டி"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "அடைவின் பண்புகள்"
@@ -11995,7 +12315,7 @@ msgstr "(_n) அடைவின் பெயர்"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "தேடும் அடைவுகள்"
 
@@ -12004,19 +12324,24 @@ msgstr "தேடும் அடைவுகள்"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "வரைவுகள்"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "வார்ப்புரு"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "செல் அஞ்சல்"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "அனுப்பு"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "ஏற்றுகிறது..."
 
@@ -12055,12 +12380,12 @@ msgstr "%s அடைவை நகர்த்துகிறது"
 msgid "Copying folder %s"
 msgstr "%s அடைவை நகலெடுக்கிறது"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s க்கு செய்திகளை நகர்த்துகிறது"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s இல் செய்திகளை நகலெடுக்கிறது"
@@ -12077,321 +12402,323 @@ msgstr "(_C)அடைவில் நகலெடு"
 msgid "_Move to Folder"
 msgstr "(_M)அடைவிற்கு நகர்த்து"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" இல் உள்ள அடைவுகளை சோதிக்கிறது"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "(_N)புதிய சாளரத்தில் திற"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "(_N)புதிய அடைவு"
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "(_M)நகர்த்து..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "(_R)மறுபெயரிடு"
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_புதுப்பி"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "அஞ்சல் வெளிபெட்டியை _காலி செய்க"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "(_E)குப்பை தொட்டியை காலி செய்"
 
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+#| msgid "Create _Search Folder"
+msgid "_Unread Search Folder"
+msgstr "தேடும் அடைவினை உருவாக்கு"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' லிருந்து `%s'க்கு நகலெடுக்கிறது"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
 #: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "அடைவை தேர்வு செய்"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "(_o)நகலெடு"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' அடைவை உருவாக்குகிறது"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "அடைவை உருவாக்குகிறது"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "அடைவை உருவாக்க வேண்டுமா என குறிப்பிடவும்"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "அஞ்சல் நீக்கல் தோல்வியுற்றது"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "நீங்கள்  இந்த அஞ்சலை நீக்க தேவையான அனுமதி இல்லை."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "(_R)அனுப்பியவருக்கு பதிலலி"
 
-#: ../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 "(_F)அனுப்பு"
 
 #. 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 "(_E)புதிய செய்தியாக தொகு"
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "(_n)நீக்கலை ரத்து செய்"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "(_M)அடைவிற்கு நகர்த்து..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "(_C)அடைவில் நகலெடு"
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "(_k) படித்தது என குறி"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "படிக்காதவை என குறி (_U)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "முக்கியம் என குறி (_I)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "முக்கியமில்லை என குறிக்கவும் (_i)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "பயனற்றது என குறிக்கவும் (_J)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "பயனற்றது இல்லை என குறிக்கவும் (_N)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "தொடர்தலுக்கு குறிக்கவும்... (_w)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "பெயர் (_L)"
 
 #. 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 "ஒன்றுமில்லை (_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "(_N)புதிய  விவரச்சீட்டு "
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "(_g) குறித்தல் முடிந்தது"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "(_e)குறிப்பை நீக்கு"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "(_t)செய்தியிலிருந்து புதிய விதிமுறையை உருவாக்கு"
 
 #. 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 "பொருளில் அடிப்படையில் அடைவினை தேடு (_S)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "அனுப்புனர் அடிப்படையில் அடைவினை தேடு (_n)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "பெறுநர் அடிப்படையில் அடைவினை தேடு (_R)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "அஞ்சல் பட்டியல் அடிப்படையில்  அடைவினை தேடு (_L)"
 
 #. 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 "(_j) தலைப்பின் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "(_d) அனுப்புநர் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "(_c )பெறுநர் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "(_M) மின்னஞ்சல் குழுக்கள் படி வடிகட்டு"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "இயல்பான"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "செய்தியை பெற முடியவில்லை"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "செய்தி மீட்டல்..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "_இவரை அழை..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "தேடும் அடைவினை உருவாக்கு"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "இந்த முகவரியிலிருந்து (_F)"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "இந்த முகவரிக்கு (_T)"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s மின்னஞ்சலுக்கு க்ளிக் செய்யவும்"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ஐ அழைக்க சொடுக்கு"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "முகவரிகளை மறைக்க/மறைநீக்க சொடுக்கவும்"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:471
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "பொருத்தம்: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "தேடு(_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 "முந்தைய (_P)"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "அடுத்து (_N)"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "நிகழ்ச்சி ஒப்பீடு_a"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "கையொப்பமிடாத"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "இந்த செய்தி கையொப்பமிடப்படவில்லை, இது நம்பகமான செய்தி என்பதற்கு உத்திரவாதம் இல்லை"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "சரியான கையொப்பம்"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "இந்த செய்தி கையொப்பமிடப்பட்ட சரியான செய்தி நம்பகமானது."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "செல்லாத கையொப்பம்"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "இந்த செய்தியில் கையொப்பத்தை  சரிபார்க்க முடியாது இது யாராலோ மாற்றப்பட்டது"
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "சரியான கையொப்பம் ஆனால் அனுப்பியவரை சரிபார்க்க முடியவில்லை"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "இந்த செய்தி சரியாக கையொப்பமிடப்பட்ட செய்தி  ஆனால் அனுப்புநரைசரிபார்க்க முடியவில்லை"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "கையொப்பம் உள்ளது ஆனால் பொது விசை இல்லை"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "இது சரியாக கையொப்பமிடப்பட்ட செய்தி  ஆனால் பொது விசை இல்லை"
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "குறிமுறையாக்கப்படாத"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12399,11 +12726,11 @@ msgstr ""
 "இந்த செய்தி குறிமுறையாக்கம் செய்யப்படவில்லை. இணைய பரிமாற்றத்தின் போது அதன் உள்ளடக்கங்களை "
 "பார்க்கலாம்."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "குறிமுறையாக்கப்பட்ட, மோசமான"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12413,21 +12740,21 @@ msgstr ""
 "இது கடினமானது, ஆனால் இந்த செய்தியின் உள்ளடக்கங்களை வெளியிலிருப்பவர்கள் பார்ப்பது ஒன்றும் "
 "கடினமான செயல் இல்லை."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "குறிமுறையாக்கப்பட்ட"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "இந்த செய்தி குறிமுறையாக்கப்பட்டது, மற்றவர் இதை பார்ப்பது கடினம்"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "சரியாக குறிமுறையாக்கப்பட்ட"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12436,87 +12763,87 @@ msgstr ""
 "கடினமான குறியாக்க கணிமுறையில், இந்த செய்தி குறிமுறையாக்கப்படடுள்ளது.இந்த செய்தியின் "
 "உள்ளடக்கங்களை வெளியிலிருப்பவர்கள் பார்ப்பது அவ்வளவு எளிமையானது இல்லை."
 
-#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "சான்றிதழை பார்க்கவும் (_V)"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "இந்த சான்றிதழை பார்க்க இயலாது"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "முடிந்த தேதி %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "நிலுவையில்"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "(_V)உள்ளே பார்"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "(_H)மறை"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "அகலத்துடன் பொருத்தவும் (_F)"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "அசல் அளவினை காட்டு (_O)"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "_இணைப்பை இப்படி சேமி"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "அனைத்து இணைப்புகளையும் சேமிக்க அடைவு தேர்ந்தெடு "
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "தேர்ந்தெடுத்ததை சேமி... (_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d இணைப்பு (_t)"
 msgstr[1] "%d இணைப்புகள் (_t)"
 
-#: ../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 "சேமி (_a)"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "அனைத்தையும் சேமி (_a)"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "இணைப்பு இல்லை"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "_ஒழுங்கு செய்யாத காட்சி"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "_ஒழுங்கு செய்யாததை மறை"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "_உடன் திற"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12606,14 +12933,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "செய்தி <b>%s</b> ஆல் அனுப்பப்பட்டது <b>%s</b> சார்பாக"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "அனுப்புநர்"
 
@@ -12623,8 +12950,8 @@ msgid "Reply-To"
 msgstr "பதில்-பெறுநர்"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "தேதி"
 
@@ -12674,11 +13001,11 @@ msgstr "கையொப்பத்தை சரிபார்க்கும�
 msgid "Unknown error verifying signature"
 msgstr "கையொப்பத்தை சரிபார்க்கும் போது  தெரியாத பிழை"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "PGP செய்தியை பகுக்க இயலவில்லை"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP செய்தியை பகுக்க இயலவில்லை தெரியாத தவறு"
 
@@ -12794,9 +13121,15 @@ msgstr "POP3 keep-on-server தகவலை நகலெடுக்க மு�
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "உள் மின்னஞ்சல் சேமிப்பை உருவாக்குவதில் தோல்வி`%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"
+#| "\n"
+#| "Please be patient while Evolution migrates your folders..."
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
@@ -12806,12 +13139,12 @@ msgstr ""
 "\n"
 "எவல்யூஷன் அடைவுகளை நகர்த்துகையில் சற்று பொறுமையாக இருக்கவும்..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "மின்னஞ்சல் அடைவை `%s' இடத்தில் உருவாக்க முடியவில்லை: %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12819,65 +13152,65 @@ msgstr ""
 "முந்தைய எவல்யூஷன் அமைப்பை படிக்க முடியவில்லை, `எவலுஷன்/config.xmldb' இல்லை அல்லது "
 "சிதைந்தது"
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "(_R)அனுப்பியவருக்கு பதிலலி"
 
-#: ../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 "(_L)குழுவிற்கு பதிலலி"
 
 #. 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 "முகவரி புத்தகத்தில் சேர் (_A)"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "இந்த கிடங்கு உறுப்பினர் சேர்க்கைக்கு ஆதரவு தராது அல்லது இந்த வசதி செயல்படுத்தப்படவில்லை"
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "உறுப்பினராக்கப்பட்டீர்"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "அடைவு"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:821
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "சேவகனை தேர்வு செய்யவும்"
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "சேவகன் எதுவும் தேர்வு செய்யப்படவில்லை"
 
 #. 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 "(_D) இந்த செய்தியை மீண்டும் காட்டாதே."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "செய்தி வடிப்பிகள்"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "செய்திகள்"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "செய்தியை சேமி"
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "முகவரியை சேர்"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr " %s லிருந்து செய்தி"
@@ -12903,17 +13236,15 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"மின்னஞ்சலை அனுப்பு & பெறு\"  சாளர அகலம்"
 
 #: ../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"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "அளவான உரையை காட்ட எவலூஷனை அனுமதிக்கிறது."
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "எப்போதும் படிக்க பெற்றவைக்கு ரசீது  கோரவும்"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "நிலைப்பட்டியில் பிழை காட்டப்பட வேண்டிய நேரம் - வினாடிகளில்."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "தானியங்கி சிரிப்பான் அடையாளம் காணல் "
@@ -13071,7 +13402,7 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-" செங்குத்து பார்வையில்  \"செய்திகள்\" நிரலில்    \"அனுப்புநர்\" மற்றும் \"பொருள்\" "
+" செங்குத்து பார்வையில் \"Messages\" நிரலில் \"From\" மற்றும் \"Subject\" "
 "வரிகளில் ஒரே எழுத்துருவை பயன்படுத்த வேன்டுமா  என்பதை நிர்ணயிக்கிறது."
 
 #: ../mail/evolution-mail.schemas.in.h:39
@@ -13083,7 +13414,9 @@ msgid "Directory for saving mail component files."
 msgstr "அஞ்சல் கூறுகள் கோப்புகளை சேமிக்க அடைவு "
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
+#, fuzzy
+#| msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "அடைவு கிளை பார்வையில்  அடைவு பெயர்களை அடைப்பதை முடமாக்கு அல்லது செயலாக்கு"
 
 #: ../mail/evolution-mail.schemas.in.h:42
@@ -13153,25 +13486,36 @@ msgstr "அளவான செய்தி உரை பகுதியை வ�
 msgid "Enable/disable caret mode"
 msgstr "காரட் பாங்கை செயல்படுத்து/செயல்படுத்தாதே"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "செய்தி-பட்டியல் பலகத்தில் உயரம்"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "செய்தி-பட்டியல் பலகத்தில் உயரம்"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "அடைவு முன்பார்வையை மறைக்கிறது மற்றும் தேர்வை நீக்குகிறது"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "பயனர் பத்துக்கு மேல் செய்திகளை திறக்க முயற்சி செய்தால் நிச்சயம் செய்ய வேண்டுமா எனக் கேள்."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13179,24 +13523,30 @@ msgstr ""
 "\"Preview\"  முன்பார்வை பலகம் செயலில் இருப்பின்  அதை உயரவாக்கில் அல்லாது பக்கத்துக்கு "
 "பக்கம் காட்டுக"
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:63
+#, 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."
+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 ""
 "எவல்யூஷனின் குறிப்பிட்ட மைம்வகை காட்சிக்கு ஆதரவு இல்லையெனில், போனபோ காட்சி பொருளை "
 "பயன்படுத்திசெய்திகளை காட்ட முடியும்."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"அஞ்சல் அனுப்பு மற்றும் பெறு\"  சாளரத்தின் ஆரம்ப உயரம். பயனர்  சாளரத்தை உயர அளவு "
+"\"Send and Receive Mail\" சாளரத்தின் ஆரம்ப உயரம். பயனர்  சாளரத்தை உயர அளவு "
 "மாற்றும் போது தானே இது மாறுகிறது."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13204,24 +13554,22 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"அஞ்சல் அனுப்பு மற்றும் பெறு\"  சாளரத்தின் ஆரம்ப பெரிதாக்கிய அளவு.  யனர்  சாளரத்தை "
-"அதிகபட்சம் குறைந்த பட்சம் என  அளவு மாற்றும் போது தானே இது மாறுகிறது .  \"அஞ்சல் "
-"அனுப்பு மற்றும் பெறு\"   சாளரத்தை அளவு மாற்ற முடியாது ஆகையால் இது எவலூஷனில் "
-"பயன்படாது.விவரத்துக்காக  சும்மா இது சேர்க்கப்பட்டு உள்ளது."
+"\"Send and Receive Mail\"  சாளரத்தின் ஆரம்ப பெரிதாக்கிய அளவு. பயனர் சாளரத்தை "
+"அதிகபட்சம் குறைந்த பட்சம் என  அளவு மாற்றும் போது தானே இது மாறுகிறது .  \"Send and Receive Mail\"   சாளரத்தை அளவு மாற்ற முடியாது ஆகையால் இது எவலூஷனில் பயன்படாது. விவரத்துக்காக  சும்மா இது சேர்க்கப்பட்டு உள்ளது."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"அஞ்சல் அனுப்பு மற்றும் பெறு\"  சாளரத்தின் ஆரம்ப அகலம். பயனர்  சாளரத்தை அகல அளவு "
+"\"Send and Receive Mail\"  சாளரத்தின் ஆரம்ப அகலம். பயனர்  சாளரத்தை அகல அளவு "
 "மாற்றும் போது தானே இது மாறுகிறது."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "பல செய்திகளை குறி இடும் போது தூண்டல் செய்திகளை செயல்நீக்கம்/ இயலுமை செய்கிறது."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13229,7 +13577,7 @@ msgstr ""
 "இணைப்பு விலகிய பார்வைக்கு ஒருங்கிணைத்தல் தேவையா என மீண்டும் மீண்டும் கேட்கும் பண்புக்கூறை "
 "செயல் நீக்குகிறது / செயல்படுத்துகிறது."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13239,31 +13587,33 @@ msgstr ""
 "விடைகளில் இருந்து மட்டும் அல்ல'  என மீண்டும் மீண்டும் எச்சரிக்கும் பண்புக்கூறை செயல் "
 "நீக்குகிறது / செயல்படுத்துகிறது"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "குப்பையை காலி செய்த கடைசி நேரம்."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "கடைசியாக குப்பைகாலி இயக்கப்பட்ட நேரம்"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "செய்தி பதிவு செய்யப்பட வேண்டிய மட்டம்"
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "விளக்கச்சீட்டு மற்றும் அதனோடு தொடர்புடைய வண்ணங்களின் பட்டியல்"
 
-#: ../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"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "போனபோ விற்காக  சோதிக்க வேண்டிய மைம்வகைகள்"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "ஏற்கப்பட்ட உரிமங்களின் பட்டியல்"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "கணக்குகளின் பட்டியல்"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13271,15 +13621,15 @@ msgstr ""
 "எவல்யூஷனுக்கு தெரித்த கணக்கின் பட்டியல் உப அடைவோடு தொடர்புடைய /apps/எவலுஷன்/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 "தனிப்பயன் தலைப்புகள் மற்றும் அவை செயலில் உள்ளதா என்பதை அறிவிக்கும் பட்டியல்"
 
-#: ../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 "எழுத்துப்பிழை சோதிக்க பயன்படும் அகராதி மொழி குறிப்பு பட்டியல்."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13287,257 +13637,259 @@ msgstr ""
 "எவல்யூஷன் பொருளுக்கு தெரிந்த மின்னஞ்சல் பட்டியல் இதில் name:color நிறங்களின் HTML எண்ம "
 "மதிப்பு ஆகியவை இருக்கும்."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "போனபோ விற்காக  சோதிக்க வேண்டிய மைம்வகைகள்"
-
-#: ../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 "உரிமம் ஏற்கப்பட்ட விதிமுறைகளின் பட்டியல்"
 
-#: ../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"
+msgid "Load images for HTML messages over HTTP"
 msgstr "HTML செய்திக்கான பிம்பத்தை ஹெச்டிடிபி வழியாக ஏற்றவும்"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
+#| msgid ""
+#| "Load images for HTML messages over http(s). Possible values are: \"0\" - "
+#| "Never load images off the net. \"1\" - Load images in messages from "
+#| "contacts. \"2\" - Always load images off the net."
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"HTML செய்திகளுக்கு ஹெச்டிடிபி(s) வழியாக பிம்பங்களை ஏற்றுக. மதிப்புகள்: 0 - ஒருபோதும் "
-"வலையிலிருந்து பிம்பங்களை ஏற்றாதே. 1 - அஞ்சல் தொடர்புகளிலிருந்து பிம்பங்களை ஏற்று. 2 - "
+"HTML செய்திகளுக்கு ஹெச்டிடிபி(s) வழியாக பிம்பங்களை ஏற்றுக. மதிப்புகள்: \"0\" - ஒருபோதும் "
+"வலையிலிருந்து பிம்பங்களை ஏற்றாதே.\"1\" - அஞ்சல் தொடர்புகளிலிருந்து பிம்பங்களை ஏற்று. \"2\" - "
 "எப்போதும் பிம்பங்களை வலையிலிருந்து ஏற்று."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "வடிகட்டி செயல்களை பதிப்பி"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "குறிப்பிட்ட கோப்பில் வடிகட்டி செயல்களை பதிப்பி"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "பதிப்புகளை வடிகட்டும் பதிப்பி கோப்பி"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "செயல்களை வடிகட்டும் பதிப்பு கோப்பு"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "குறிப்பிட்ட நேரத்திற்கு பிறகு பார்க்கப்பட்டது என குறி"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "குறிப்பிட்ட நேரத்திற்கு பிறகு பார்க்கப்பட்டது என குறி"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
-msgstr "செய்தி \"முன்தோற்றத்தில்\"  அழைப்பை குறி"
+msgstr "செய்தி \"Preview\" அழைப்பை குறி"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
-msgstr "செய்தி \"முன்தோற்றத்தில்\"  அழைப்பை குறி"
+msgstr "செய்தி \"Preview\" அழைப்பை குறி"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "செய்தி சாளரத்தின் இயல்பான உயரம்"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "செய்தி சாளரத்தின் இயல்பான அகலம்"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "செய்தி தோன்றும் தோற்றம் (\"இயல்பான\", \"முழு தலைப்புகளை\", \"மூலம்\")"
+msgstr "செய்தி தோன்றும் தோற்றம் (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "வெளியேறும்போது குப்பையை காலி செய்ய இடையே குறைந்தபட்ச தினங்கள் "
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "வெளியேறும் போது குப்பையை காலி செய்ய தேவையான குறைந்தபட்ச நாட்கள்."
 
-#: ../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 "வெளியேறும் போது குப்பையை காலி செய்ய தேவையான குறைந்தபட்ச நேரம் நாட்களில்."
 
-#: ../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 "வெளியேறும் போது குப்பையை காலி செய்ய தேவையான நாட்கள்"
 
-#: ../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 "TO/CC/BCC ல் தெரிய வேண்டிய முகவரிகளின் எண்ணிக்கை"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "தலைப்பு காலியாக இருந்தால் தெரியப்படுத்து"
 
-#: ../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 "அடைவை முழுவதும் அழிக்க நினைக்கும் போது தெரியப்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "தலைப்பில்லாமல் செய்தி அனுப்ப முயலும் போது எச்சரி"
 
-#: ../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 "பயனர் உடனடியாக தொடர்பில்லாத பாணிக்கு மாற வேண்டுமா என தூண்டி கேள்."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "தேடல் அடைவிலிருந்து  செய்தியை நீக்கினால் நினைவூட்டு"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "பயனர் முடுவதும் அழிக்கும் போது தெரியப்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "மறை நகல் அனுப்பும் போது தெரியப்படுத்து "
 
-#: ../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 "பயனர் 10 அல்லது அதற்கு மேற்பட்ட செய்திகளை ஒரே நேரத்தில் அனுப்பும் போது தெரியப்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "HTML மின்னஞ்சலை ஏற்க விரும்பாதார்களுக்குHTML மின்னஞ்சல் அனுப்பப்படும் போது தெரியப்படுத்து."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "பயனர் கரிநகலோடு செய்தி அனுப்பும் போது தெரியப்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "தேவையற்ற HTML மின்னஞ்சலை பயனர் அனுப்பும் போது தெரியப்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "பல செய்திகளை குறிக்கும் போது தெரிவிக்கவும்"
 
-#: ../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 "உரையில் சிரிப்பு சித்திரங்களை உணர்ந்து அவைகளை மாற்று"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "உரையில் இணைப்பை உணர்ந்து அவைகளை மாற்று"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "குப்பை சோதனையை உள்வரும் மின்னஞ்சலில் இயக்கு"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "அடைவை சேமி"
 
-#: ../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 "உள்ளமை முகவரி புத்தகத்தில் அனுப்புனர் படத்தை தேடு."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "இயல்பாக HTML மின்னஞ்சலை அனுப்பு"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "இயல்பாக 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 "செய்தி பட்டியலில்   அனுப்புனர் மின்னஞ்சல் முகவரி  நிரல்"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "சேவையகத்துடன் ஒருங்கிணைக்கும் இடைவெளி"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "இயங்கு சித்திரங்களை காட்டு"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "இயங்கு சித்திரங்களை இயங்கு சித்திரங்களாக காட்டு"
 
-#: ../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 "அழித்த செய்திகளை அடித்த செய்திகளாக பட்டியலில் காட்டு"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "நீக்கிய செய்திகளை செய்தி பட்டியலில் காட்டு"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "அனுப்புனர் உடைய படத்தைக் காட்டு "
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "செய்திகள் பட்டியலில் தனி பத்தியில் அனுப்புனரின் மின்னஞ்சலை காட்டுக."
 
-#: ../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 "செய்திகள் படிக்கும் பலகத்தில் அனுப்புனரின் படத்தை காட்டுக"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "எழுத்துப்பிழை சோதி"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "எழுத்து பிழை திருத்த வண்ணம்"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "எழுத்துப்பிழை திருத்த மொழி"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "உரையாடலின் இயல்பான உயரத்தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "உரையாடலின் இயல்பான அகலத்தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "முனைய எழுத்துரு"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "உரை செய்திக்கு வரையளவு."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "ஜங்க் ஹூக் க்கு முன்னிருப்பு சொருகுப்பொருள்"
 
-#: ../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 "சகாப்த ஆரம்பத்திலிருந்து. கடைசி நேரம் ஜங்க் காலி செய் இயக்கிய நேரம், தினங்களில்"
 
-#: ../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 "epoch க்கு முன் கடைசியா குப்பை காலி இயக்கப்பட்ட நேரம்"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "மின்னஞ்சல் காட்டுவதற்கான முனைய எழுத்துரு"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "மின்னஞ்சலை காட்ட மாற்ற அகல எழுத்துரு"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13545,15 +13897,19 @@ msgstr ""
 "இதற்கு மூன்று  மதிப்புகள் இருக்ககூடும். \"0\" வழுக்கள். \"1\" எச்சரிக்கை. \"2\" "
 "வழுநீக்கி செய்திகள் ."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, 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 interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "உரை ஒழுங்கு படுத்தக்கூடிய அதிகபட்ச அளவு. முன்னிருப்பு4MB / 4096 KB. KB இல் "
 "குறிக்கப்படும்."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13562,15 +13918,15 @@ msgstr ""
 "செயற்படுத்தியவை சொருகுப்பொருள் பல இருப்பினும் எரிதத்துக்கு முன்னிருப்பு சொருகுப்பொருள். "
 "இந்த முன்னிருப்பு சொருகுப்பொருளை முடக்கிய பின் மற்றவற்றுக்கு மாறாது."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"இந்த விசை ஒரு முறை மட்டுமே படிக்கப்படும். படித்த பின் இது \"பொய்\" என மாற்றப்படும். இது "
+"இந்த விசை ஒரு முறை மட்டுமே படிக்கப்படும். படித்த பின் இது \"false\" என மாற்றப்படும். இது "
 "அஞ்சலை பட்டியலில் இருந்து நீக்கி அந்த அடைவுக்கு முன்பார்வையையும் நீக்கும்."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13580,7 +13936,7 @@ msgstr ""
 "இந்த விசையில் உள்ள XML சரங்கள் தனி தலைப்பை குறிக்கும், அவைகள் காட்டப்பட வேண்டுமா. "
 "XMLஅமைப்பு &lt;header enabled&gt; - தலைப்பை காட்டப்பட வேண்டும் எனில் அதை அமைக்கவும் "
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13590,11 +13946,11 @@ msgstr ""
 "தொடர்புகளை குப்பையாக கொள்ள உள்ளமை முகவரி புத்தகத்தில் மட்டும் தேட வேண்டுமா என "
 "நிர்ணயிக்கிறது. ."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "இந்த தேர்வு கொண்டு வரும் வேகத்தை அதிகப்படுத்தும்."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13602,7 +13958,7 @@ msgstr ""
 "முன்னிருப்பு செய்திகள் பட்டியல் காட்சியில் காட்டும் முகவரிகள் எண்ணிக்கை. அதற்கு பின் '...' "
 "என காட்டப்படும். "
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13610,7 +13966,7 @@ msgstr ""
 "இந்த தேர்வு முன்னிருப்பாக இழைகள் விரிவாக்கப்பட வேண்டுமா அல்லது குறுக்கப்பட வேண்டுமா என "
 "குறிக்கிறது. எவல்யூஷன் ஐ மீள் துவக்க வேண்டும்."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13619,129 +13975,131 @@ msgstr ""
 "இந்த தேர்வு முன்னிருப்பாக இழைகள் தேதியை விடுத்து சமீபத்திய செய்தி முதலில் என்ற "
 "அடிப்படையில் காட்டப்பட வேண்டுமா என  குறிக்கிறது. எவல்யூஷன் ஐ மீள் துவக்க வேண்டும்."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "செய்தி பட்டியலின் இழையை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "செய்தி பட்டியலின் இழையை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "செய்தி பட்டியலின் இழையை தலைப்பின் படி அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "செய்தியை பார்க்கப்பட்டதாக மாற்ற செலவாகும் நேரத்தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "செய்தியை பார்க்கப்பட்டதாக மாற்ற செலவாகும் நேரத்தை அமை"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "இயல்பான சரத்தின் UID"
 
-#: ../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 "உள்ளமை எழுத்து திருத்தி பயனாகும்போது பிழையான சொற்களுக்கு அடிக்கோடு நிறம்."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "ஸ்பாம் அஸாஸின் கிங்கரன் மற்றும் சார்ந்தோன் ஐ பயன்படுத்து."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ஸ்பாம் அஸாஸின் கிங்கரன் மற்றும் சார்ந்தோன் (spamc/spamd) ஐ பயன்படுத்து."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "தனிப்பயன் எழுதுருவை பயன்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "மின்னஞ்சலை காட்ட தனிப்பயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "தனி ஸ்பாம் சோதனையை பயன்படுத்து"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "தனி ஸ்பாம் சோதனையை பயன்படுத்து(no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "பக்கங்களில் அல்லது அகல அமைப்பில் பயன்படுத்தவும்"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "மாறி அகல எழுத்துரு"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "பார்/மறைநகல் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "பார்/மறைநகல் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "பார்/கரிநகல் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "பார்/கரிநகல் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "பார்/பெருநர் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "பார்/பெருநர் மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "பார்/இவருக்கு அனுப்பு மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "பார்/இவருக்கு அனுப்பு மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "பார்/பதிலலி அனுப்பு மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "பார்/பதிலலி அனுப்பு மெனு உருப்படி தேர்வு செய்யப்பட்டது"
 
-#: ../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 " படித்ததாக சான்று கேட்பது ஒவ்வொரு செய்திக்கும் முன்னிருப்பாக சேர்க்க வேண்டுமா   ."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+#| msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "கிளை பார்வையில் அடைவு பெயர்களை அடத்து காட்டுவ செயல் நீக்க வேண்டுமா."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "பதிலளி தலைப்பு இல்லையெனில் தலைப்புகள் இழையாக்கப்ப்டுவதை தவிர்க்கவும்."
 
-#: ../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 "இழையில் சமீபத்திய செய்தி முதலில் என்ற அடிப்படையில் அடுக்க வேண்டுமா"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "செய்திகள் பட்டியல் பலகத்தின் அகலம் "
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "செய்தி-பட்டியல் பலகத்தில் அகலம்."
 
@@ -13773,16 +14131,16 @@ msgstr "பெர்க்கேலே அஞ்சல் பெட்டி (mb
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "இறக்கி பெர்கேலே அஞ்சல் பெட்டி வடிவ அடைவுகள்"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "மின்னஞ்சல் பெட்டியை ஏற்றவும்"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ஏற்றுகிறது"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "`%s' வருடுகிறது"
@@ -13799,180 +14157,118 @@ msgstr "எவல்யூஷன் பைன் ஏற்றி"
 msgid "Import mail from Pine."
 msgstr "Pine லிருந்து அஞ்சலை இறக்கு."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "%s பெறுரநர்"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "%s மின்னஞ்சல் அனுப்பியவர்"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "%s தலைப்பு"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s மின்னஞ்சல் பட்டியல்"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "வடிகட்டி விதிமுறையை சேர்"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:519
-#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "வார்ப்புரு"
-
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d தேர்ந்தெடுக்கப்பட்டது, "
 msgstr[1] " %d தேர்ந்தெடுக்கப்பட்டது, "
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d நீக்கப்பட்டது"
 msgstr[1] "%d நீக்கப்பட்டது"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d குப்பை"
 msgstr[1] "%d குப்பை"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ஆவணம்"
 msgstr[1] "%d ஆவணம்"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d அனுப்பப்பட்டது"
 msgstr[1] "%d அனுப்பப்பட்டது"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d அனுப்பப்படவில்லை"
 msgstr[1] "%d அனுப்பப்படவில்லை"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d படிக்காதது"
 msgstr[1] "%d படிக்காதது"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d மொத்தம்"
 msgstr[1] "%d மொத்தம்"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "புதிய மின்னஞ்சல் செய்தி"
 
 # msgctxt "New"
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "மின்னஞ்சல் செய்தி (_M)"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "புதிய மின்னஞ்சல் செய்தியை தொகு"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "புதிய மின்னஞ்சல் அடைவு"
 
 # msgctxt "New"
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "மின்னஞ்சல் அடைவு (_F)"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "புதிய மின்னஞ்சல் அடைவை உருவாக்கு"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "மின்னஞ்சல் அமைப்புகள் அடைவை மேம்படுத்துதல் தோல்வியுற்றது"
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "பிழை"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "தவறுகள்"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "எச்சரிக்கைகள் மற்றும் தவறுகள்"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "பிழை நீக்கு"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "பிழை எச்சரிக்கைகள் மற்றும் பிழை நீக்கு செய்திகள்"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "பிழை நீக்கு பதிவு"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "(_e) இதற்கு நிலைப்பட்டியில் பிழைகளை காட்டு"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "வினாடி(கள்)"
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "பதிவு செய்திகள்"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "உள்நுழை நிலை"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "நேரம்"
-
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "செய்திகள்"
-
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "இந்த சாளரத்தை மூடவும்"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "(_e)ஆதரவுள்ள வகைகளை சோதிக்கவும்"
@@ -14200,7 +14496,7 @@ msgstr ""
 "இனி நீங்கள் எவல்யூஷனை பயன்படுத்தி மின்னஞ்சலை\n"
 "அனுப்ப பெற முடியும்\n"
 "\n"
-"\"செயல்படுத்து\" என்பதை க்ளிக் செய்து சேமிக்கவும்"
+"\"Apply\" என்பதை க்ளிக் செய்து சேமிக்கவும்"
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
@@ -14251,126 +14547,128 @@ msgid "Empty trash folders on e_xit"
 msgstr "(_x)வெளியேறும் போது குப்பை தொட்டி அடைவை காலி செய்"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+#, fuzzy
+#| msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
 msgstr "மாய வெற்று இட விசையை செயல்படுத்து "
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "(_r) அடைவுகள் தேடலை செயலாக்கு."
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "(_p)குறிமுறையாக்க சான்றிதழ்:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "வெளி செல்லும் செய்திகளை குறிமுறையாக்கு(முன்னிருப்பாக) (_g)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "(_x)நிலையான அகலம்:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "_ந நிலையான அகல எழுத்துரு:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "எழுத்துரு பண்புகள்"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "(_H)செய்திகளை HTML மின்னஞ்சலாக அமை"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "முழுப் பெயர்: (_e)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "ஹெச் டிஎம் எல் செய்திகள்"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "(_T)ஹெச்டிடிபி பதிலாள்:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "தலைப்புகள்"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "(_q)குறிப்பிட்டவைகலை தனிப்படுத்தி காட்டு"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "உள்ளே"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "மூல செய்திகள் உரையில் (அவுட்லுக் போல)"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "விளக்கச்சீட்டுகள்"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "மொழிகள் அட்டவணை"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "மின்னஞ்சல் அமைப்பு"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "அஞ்சல் தலைப்புகள் அட்டவணை"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "மின்னஞ்சல் பெட்டி இருக்குமிடம்"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "செய்தி தொகுப்பி"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "(_P) பதிலாள் இல்லை இதற்கு:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "குறிப்பு: பட்டியில் அடையாள காட்டி  பெயர் அடிக்கோடு இட்டு இருப்பின் அது நினைவு கொள் "
 "குறியாக கருதப்படும்."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "குறிப்பு: முதல் முறை இணைக்கப்படும் போது கடவுச்சொல் கேட்கும்."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "தனிப்பயன் குப்பை தலைப்பு இருப்பின் தேர்வு உதாசீனப்படுத்தப்படும்.."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "(_g)நிறுவனம்:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG (_K)விசை அடையாளம்:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "(_w)கடவுச்சொல்:"
 
-#: ../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."
@@ -14378,7 +14676,7 @@ msgstr ""
 "தயவு செய்து இந்த கணக்குக்கு கீழுள்ள இடைவெளியில் விவரமான பெயரை\n"
 " உள்ளிடுக. இது காட்டுவதற்கு மட்டும் பயன்படும்."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14386,131 +14684,143 @@ msgstr ""
 "நீங்கள் மின்னஞ்சல் அனுப்ப விரும்பும் முறையை உள்ளிடவும்தெரியவில்லை என்றால் உங்கள் கணினி "
 "மேலாளரை கேட்கவும்."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"கீழே உங்கள் பெயர் மற்றும் மின்னஞ்சல் முகவரியை உள்ளிடவும்.  \"அவசியமற்றl\" புலங்கள் பூர்த்தி "
+"கீழே உங்கள் பெயர் மற்றும் மின்னஞ்சல் முகவரியை உள்ளிடவும்.  \"optional\" புலங்கள் பூர்த்தி "
 "செய்ய தேவையில்லை.விருப்பப்பட்டால் உங்கள் மின்னஞ்சலோடு செல்லவேண்டிய தகவல்களை பூர்த்தி "
 "செய்யவும்."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "கீழுள்ள தேர்வுகளை ஒன்றை தேர்வு செய்யவும்"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "துறை:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "(_o)கரிநகலாக மட்டும் மின்னஞ்சல் அனுப்பபடும் போது நினைவூட்டு"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "குறிப்பிடப்பட்ட"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "(_m)கடவுச்சொல்லை நினைவில் கொள்"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "(_p)பதில் தருக:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "(_p)கடவுச்சொல்லை நினைவில் கொள்"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "(_O) சாக்ஸ் வழங்கி:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "(_e) உள்ளமை முகவரி புத்தகங்களில் மட்டும் அனுப்புனர் படத்தை தேடுக"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "தேர்ந்தெடு... (_e)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "செய்திகள் கிடைத்த தகவலை அனுப்புக"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "(_t)நிலையான எழுத்துரு"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Drafts Folder"
+msgstr "அடைவை தேர்வு செய்"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML நிலையான அகலமுள்ள எழுத்துருவை தேர்வு செய்"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML நிலையான அகலமுள்ள எழுத்துருவை அச்சடிப்பதற்காக தேர்வு செய்"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "HTML அகலம் மாறும் எழுத்துருவை தேர்வு செய்"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "HTML அகலம் மாறும் எழுத்துருவை அச்சடிப்பதற்காக தேர்வு செய்"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Sent Folder"
+msgstr "அடைவை தேர்வு செய்"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "மின்னஞ்சல் அனுப்புகிறது"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "(_M)அனுப்பப்பட்ட செய்தி உள்ள அடைவு:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "(_v)சேவகனை அணுக அனுமதி தேவை"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "(_T)சேவகன் வகை:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "கையொப்பமிடுகிற சான்றிதழ்: (_n)"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "(_u)கையொப்பம்"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "கையொப்பம்"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "கையொப்பங்கள் அட்டவணை"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "எழுத்து பிழை திருத்தம்"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "(_t) பதில் உள்ளிடும்போது கீழிருந்து  துவக்கு "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "(_y)வகை"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "நீங்கள் நிறுவியுள்ள அகராதி மொழிகள் மட்டுமே இங்கு  பட்டியல் இடப்பட்டன."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14520,34 +14830,32 @@ msgstr ""
 "கையொப்பமாக கொள்ளப்படும். இதில் குறிப்பிடும் பெயர்\n"
 "உங்கள் பெயராக காட்டப்படும்."
 
-#: ../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 ""
-"இந்த கணக்குக்கு என்ன பெயரிடவிருப்புகிறீர்கள் என்பதை உள்ளிடவும் உதாரணமாக \"வேலை\" அல்லது "
-"\"தனிப்பட்ட\""
+msgstr "இந்த கணக்குக்கு என்ன பெயரிட விருப்புகிறீர்கள் என்பதை உள்ளிடவும் உதாரணமாக \"Work\" அல்லது \"Personal\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "(_e)பயனீட்டாளர் பெயர்"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "உண்மைபடுத்தலை பயன்செய்"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "(_n)பயனீட்டாளர் பெயர்"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "(_a)மாற்று-அகலம்"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14555,126 +14863,126 @@ msgid ""
 msgstr ""
 "எவல்யூஷன் மின்னஞ்சல் அமைப்பு உதவி உங்களை வரவேற்கிறது\n"
 "\n"
-"\"அடுத்து\" என்பதை க்ளிக் செய்து துவங்கவும்."
+"\"Forward\" என்பதை க்ளிக் செய்து துவங்கவும்."
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "(_A)கையொப்பத்தை சேர்"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "(_A)இணையத்திலிருந்து படங்களை பெற்றுக்கொள்"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "(_A) தானியங்கி பதிலாள் உரல் அமைப்பு:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "முன்னிருப்பு எரித சொருகுப்பொருள்:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "(_D) இணையத்துக்கு நேரடி இணைப்பு"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "சந்திப்பு பற்றிய கோரிக்கைக்கு கையொப்பம் தேவை இல்லை(அவுட்லுக்கில் வேலை செய்வதற்காக) (_D)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "(_F)முன் அனுப்பும் பாணி:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "பதில் எழுதும் போது கையெழுத்தை மூல செய்திக்கு மேலே வைக்கவும்"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "தொடர்புகளிலிருந்து அஞ்சலுக்கு படங்களை ஏற்று (_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "(_L) உள் முகவரி புத்தக த்தில் மட்டும் தேடு"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "(_M)இதை இயல்பான கணக்காக குறிக்கவும்"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "(_M) கைமுறை பதிலாள் அமைப்பு"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "(_M) பிறகு படி என குறிக்கவும்"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "(_N)எப்போதும் இணையத்திலிருந்து படங்களை ஏற்றாதே"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "(_P)பாதை"
 
-#: ../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 " HTML தேவை இல்லை என்போருக்கு HTML செய்திகளை அனுப்பும் போது  நினைவூட்டு (_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "(_P)தலைப்பில்லாமல் செய்தி அனுப்பினால் நினைவூட்டு"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "(_R)பதில் பாணி:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "(_S)சிறுநிரல்:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "(_S) பாதுகாப்பான ஹெச்டிடிபி பதிலாள்:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "தேர்ந்தெடு... (_S)"
 
 #. 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 "இயங்கு படத்தை காட்டு (_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "(_S) மின்னஞ்சல் முன்பார்வையில் அனுப்புனர் படத்தைக் காட்டு"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "அனுப்புநர் / நகல் / மறைநகல் தலைப்புகளை இங்கு இணைக்கவும் (_S)"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "பாதுகாப்பான இணைப்பை பயன்படுத்து: (_U)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "(_U)கணினி இயல்பானதை பயன்படுத்து"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "(_U)மற்ற பயன்பாடுகள் பயன்படுத்தும் எழுத்துருவையே பயன்படுத்து"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "முகவரிகள்"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "நிறம்"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "விளக்கம்"
 
@@ -14722,7 +15030,7 @@ msgstr "தேடு: (_i)"
 msgid "Find in Message"
 msgstr "செய்தியில் கண்டுபிடி"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "தொடர்வதற்காக குறியிடு"
 
@@ -14756,7 +15064,7 @@ msgid ""
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "தொடந்து கவனிப்பதற்காக நீங்கள் தேர்வு செய்த செய்தி பட்டியலிடப்பட்டுள்ளது\n"
-"\"குறி\" பட்டிலிருந்து தொடர் தேர்வை தேர்வு செய்யவும்"
+"\"Flag\" பட்டிலிருந்து தொடர் தேர்வை தேர்வு செய்யவும்"
 
 #: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
@@ -14774,26 +15082,26 @@ msgstr "(_F)குறி:"
 msgid "_Tick this to accept the license agreement"
 msgstr "ஒப்பந்த பத்திரத்தை ஏற்க இங்கு சொடுக்கவும்"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "தொடர்புகொள்கிறது %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "தேர்ந்தெடுக்கப்பட்டது செய்திகளை வடிக்கிறது"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "மின்னஞ்சலை கொணர்கிறது"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "வெளிசெல்லும் வடிகட்டிக்கு அனுப்புவதில் தோல்வி : %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14802,123 +15110,123 @@ msgstr ""
 "பினெழுதுவதில் தோல்வி %s: %s\n"
 "உள் 'அனுப்பு' அடைவில் போய் சேர்ந்துவிட்டது."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "உள் 'அனுப்பு' அடைவில் சேர்க்கும் போது தோல்வி : %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "செய்தி அனுப்புகிறது"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d இல் %d அனுப்பப்படுகிறது"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d இல் %d செய்தி அனுப்புவதில் தோல்வி"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "ரத்து செய்யப்பட்டது."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "முடிந்தது"
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "செய்தியை அடைவில் சேமிக்கிறது"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s க்கு செய்தியை நகர்த்துகிறது"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s இல் செய்தியை நகலெடுக்கிறது"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "செய்தியை முன் அனுப்புகிறது"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "அடைவை திறக்கிறது %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "அடைவு %sக்கு ஒதுக்கீடு  தகவல் வாங்குகிறது"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "கிடங்கை திறக்கிறது %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "அடைவை நீக்குகிறது %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "அடைவை சேமிக்கிறது  '%s'"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "கணக்கை சேர்க்கிறது மற்றும் அழிக்கிறது '%s'"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "கணக்கை சேர்க்கிறது '%s'"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "அடைவை புதுப்பிக்கிறது"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "அடைவை அழிக்கிறது"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "குப்பைதொட்டியை காலி செய்கிறது '%s'"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "உள் அடைவுகள்"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "செய்திகளை மீட்கிறது %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d செய்திகளை மீட்கிறது"
 msgstr[1] "%d செய்திகளை மீட்கிறது"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d செய்தியை சேமிக்கிறது"
 msgstr[1] "%d செய்திகளை சேமிக்கிறது"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14927,11 +15235,11 @@ msgstr ""
 "செய்தியை சேமிக்கும் போது பிழை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "இணைப்பை சேமிக்கிறது"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14940,27 +15248,27 @@ msgstr ""
 "விளைவுக்கோப்பை உருவாக்க முடியவில்லை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "தகவலை எழுத முடியவில்லை: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s லிருந்து துண்டிக்கப்படுகிறது"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s இல் மீண்டும் இணைக்கப்படுகிறது"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s'  கணக்குக்கு தொடர்பில்லாத நிலைக்கு தயாராகிறது "
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "சேவைகளை சோதிக்கிறது"
 
@@ -14976,39 +15284,39 @@ msgstr "மின்னஞ்சலை அனுப்பு & பெற்ற�
 msgid "Cancel _All"
 msgstr "(_A)அனைத்தையும் ரத்து செய்"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "மேம்படுத்துகிறது..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "காத்திருக்கிறது...."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "புதிய மின்னஞ்சலுக்காக சரிபார்க்கிறது"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s க்கான கடவுச்சொற்களை உள்ளிடவும்"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "கடவுச்சொற்களை உள்ளிடவும்"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s க்கான கடவுச்சொல்லை தேர்வு செய்யவும்"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "கடவுச்சொல்லை உள்ளிடவும்"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "செயலை பயனீட்டாளர் ரத்து செய்துவிட்டார்"
 
@@ -15053,21 +15361,21 @@ msgstr "செல்லாத அடைவு`%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "தேடு அடைவுகளை அமைக்கிறது :%s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s க்கான தேடு அடைவுகளை மேம்படுத்துகிறது:%s'"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr " '%s' க்கான  தேடு அடைவுகளை ஏற்றுகிறது"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "தேடு அடைவை தொகு"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "புதிய தேடல் அடைவு"
 
@@ -15660,79 +15968,79 @@ msgstr "(_E)அழிக்கவும்"
 msgid "_Open Messages"
 msgstr "செய்திகளை திற (_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "பார்க்காத"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "பார்த்த"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "பதிலலிக்கப்பட்டது"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "மேலனுப்பப்பட்டது"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "பார்காத பல செய்திகள்"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "பல செய்திகள்"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "குறைவான"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "குறைந்த"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "உயர்ந்த"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "உயரமான"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "இன்று %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "நேற்று %b %d %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "செய்தி பட்டியலை உருவாக்குகிறது"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15740,7 +16048,7 @@ msgstr ""
 "உங்கள் தேடல் குறிப்புகளுக்கு ஏற்ற செய்தி ஏதும் இல்லை. தேடலை Search->Clear menu item "
 "கட்டளையால் நிறுத்து.  அல்லது அதை மாற்றுக."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "இந்த அடைவில் எந்த செய்தியும் இல்லை."
 
@@ -15773,39 +16081,45 @@ msgstr "செய்திகளை அனுப்புக"
 msgid "Size"
 msgstr "அளவு"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+#| msgid "_Subject Field"
+msgid "Subject - Trimmed"
+msgstr "(_S) பொருள் புலம்"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "அழை"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "அனுப்பாதே"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "தொடரவேண்டும்"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "உங்கள் தகவலுக்காக"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "அனுப்பு"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "பதில் தேவை இல்லை"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "பதில்"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "அனைவருக்கும் பதிலளி"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "மீள்பார்வை"
 
@@ -15857,8 +16171,8 @@ msgid ""
 "body."
 msgstr "இணைப்பு நினைவுறுத்தி சொருகிக்கு செய்தியின் உடலில் தேட சாடைகளின் பட்டியல்"
 
-#: ../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 "திறவுச் சொற்கள்"
 
@@ -15890,9 +16204,13 @@ msgid "_Edit Message"
 msgstr "செய்தி திருத்து (_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid ""
+#| "A formatter plugin which displays audio attachments inline and allows you "
+#| "to play them directly from evolution."
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "ஒரு ஒழுங்குபடுத்தி சொருகுப்பொருள், ஒலி இணைப்புகளை காட்டுவதுடன் எவலூஷனிலிருந்து "
 "நேரடியாக இசைக்கவும் அனுமதிக்கிறது."
@@ -16113,35 +16431,35 @@ msgstr "அமைப்புகளை மீட்டெடு..."
 msgid "_Backup Settings..."
 msgstr "அமைப்புகளளை காப்பு எடு..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "தானியக்க தொடர்புகள்"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "(_A) அஞ்சலுக்கு பதில் தருகையில் தானாகவே முகவரிப்புத்தகத்தில் உள்ளிடுகிறது."
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr " தானியங்கி தொடர்புகள் க்கு முகவரிப்புத்தகம் தேர்ந்தெடு"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "உடனடி செய்தி தொடர்புகள்"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "பிட்ஜின் நண்பர் பட்டியல் இலிருந்து தொடர்பு தகவல் மற்றும் பிம்பங்களை  ஒத்திசைக்கவும்."
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "பிட்ஜின் அரட்டையாளர் பட்டியலுக்கு முகவரி புத்தகத்தை தேர்ந்தெடுக்கவும்"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "அரட்டையாளர் பட்டியலில் இப்போது ஒருங்கிணைக்கவும் (_b)"
 
@@ -16159,27 +16477,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%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 "போகோ வடிப்பி சேய் செயல் பதிலளிக்கவில்லை. முடிக்கிறது..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "போகோ வடிப்பி சேய் செயலுக்கு காத்திருப்பு மறிக்கப்பட்டது.  நிறுத்துகிறது... "
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "போகோ வடிப்பிக்கு பைப் தர இயலவில்லை. தவறு குறிப்பு : %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 "_U உரையை யூனிக்கோடுக்கு மாற்றுக"
 
@@ -16207,21 +16525,31 @@ msgstr "போகோவடிகட்டி குப்பை செருக�
 msgid "Filters junk messages using Bogofilter."
 msgstr "போகோ வடிப்பியை பயன்படுத்தி எரித செய்திகளை நீக்குகிறது."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_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 "SSL பயன்படுத்து (_S)"
 
+#. 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 "(_f) புதுப்பி:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV நாள்காட்டி மூலங்கள்"
@@ -16238,13 +16566,6 @@ msgstr "வட்டார நாள்காட்டிகள்"
 msgid "Provides core functionality for local calendars."
 msgstr "உள்ளமை நாள்காட்டிகளுக்கு கோர் செயல்பாட்டினை கொடுக்கிறது."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "(_f) புதுப்பி:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "பாதுகாப்பான இணைப்பு (_S)"
@@ -16261,48 +16582,63 @@ msgstr "ஹெச்டிடிபி நாள்காட்டிகள்"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "webcal மற்றும் ஹெச்டிடிபி நாள்காட்டிகளுக்கு கோர் செயல்பாடுகளை கொடுக்கிறது."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "வானிலை: மேக மூட்டம்"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "வானிலை: பனி"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "வானிலை: பகுதி மேக மூட்டம்"
+msgid "Weather: Cloudy"
+msgstr "வானிலை: மேக மூட்டம்"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "வானிலை: மழை"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "வானிலை: மேக மூட்டம்"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "வானிலை: மழை"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "வானிலை: பனிகட்டி"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "வானிலை: பனிகட்டி"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "வானிலை: வெயில்"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Weather: Clear Night"
+msgstr "வானிலை நாள்காட்டிகள்"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "வானிலை: இடி மழை"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "ஒரு இடத்தை தேர்ந்தெடு"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "அலகுகள்: (_U)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "மெட்ரிக் (செல்சியஸ், செமீ, மற்றும் பல)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "இம்பீரியல் (ஃபாரன்ஹீட், அங்குலம், மற்றும் பல)"
 
@@ -16349,7 +16685,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "எவல்யூஷனை உங்கள் முன்னிருப்பு மின்னஞ்சல் கிளையனாக வைக்க வேண்டும்?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "எவல்யூஷன்"
 
@@ -16388,7 +16724,7 @@ msgid "Key"
 msgstr "விசை"
 
 #: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "மதிப்புக்கள்"
 
@@ -16428,6 +16764,11 @@ msgstr ""
 "தலைப்புக்கும் தலைப்பு மதிப்புக்கும் குறிக்கும் ஒழுங்கு :\n"
 "தனிப்பயன் தலைப்பின் பெயர், அதன் பின் \"=\" . இதன் மதிப்புகள்  \";\" ஆல் பிரிக்கப்படும்  "
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "மற்ற பயனர்களின் அடைவினை திற"
@@ -16445,12 +16786,12 @@ msgid "_User:"
 msgstr "பயனர்: (_U)"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "பாதுகாப்பான கடவுச்சொல்"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16458,21 +16799,21 @@ msgstr ""
 "இந்த விருப்பம் பாதுகாப்பான கடவுச்சொல் (NTLM) அங்கீகாரத்தை பயன்படுத்துப் பரிமாற்று "
 "சேவையத்தை இணைக்கும்."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "வெற்றுஉரை கடவுச்சொல்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "இந்த தேர்வு IMAP சேவகனை சாதாரண உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கும்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "அலுவலகத்திற்கு வெளியில்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16480,88 +16821,94 @@ msgstr ""
 "கீழே உள்ள செய்தி தானாக அனைவருக்கும் அனுப்பப்படும்\n"
 "நீங்கள் அலுவலகத்தில் இல்லாத போது அதை அறிவிக்கும்."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "நான் தற்போது அலுவலகத்தில் இல்லை"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "நான் தற்போது அலுவலகத்தில் இருக்கிறேன்"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "பரிமாற்று கணக்கிற்கு கடவுச்சொல்லை மாற்று"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "கடவுச்சொல்லை மாற்றவும்"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "பரிமாற்று கணக்கிற்கு பேராளர் அமைவுகளை மேலாண்மை செய்யவும்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "பிரதிநிதி உதவியாள்"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "மற்றவை"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "அனைத்து பரிமாற்று அடைவுகளின் அளவினை பார்க்கவும்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "அடைவுகள் அளவு"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "பரிமாற்று அமைவுகள்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "அங்கீகாரம் (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+#| msgid "Specify _filename:"
+msgid "S_pecify the mailbox name"
+msgstr "(_f)கோப்பின் பெயரை உள்ளிடவும்"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "(_M)அஞ்சல்பெட்டி"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "(_A) அங்கீகார வகை"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "துணையாக உள்ள வகைகளை சரிபார்"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c: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."
@@ -16603,32 +16950,32 @@ msgstr "உங்கள் தற்போதைய கடவுச்சொல�
 msgid "Your password will expire in the next %d days"
 msgstr "உங்கள் கடவுச்சொல் அடுத்த %d நாட்களில் முடிவுறும்"
 
-#: ../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 "தனிபயன்"
 
-#: ../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 "தொகுப்பி (read, create, edit)"
 
-#: ../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 "ஆசிரியர் (read, create)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "திருத்தியவர்(படிக்க-மட்டும்)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "பேராளர் அனுமதிகள்"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16637,7 +16984,7 @@ msgstr "%sக்கு அனுமதி"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16648,25 +16995,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "உங்களுக்கு என் அடைவுகளில் கீழ் கண்ட  அனுமதிகள் தரப்பட்டுள்ளன."
 
 #. 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 "நீங்கள் என் அந்தரங்க விஷயங்களையும் காண அனுமதிக்கப்படுகிறீர்கள்."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "ஆனால் என் அந்தரங்க விஷயங்களை காண அனுமதிக்கப்படவில்லை."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "நீங்கள் %s க்கு பிரதிநிதியாக நியமிக்கப்படுள்ளீர்கள்."
@@ -16806,9 +17153,9 @@ msgid ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
-"<b>தற்போது உங்கள் நிலை \"அலுவலகத்தில் இல்லை\". </b>\n"
+"<b>தற்போது உங்கள் நிலை \"Out of the Office\". </b>\n"
 "\n"
-"நிலையை \"அலுவகத்தில்\" என மாற்ற விருப்பமா? "
+"நிலையை \"In the Office\" என மாற்ற விருப்பமா? "
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
@@ -16869,8 +17216,8 @@ msgstr "பயனரை சேர்:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "பயனரை சேர்"
 
@@ -17017,18 +17364,22 @@ msgid "Exchange Operations"
 msgstr "பரிமாற்று செயல்பாடுகள்"
 
 #: ../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 "கட்டமைப்பு சிக்கல்களால் கடவுச்சொல்லை மாற்ற முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "அடைவுகளை காட்ட முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "செயலை செய்ய இயலவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17036,15 +17387,15 @@ msgstr ""
 "பரிமாற்ற கணக்கு \"{0}\"  க்கு விருப்பங்கள் மாற்றங்கள் எவல்யூஷன் மறு துவங்கிய பின்தான் "
 "செயலுக்கு வரும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "சேவையகத்திற்கு அங்கீகாரமளிக்க முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "கடவுச்சொல்லை மாற்ற முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17054,59 +17405,59 @@ msgstr ""
 "செய்ய முடியவில்லை. URL , பயனர் பெயர் மற்றும் \n"
 "கடவுச்சொல் ஆகியவற்றை சரிபார்க்கவும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "பரிமாற்று சேவையகத்துடன் இணைக்க முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "சேவையகம் {0} ஐ இணைக்க முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "பேராளர்களுக்கு அடைவு அனுமதிகளை குறிப்பிட முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "பரிமாற்று இணைய சேமிப்பு அமைப்பினை காண முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "சேவையகம் {0}ஐ காண முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "{0} ஐ ஒரு பேராளாராக்க முடியாது"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "அடைவு அனுமதிகளை படிக்க முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "அடைவு அனுமதிகளை படிக்க முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "அலுவலகத்திற்கு வெளியே நிலையை படிக்க முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "அடைவு அனுமதிகளை மேம்படுத்த முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "அலுவலகத்திற்கு வெளியே நிலையை மேம்படுத்த முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr "சந்தாதாரரின் அஞ்சல் பெட்டியை ஏற்ற  எவல்யூஷன்  மீள்துவக்கப்பட வேண்டும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "பரிமாற்று கணக்கு இணைப்பில் இல்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17134,102 +17485,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "பேராளர்கள் மேம்படுத்த முடியவில்லை:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "அடைவு ஏற்கனவே உள்ளது"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "அடைவு இல்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "அடைவு இணைப்பில்லாமல்"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "புதுவான பிழை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog Server ஐ காண முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr "வேறு தடத்தில் OWA ஒடுகிறது எனில் அதை கணக்கு வடிவமைப்பு  உரையாடலில் குறிப்பிட வேண்டும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} க்கான அஞ்சல்பெட்டி இந்த வழங்கனில் இல்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "URL சரியா என பார்த்து மீண்டும் முயற்சி செய்க."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "வழங்கன் பெயர் சரியாக உள்ளிடப்பட்டதா என பார்த்து மீண்டும் முயற்சி செய்க."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "பயனர் பெயர் மற்றும் கடவுச்சொல் சரியா என பார்த்து மீண்டும் முயற்சி செய்க."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "முழுமையான அட்டவணை வழங்கன் இந்த கணக்குக்கு வடிவமைக்க இல்லை "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "{1}ல் பயனர் {0}க்கு அஞ்சல் பெட்டி இல்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "இதுபோன்ற பயனர் இல்லை {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "கடவுச்சொல் வெற்றிகரமாக மாற்றப்பட்டது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "தயவு செய்து பிரதிநிதி அடையாளத்தை உள்ளிடுக அல்லது பிரதிநிதி அனுப்பு தேர்வை நீக்குக"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "தயவு செய்து முழுமையான அட்டவணை சேவையகம் பெயர் சரியா என சோதிக்கவும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "மாற்றங்கள் செயல்பட தயவு செய்து எவல்யூஷன் ஐ மீள் துவக்குக"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "ஒரு பயனரை தேர்வு செய்யவும்"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "சேவையகம் கடவுச்சொல் ஐ மிக பலஹீனமாக உள்ளதாக நிராகரித்து விட்டது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "எவல்யூஷன் ஐ விட்டு வெளியேறிய பின் பரிமாற்றம் கணக்கு முடக்கப்படும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "எவல்யூஷன் ஐ விட்டு வெளியேறிய பின் பரிமாற்றம் கணக்கு நீக்கப்படும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "பரிமாற்றம் வழங்கன்  பரிமாற்றம் இணைப்பி யுடன் ஒத்திசையவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17237,7 +17588,7 @@ msgstr ""
 "வழங்கன் இல் எக்ஸேஞ்ச் 5.5 ஒடுகிறது. பரிமாற்றம் இணைப்பி மைக்ரோஸாப்ட் எக்ஸேஞ்ச் 2000 மற்றும் "
 "2003 ஐ மட்டுமே ஆதரிக்கிறது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17251,70 +17602,70 @@ msgstr ""
 "\n"
 "அல்லது நீங்கள் கடவுச்சொல்லை தவறாக உள்ளிட்டு இருக்கலாம்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "வேறு கடவுச்சொல்லில் மீண்டும் முயற்சி செய்யவும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "அணுகல் கட்டுப்பாடு பட்டியலில் பயனரை சேர்க்க முடியவில்லை:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "பேராளர்களை தொகுக்க முடியவில்லை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "தெரியாத பிழையை தேடுகிறது {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "தெரியாத பிழை."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "தெரியாத வகை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "துணையில்லாத செயல்பாடு"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "நீங்கள் இந்த வழங்கனில் அஞ்சல் சேமிக்க இட ஒதுக்கீட்டு வரம்பை நெருங்குகிறீர்கள்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "நீங்கள் ஒரே நேரத்தில் ஒருவருக்கு மட்டுமே பிரதிநிதியாக செய்தி அனுப்பு இயலும்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "நீங்கள் உங்களை சொந்த பேராளராக ஆக்க முடியாது"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "நீங்கள் இந்த வழங்கனில் அஞ்சல் சேமிக்க இட ஒதுக்கீட்டு வரம்பை தாண்டி விட்டீர்கள்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "நீங்கள் ஒரு ஒற்றை பரிமாற்று கணக்கிற்கு மட்டும் கட்டமைக்கலாம்."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "உங்கள் இப்போதைய பயன்பாடு : {0} KB. சில அஞ்சல்களை நீக்கி இடம் காலி செய்ய  முயற்சி செய்க."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "உங்கள் இப்போதைய பயன்பாடு : {0} KB. நீங்கள் அஞ்சலை அனுப்பவோ பெறவோ இயலாது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17322,19 +17673,19 @@ msgstr ""
 "உங்கள் இப்போதைய பயன்பாடு : {0} KB. நீங்கள் அஞ்சல் சிலவற்றை நீக்கி துப்புரவாக்கும்  வரை  "
 "அஞ்சல் அனுப்ப இயலாது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "உங்கள் கடவுச்சொல் முடிவுற்றது."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} அணுகல் கட்டுப்பாடு பட்டியலில் சேர்க்க முடியவில்லை"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} ஏற்கனவே ஒரு பேராளர்"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} ஏற்கனவே பட்டியலில் உள்ளது"
 
@@ -17439,7 +17790,10 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "அடைவு \"%s\"லிருந்து சந்தா நீக்குகிறது"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+#, fuzzy
+#| msgid ""
+#| "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr "கிளை பட்டி.யில் அஞ்சல் அடைவுகளுக்கு சந்தா நீக்குவதை அனுமதிக்கிறது."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
@@ -17452,22 +17806,18 @@ msgstr "(_U)உறுப்பினர் நீக்கம்"
 
 #: ../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 "கூகுள்"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "தயவு செய்து பயனர்  பெயரை உள்ளிடவும்"
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "பயனர் %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"
@@ -17476,21 +17826,23 @@ msgstr ""
 "கூகுள் சேவையகத்திலிருந்து தரவை படிக்க இயலவில்லை\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "நாள்காட்டி:(_C):"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "பட்டியலை பெறு "
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>சேவையகம்</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+#, fuzzy
+#| msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "கூகுள் நாள்காட்டி மற்றும் தொடர்புகளை அமைக்க ஒரு சொருகுப்பொருள் "
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17502,14 +17854,18 @@ msgid "Checklist"
 msgstr "சோதனை பட்டியல்"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+#| msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "க்ரூப்வைஸ் நாள்காட்டி மற்றும் தொடர்பு மூலங்களை அமைக்க ஒரு சொருகுப்பொருள் "
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+#| msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "குழு வாரியான கணக்கு அமைவு"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17534,11 +17890,11 @@ msgstr ""
 "பகிர்ந்த அடைவை நிறுவ 'Forward' ஐ சொடுக்கவும்.\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "பகிர்ந்த அடைவை நிறுவுக."
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "பகிர்ந்த அடைவு நிறுவல்"
 
@@ -17564,7 +17920,7 @@ msgid "Email:"
 msgstr "மின்னஞ்சல்:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "செயல் நீக்கு (_D)"
 
@@ -17597,15 +17953,21 @@ msgid "Retract Mail"
 msgstr "பின் வாங்கப்பட்ட அஞ்சல்"
 
 #: ../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"
+msgid "Add Send Options to GroupWise messages"
 msgstr "குழுவாரியான செய்திகளுக்கு அனுப்பு விருப்பங்களை சேர்க்கவும்"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "க்ரூப்வைஸ் கணக்குகளின் சிறப்பு அம்சங்களுக்கு ஒரு  சொருகுப்பொருள்"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+#| msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "குழு வாரியான சிறப்பியல்புகள்"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17622,20 +17984,23 @@ msgstr "தேர்ந்தெடுக்கப்பட்ட செய்�
 msgid "Invalid user"
 msgstr "செல்லாத பயனர்"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "பயனர்  &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 "பயனரை குறிப்பிடு"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "இந்த பயனருக்கு ஏற்கெனவே பதிலாள் அணுகல் தர  அனுமதித்து உள்ளீர்கள்."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "நீங்கள் பதிலாள் அணுகல்  அனுமதி தர செல்லுபடியாகும் பயனர் பெயர் ஒன்றை குறிப்பிட வேண்டும்."
 
@@ -17652,27 +18017,33 @@ msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
 msgstr ""
-" &quot;{0}&quot; ஆக பதிலாள் உள்நுழைவு தோற்றது.  தயவு செய்து மின் அஞ்சல் முகவரியை சரி பார்த்து "
-"மீண்டும் முயற்சி செய்க."
+" &quot;{0}&quot; ஆக பதிலாள் உள்நுழைவு தோற்றது.  தயவு செய்து மின் அஞ்சல் முகவரியை "
+"சரி பார்த்து மீண்டும் முயற்சி செய்க."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "இது ஒரு  சுருள் நிகழ்வு"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "ஒப்புக்கொள்ள விருப்பமா?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "மறுக்க  விருப்பமா?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+#| msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "குறிப்பிட்ட பயனர்  &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 whom you want to add to the list"
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "நீங்கள்  பட்டியலில் சேர்க்க விரும்பும் பயனர் பெயரை குறிப்பிட  வேண்டும்"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17761,7 +18132,8 @@ msgstr "எழுது (_W)"
 msgid "permission to read|_Read"
 msgstr "(_R) படிக்க அனுமதி"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "பதிலாள்"
 
@@ -17769,12 +18141,13 @@ msgstr "பதிலாள்"
 msgid "<b>Account Name</b>"
 msgstr "<b>கணக்கின் பெயர்</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "பதிலாள் உள்அனுமதி"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -17784,20 +18157,28 @@ msgstr "%s (பயனருக்கான %s) %sகடவுச்சொல்�
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "பதிலாள் பதிவு... (_P)"
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "கணக்கு இணைப்பில் இருக்கும் போது மட்டுமே பதிலாள் தத்தல் இருக்கும்."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "கணக்கு செயல்படுத்தியிருக்கும் போது மட்டுமே பதிலாள் தத்தல் இருக்கும்."
 
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+#| msgid "Insert advanced send options"
+msgid "Advanced send options"
+msgstr "கூடுதல் அனுப்பும் விருப்பங்களை நுழை"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "பயனர்கள்"
 
@@ -17813,68 +18194,68 @@ msgstr "புதிய பகிரப்பட்ட அடைவு... (_S)"
 msgid "Sharing"
 msgstr "பகிர்கிறது"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "தனிப்பயன் அறிவிப்பு"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "சேர்   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "மாற்றியமை"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "செய்தியின் நிலை"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "பொருள்:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "அனுப்புநர்:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "உருவாக்கம் தேதி:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "பெறுநர்: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "வழங்கப்பட்டது: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "திறக்கப்பட்டது: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "ஏற்கப்பட்டது: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "நீக்கப்பட்டது: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "நிராகரிக்கப்பட்டது: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "நிறைவேறியது: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "சேர்க்கப்படவில்லை: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "செய்தி நிலைகளை தேடு..."
 
@@ -17978,11 +18359,11 @@ msgstr "நாள்காட்டிக்கு இறக்குமதி �
 msgid "Imports ICS attachments to calendar."
 msgstr "ஐசிஎஸ் இணைப்புகளை நாள்காட்டிக்கு இறக்குமதி செய்க."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "வண் பொருட்கள் பிரித்தெடுத்தல் அடுக்கு ஏற்றப்படவில்லை"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -17990,11 +18371,11 @@ msgstr ""
 "\"hald\" சேவை தேவை ஆனால் இப்போது அது ஓடவில்லை.  தயவு செய்து இந்த சேவையை இயக்கி "
 "நிரலை மீண்டும் துவங்கவும். அல்லது உங்கள் கணினி நிர்வாகியை தொடர்பு கொள்ளவும்."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "ஐ பாடை தேடுதல் தோல்வியடைந்தது."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -18021,128 +18402,128 @@ msgstr "ஐபாட்  க்கு ஒருங்கிணைத்தல்
 msgid "iPod Synchronization"
 msgstr "ஐபாட்   ஒருங்கிணைத்தல்"
 
-#: ../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 "நாள்காட்டியை ஏற்ற முடியவில்லை '%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 "நாள்காட்டி '%s'யில் ஒரு நேர ஒதுக்க ஏற்பாடு, சந்திப்புடன் முரணாக உள்ளது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "நாள்காட்டியில் நேர ஒதுக்கம் கண்டுபிடிக்கப்பட்டது '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "எந்த நாள்காட்டிகளையும் காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "எந்த நாள்காட்டியிலும் இந்த சந்திப்பினை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "எந்த பணி பட்டியலிலும் இந்த பணியை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "எந்த குறிப்பு பட்டியலிலும் இந்த குறிப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "இந்த நேர ஒதுக்கீட்டுக்கு இருப்பில் உள்ள வடிவ நிலையை தேடுகிறது. "
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "உருப்படியை குறிப்பிட முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "நாள்காட்டிக்கு உருப்படியை அனுப்ப முடியவில்லை '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "நாள்காட்டி '%s' க்கு ஏற்றுக்கொள்ளப்பட்டது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "நாள்காட்டி '%s' க்கு தற்காலிகமானது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "நாள்காட்டி '%s' க்கு நிராகரிக்கப்பட்டது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "நாள்காட்டி '%s' க்கு ரத்தானது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ஒருங்கிணைப்பாளர் பேராளரை நீக்கிவிட்டார் %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "பேராளருக்கு ரத்து அறிக்கையை அனுப்பவும்"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "பேராளருக்கு ரத்து அறிக்கையை அனுப்ப முடியவில்லை?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "கலந்து கொள்பவர்கள் நிலை தவறானது அதனால் மேம்படுத்த முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "கலந்துகொள்பவர்களை மேம்படுத்த முடியவில்லை. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "கலந்து கொள்பவர்கள் நிலை மேம்படுத்தப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "கூட்டம் பற்றிய தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "பணி தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "குறிப்பு தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "இந்த சந்திப்பு தகவலை அனுப்ப இயலவில்லை, சந்திப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "இந்த பணி தகவலை அனுப்ப இயலவில்லை, பணியை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "இந்த குறிப்பு தகவலை அனுப்ப இயலவில்லை, குறிப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "இணைக்கப்பட்ட நாள்காட்டி தவறானது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18150,15 +18531,15 @@ msgstr ""
 "இந்த செய்தி ஒரு நாட்காட்டியை உள்ளடக்கியதாக சொல்லுகிறது ஆனால் அது ஒரு செல்லுபடியாகும் "
 "ஐநாள்காட்டி அல்ல "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "நாள்காட்டியில் உள்ள உருப்படி தவறானது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18166,11 +18547,11 @@ msgstr ""
 "இந்த  செய்தியில் ஒரு நாள்காட்டி  உள்ளது. ஆனால் அதில் எந்த நிகழ்வுகள், பணிகள் ஓய்வு/ வேலை "
 "தகவல்கள் ஏதும் இல்லை........"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "இணைப்பட்டுள்ள நாள்காட்டி பல உருப்படிகளை கொண்டுள்ளது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18178,488 +18559,498 @@ msgstr ""
 "அனைத்து உருப்படிகளையும் செயலாக்க கோப்பு சேமிக்கப்பட்டு மற்றும் நாள்காட்டி இறக்குமதி "
 "செய்யப்பட வேண்டும்"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "இந்த சந்திப்பு மீண்டும் வந்துள்ளது "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "இந்த பணி மீண்டும் வந்துள்ளது "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "இந்த குறிப்பு மீண்டும் வரும்"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "செயலுக்கு பின் செய்தியை அழிக்கவும் (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "தேடல் முரண்பாடு"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "சந்திப்பு முரண்பாடுகளை தேட நாள்காட்டிகளை தேர்ந்தெடுக்கவும்"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "இன்று"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "இன்று %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "இன்று %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "இன்று %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "நாளை"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "நாளை %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "நாளை %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "நாளை %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "நாளை %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "தயவு செய்து <b>%s</b> சார்பாக பதில் தரவும்."
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> சார்பாக பெற்றுக்கொள்ளப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b>வழியாக %s பின்வரும் சந்திப்பு தகவல்கள் வெளியிடப்பட்டது:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> பின்வரும் சந்திப்பு விவரம் வெளியிடப்பட்டது:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> பின்வரும் சந்திப்பினை உங்களுக்கு வழங்குகிறது:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> வழியாக %s பின்வரும் சந்திப்பில் உங்கள் நிலை கோரப்படுகிறது:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> பின்வரும் சந்திப்பில் உங்கள் கவனத்தை கோருகிறது:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> வழியாக %s ஏற்கனவே உள்ள சந்திப்பினை சேர்க்கிறது:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ஒரு கூடுதலை சேர்க்க விரும்புகிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் கூட்டத்தைப்பற்றிய சமீபத்திய செய்தி அறிய விரும்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> பின்வரும் கூட்டத்தைப்பற்றிய சமீபத்திய செய்தி அறிய விரும்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் கூட்டத்தைப்பற்றிய பதில் அனுப்பி உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> பின்வரும் கூட்டத்தைப்பற்றிய பதில் அனுப்பி உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் கூட்டத்தை இரத்து செய்து உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> பின்வரும் கூட்டத்தை இரத்து செய்து உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s வழியாக பின்வரும் கூட்டத்தில் மாற்றம் பரிந்துரை செய்து உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> பின்வரும் கூட்டத்தில் மாற்றம் பரிந்துரை செய்து உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் கூட்டத்தில் மாற்றங்களை நிராகரித்து  உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> பின்வரும் கூட்டத்தில் மாற்றங்களை நிராகரித்து  உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் பணியை வெளியிட்டு உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> பின்வரும் பணியை வெளியிட்டு உள்ளார்."
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> %s ஐ பின்வரும் பணிக்கு பணிக்க வேண்டுகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> %s வழியாக ஒரு பணியை உங்களுக்கு ஒதுக்கியுள்ளார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> பணியை ஒதுக்கியுள்ளார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> %s வழியாக ஏற்கெனவே உள்ள பணியில் சேர்க்க வேண்டுகிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ஏற்கெனவே உள்ள பணியில் சேர்க்க வேண்டுகிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் பணியைப்பற்றிய சமீபத்திய செய்தி அறிய விரும்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> பின்வரும் பணியைப்பற்றிய சமீபத்திய செய்தி அறிய விரும்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> %s மூலமாக பின்வரும் பணியைப்பற்றிய பதிலை அனுப்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> பின்வரும் பணியைப்பற்றிய பதிலை அனுப்புகிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் அளிக்கப்பட்ட பணியை இரத்து செய்கிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> பின்வரும் அளிக்கப்பட்ட பணியை இரத்து செய்கிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் பணி ஒப்படைப்பில் மாற்றங்கள் பரிந்துரைக்கிறார்.:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> பின்வரும் பணி ஒப்படைப்பில் மாற்றங்கள் பரிந்துரைக்கிறார்.:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> வழியாக %s பின்வரும் கொடுக்கப்பட்ட பணி நிராகரிப்பட்டது:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> பின்வரும் பணி ஒப்படைப்பை மறுத்தளிக்கிறார்."
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் குறிப்பை வெளியிட்டுள்ளார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> பின்வரும் குறிப்பை வெளியிட்டுள்ளார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் குறிப்புக்கு சேர்க்க விரும்புகிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> பின்வரும் குறிப்புக்கு சேர்க்க விரும்புகிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> %s வழியாக பின்வரும் பகிர்ந்த குறிப்பை இரத்து செய்கிறார்:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> பின்வரும் பகிர்ந்த குறிப்பை இரத்து செய்கிறார்:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "நாள்காட்டியை திற (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "நிராகரி (_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "நிராகரி (_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "ஏற்றுக்கொள் (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "அனைத்தையும் நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "அனைத்து தற்காலிகமான(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "தற்காலிகமாக (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "அனைத்தையும் ஏற்றுக்கொள் (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "தகவலை அனுப்பு (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "கலந்து கொள்பவர்கள் நிலையை மேம்படுத்து (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "மேம்படுத்து (_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "துவக்க நேரம்:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "முடியும் நேரம்:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "குறிப்பு:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "அனுப்புனருக்கு பதில் அனுப்புக"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "பங்கு கொள்வோருக்கு இப்போதைய தகவல் அனுப்புக."
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "அனைத்தும் நிகழ்வுகளுக்கும் செயல்படுத்துக."
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "(_f)ஓய்வாக உள்ள நேரம் எனக்காட்டு"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "இணைப்பு நினைவூட்டல்"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "பணிகள் :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "குறிப்புகள் :"
 
@@ -18675,7 +19066,9 @@ msgstr "Itip வடிவமைப்பி"
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
-msgstr " &quot;{0}&quot; சந்திப்பினை வழங்குகிறது. நீங்கள் அதனை சேர்க்க வேண்டுமா &quot;{1}&quot;?"
+msgstr ""
+" &quot;{0}&quot; சந்திப்பினை வழங்குகிறது. நீங்கள் அதனை சேர்க்க வேண்டுமா &quot;{1}"
+"&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -18685,7 +19078,7 @@ msgstr "இந்த சந்திப்பு வழங்கப்படு�
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "பதில் இப்போதைய பங்கு கொள்பவரிடமிருந்து அல்ல. அனுப்பியவரை பங்கு கொள்பவராக ஆக்கவா?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "பதிலாள் வெளியேறு (_L)"
 
@@ -18721,7 +19114,7 @@ msgstr "புதிய மின்னஞ்சல் வரும்போத�
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
-msgstr "\"உண்மை \" எனில் பீப்; இல்லையெனில் செய்திகள் வரும்போது ஒலி கோப்பை வாசி."
+msgstr "\"true\" எனில் பீப் செய்; இல்லையெனில் செய்திகள் வரும்போது ஒலி கோப்பை வாசி."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18763,20 +19156,20 @@ msgstr "சின்னம் சிமிட்ட  வேண்டுமா."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "உள்பெட்டிக்கு வரும் புதிய செய்திகளை மட்டுமே அறிவிக்க வேண்டுமா."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "ஒரு  D-BUS செய்தியை உருவாக்கு "
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "எவலூஷன் அஞ்சல் அறிவிப்பு"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "அஞ்சல் அறிவிப்பு பண்புகள்"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18791,55 +19184,55 @@ msgstr[1] ""
 "நீங்கள் %d புதிய தகவல்களை\n"
 " %s இல் பெற்றுள்ளீர்கள்."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "நீங்கள் %d புதிய தகவலை பெற்றுள்ளீர்கள்."
 msgstr[1] "நீங்கள் %d புதிய தகவல்களை பெற்றுள்ளீர்கள்."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "புதிய மின்னஞ்சல்"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "(_n) அறிவிப்பு இடத்தில் சின்னத்தை  காட்டு"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "(_l) அறிவிப்பு இடத்தில் சின்னத்தை சிமிட்டு "
 
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "(_m) வெளித்துள்ளல் செய்திகள் சின்னத்துடன்."
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "(_P) புதிய மின்னஞ்சல் வரும் போது ஒலிக்கோப்பை இயக்கு"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "(_B) பீப்"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "(_s) ஒலி கோப்பினை இசை"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "(_f)கோப்பின் பெயரை உள்ளிடவும்"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "ஒலி கோப்பினை தேர்ந்தெடு"
 
-#: ../plugins/mail-notification/mail-notification.c:750
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "(l_) இசை"
 
-#: ../plugins/mail-notification/mail-notification.c:807
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "(_I) உள்பெட்டிக்கு மட்டும்  புதிய செய்திகள் வந்தால் அறிவி."
 
@@ -18980,9 +19373,15 @@ msgid "Send e-mail message to mailing list?"
 msgstr "செய்தியை குழுவிற்கு மின்னஞ்சல் செய்தியை அனுப்ப வேண்டுமா?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+#, fuzzy
+#| msgid ""
+#| "The action could not be performed. This means the header for this action "
+#| "did not contain any action we could process.\n"
+#| "\n"
+#| "Header: {0}"
+msgid ""
+"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 ""
@@ -19095,22 +19494,6 @@ msgstr "செய்திகளை படித்ததாக குறி"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "அடைவில் உள்ள அனைத்து செய்திகளையும் படித்ததாக குறிக்கப்பயன்படுகிறது."
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "இணைப்பில்லாமல் நாள்காட்டியை குறி"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "தேர்ந்தெடுத்த நாள்காட்டியை இணைப்பில்லாமல் பார்வையிட குறிக்கிறது."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "(_D) இணைப்பில்லாத போது பயனுக்கு என  அமைக்க வேண்டாம்"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "இணைப்பில்லாத போது பயனுக்கு என  அமை (_M)"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "மோனோ கூடுதல் வசதிகளை செயல்படுத்தும் ஒரு கூடுதல் வசதி"
@@ -19180,19 +19563,19 @@ msgstr "வெற்று உரை முறை"
 msgid "Prefer plain-text"
 msgstr "வெற்று உரை விருப்பம்"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "இருந்தால், HTMLஐ காட்டு"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "வெற்று விருப்பம்"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "எப்போதும் வெற்றை காட்டு"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_ம HTML முறை"
 
@@ -19204,6 +19587,22 @@ msgstr "எவல்யூஷன் விவரக்குறிப்பி"
 msgid "Writes a log of profiling data events."
 msgstr "தரவு நிகழ்வுகள் விவரமாக்கும் ஒரு பதிவினை எழுதுகிறது."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import mail from Pine."
+msgid "Import Outlook messages from PST file"
+msgstr "Pine லிருந்து அஞ்சலை இறக்கு."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook PST import"
+msgstr "அவுட்லுக் CSV மற்றும் Tab இறக்கி"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "நாள்காட்டிகளை இணையத்தில் வெளியிட அனுமதிக்கிறது"
@@ -19220,8 +19619,10 @@ msgstr "இடங்கள்"
 msgid "_Publish Calendar Information"
 msgstr "நாள்காட்டி தகவலை வெளியிடு (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+#| msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "இந்த URL ஐ நீக்க வேண்டுமா?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19259,8 +19660,17 @@ msgid "Publishing _Frequency:"
 msgstr "வெளியிடும் அலைவரிசை: (_F)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"SSH\n"
+#, fuzzy
+#| msgid ""
+#| "SSH\n"
+#| "Public FTP\n"
+#| "FTP (with login)\n"
+#| "Windows share\n"
+#| "WebDAV (HTTP)\n"
+#| "Secure WebDAV (HTTPS)\n"
+#| "Custom Location"
+msgid ""
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19308,6 +19718,18 @@ msgstr ""
 "iCal\n"
 "ஓய்வு /பணியில்"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+#| msgid "Location"
+msgid "New Location"
+msgstr "இடம்"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#, fuzzy
+#| msgid "Location"
+msgid "Edit Location"
+msgstr "இடம்"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "ஹெலோ பைதான்"
@@ -19325,58 +19747,61 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr " பைத்தான் இபிளகின் ஏற்றிக்கு சோதனை செருகி"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+#, fuzzy
+#| msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "பைத்தானில் எழுதப்பட்ட மற்ற சொருகுப்பொருளை ஏற்ற ஒரு சொருகு பொருள்"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "பைத்தான் ஏற்றி"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "ஸ்பாம் அஸாஸின் (உள்ளடக்கியது.)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ஸ்பாம் அஸாஸின் ஐ காணவில்லை, குறி: %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 "குழாயை  உருவாக்குவதில் தோல்வி: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "பிளவுக்குப்பின்  பிழை: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "ஸ்பாம் அஸாஸின் சேய் செயல் பதிலளிக்கவில்லை. முடிக்கிறது..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
-#, 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..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ஸ்பாம் அஸாஸின் சேய் செயலுக்கு காத்திருப்பு மறிக்கப்பட்டது.  நிறுத்துகிறது..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "ஸ்பாம் அஸாஸின் க்கு குழாய் இட  இயலவில்லை. தவறு %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 "ஸ்பாம் அஸாஸின்  இருப்பில் இல்லை"
 
-#: ../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 "இது ஸ்பாம் அஸாஸின் ஐ மேலும் நம்பகமாக்கும். ஆனால் மெதுவாக வேலை செய்யும்."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "(_n)தொலை சோதனையை சேர்"
 
@@ -19389,12 +19814,14 @@ msgstr ""
 "நிறுவப்பட்டு இருக்க வேண்டும்."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "ஸ்பாம் அஸாஸின் குப்பை சொருகுப்பொருள்"
+#, fuzzy
+#| msgid "Spamassassin Options"
+msgid "SpamAssassin Options"
+msgstr "ஸ்பாம் அஸாஸின் தேர்வுகள்"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "ஸ்பாம் அஸாஸின் தேர்வுகள்"
+msgid "SpamAssassin junk plugin"
+msgstr "ஸ்பாம் அஸாஸின் குப்பை சொருகுப்பொருள்"
 
 #: ../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."
@@ -19404,7 +19831,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "இணைப்புகளை சேமி"
 
@@ -19416,15 +19843,15 @@ msgstr "இணைப்புகளை சேமிக்க..."
 msgid "Save all attachments"
 msgstr "அனைத்து இணைப்புகளையும் சேமி"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "சேமிப்பு அடிப்படை பெயரை தேர்ந்தெடு"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME வகை"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "சேமி"
 
@@ -19565,15 +19992,15 @@ msgstr "உங்கள் ஆரம்ப கணக்கு அமைக்க
 msgid "Setup Assistant"
 msgstr "அமைப்பு உதவியாள்"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "எவல்யூஷன் அமைப்பு உதவி"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "நல்வரவு"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19583,30 +20010,30 @@ msgstr ""
 "எவல்யூஷன் உங்களை வரவேற்கிறது. இனிவரும் திரைகள் எவல்யூஷன் உங்கள் மின்னஞ்சல் கணக்கினை "
 "இணைக்கவும், மற்ற பயன்பாடுகளிலிருந்து கோப்புகளை இறக்கம் செய்யவும் அனுமதிக்கும்\n"
 "\n"
-"\"அடுத்து\" பொத்தானை சொடுக்கி தொடரவும்."
+"\"Forward\" பொத்தானை சொடுக்கி தொடரவும்."
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "கோப்புகளை இறக்குமதி செய்கிறது"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "நீங்கள் பெறவிரும்பும் தகவலை தேர்வு செய்யவும்"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "அனுப்புனர் %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "தரவினை ஏற்றுகிறது"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "தயவு செய்து காத்திருக்கவும்"
@@ -19634,15 +20061,15 @@ msgid ""
 "message body."
 msgstr "இணைப்பு நினைவுறுத்தி சொருகிக்கு செய்தியின் உடலில் தேட சாடைகளின் பட்டியல்"
 
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "தலைப்பு இல்லை"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "(_T) வார்ப்புருவாக  சேமி"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "வார்ப்புருவாக  சேமி"
 
@@ -19651,7 +20078,9 @@ msgid "Drafts based template plugin"
 msgstr "வரைவுகள் அடிப்படையிலான வார்ர்புரு  சொருகுப்பொருள்"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+#| msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "டிஎன் ஈஎஃப் இணைப்புகளை குறிவிலக்க ஒய்டிஎன் ஈஎஃப் ஐ பயன்படுத்தும் ஒரு சொருகுப்பொருள்"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19677,7 +20106,9 @@ msgid "URL:"
 msgstr "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)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "(_A) இஃப்மேட்ச்ஹ் ஆனால் தவிர். (அபாசே < 2.2.8 க்கு தேவை )"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19807,8 +20238,9 @@ msgid ""
 "\" respectively."
 msgstr ""
 "பதிலாள் அமைப்பு முறைமையை தேந்தெடுக்கவும். ஆதரவுள்ள மதிப்புகள் 0, 1, 2, மற்றும் 3அவை  "
-"முறையே  \" கணினி அமைப்பை பயன்படுத்து \",  \" பதிலாள் இல்லை \" ,  \" கைமுறை அமைப்பு"
-"\" ,மற்றும் \" தானியங்கி உரலில் உள்ள பதிலாள் அமைப்பு   \"."
+"முறையே  \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" மற்றும் \"use proxy configuration provided in the autoconfig url"
+"\"."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -19818,7 +20250,7 @@ msgstr "பக்கப்பட்டை தெரிகிறது"
 msgid "Skip development warning dialog"
 msgstr "மேம்பாடு எச்சரிக்கை உரையாடலை தவிர்"
 
-#: ../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 "இணையம் இல்லாமல் துவக்கு"
 
@@ -19895,10 +20327,7 @@ 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 ""
-"சாளர பொத்தான்களின் பாணி. இது \"உரை\", \"சின்னங்கள்\", \"இரண்டும்\", \"கருவிப்பட்டி\" "
-"ஆக இருக்கலாம். \"கருவிப்பட்டி\"  ஆக இருப்பின் பொத்தான்களின் பாணி க்னோம் கருவிப்பட்டி "
-"அமைப்பால் நிர்ணயிக்கப்படும்."
+msgstr "சாளர பொத்தான்களின் பாணி. இது\"text\", \"icons\", \"both\", \"toolbar\" ஆக இருக்கலாம். \"toolbar\" ஆக இருப்பின் பொத்தான்களின் பாணி க்னோம் கருவிப்பட்டி அமைப்பால் நிர்ணயிக்கப்படும்."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
@@ -20002,7 +20431,7 @@ msgstr ""
 "பின்வரும் நிரல்களிடமிருந்து அமைப்பை இறக்குமதி\n"
 "செய்ய எவல்யூஷன் சோதித்தது. பைன், நெட்ஸ்கேப்\n"
 "ஐகாலண்டர். அத்தகைய அமைப்பு ஏதும் இல்லை.\n"
-"மீண்டும் முயற்சி செய்ய \"பின்\" பொத்தானை சொடுக்கவும்.\n"
+"மீண்டும் முயற்சி செய்ய \"Back\" பொத்தானை சொடுக்கவும்.\n"
 
 #: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
@@ -20030,7 +20459,7 @@ msgstr "எவல்யூஷன் முன்னுரிமைகள்"
 
 #. 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 - எவல்யூஷன்"
@@ -20063,23 +20492,19 @@ msgstr "மொழிபெயர்ப்பாளர்-சன்மானம�
 msgid "Evolution Website"
 msgstr "எவல்யூஷன் வலைத்தளம்"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "அடிக்கடி கேட்கும் கேள்விகள் பக்கத்தை திறக்கும் போது பிழை"
-
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "(_W)இணையத்தில் வேலை செய்யவும்"
 
-#: ../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 "(_W)இணையத்தொடர்பு இல்லாமல் வேலை செய்யவும்"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "இணையத்தொடர்பு இல்லாமல் வேலை செய்யவும்"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20087,11 +20512,11 @@ msgstr ""
 "எவல்யூஷன் தற்சமயம் இணைப்பில் உள்ளது.\n"
 " இந்தப் பொத்தானை பயன்படுத்தி இணைப்பிலிருந்து விலகவும்."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "எவல்யூஷன் இணையத்திலிருந்து விடுபட்டுக்கொண்டிருக்கிறது"
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20099,33 +20524,33 @@ msgstr ""
 "எவல்யூஷன் தற்சமயம் இணைப்பில்லாமல் உள்ளது. \n"
 "இந்தப் பொத்தானை பயன்படுத்தி இணைப்பினை பெறவும்."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "%s க்கு மாறு"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "தெரியாத கணினி பிழை"
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld 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 "சரி"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "செல்லாத அளவுருக்கள்"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF பதிவு செய்ய முடியவில்லை"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "அமைப்பு தரவுத்தளத்தை காணவில்லை"
 
@@ -20150,7 +20575,7 @@ msgstr "புதிய பணியை உருவாக்கு"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "\"பதிவிறக்கு\" என்பதை க்ளிக் செய்து எவல்யூஷன் கோப்புகளை இறக்கிகொள்ளவும்"
+msgstr "\"Import\" என்பதை க்ளிக் செய்து எவல்யூஷன் கோப்புகளை இறக்கிகொள்ளவும்"
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -20169,8 +20594,10 @@ msgid "Importer Type"
 msgstr "இறக்கி வகை"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "இறக்கியை தேர்வுசெய்"
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select Information to Import"
+msgstr "ஏற்ற வேண்டிய அடைவை தேர்வு செய்"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20187,7 +20614,7 @@ msgstr ""
 "கோப்புகளை பதிவிறக்கம் செய்துகொள்ளலாம்."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20221,7 +20648,7 @@ msgstr ""
 "எங்கள் முயற்சி உங்களுக்கு மகிழ்ச்சியை தரும் என நம்புகிறோம்.\n"
 "உங்கள் ஆதரவை ஆர்வத்துடன் எதிர் பார்க்கிறோம்.\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20229,43 +20656,43 @@ msgstr ""
 "நன்றி\n"
 "எவல்யூஷன் குழுவிற்கு\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "மீண்டும் சொல்ல வேண்டாம்"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "குறிப்பிட்ட உருப்படியை துவக்குவதன் மூலம் எவல்யூஷனை துவக்கு"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "உள் அமை பாங்கில் துவக்கு"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "எல்லா எவல்யூஷன் கூறுகளையும் பணிநிறுத்தம் செய்கிறது"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "எவல்யூஷன் 1.4 லிருந்து மீண்டும் மாற்றப்படுகிறது"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "கோப்பின் எல்லா உருப்படிகளுக்கும் வழுநீக்க விளைவை அனுப்பவும்"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "எந்த கூடுதல் வசதிகளை ஏற்றலையும் செயல்நீக்கு"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "அஞ்சல் தொடர்புகள் மற்றும் பணிகள் இவற்றுக்கு முன்பார்வை பலகத்தை முடக்குக"
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- எவல்யூஷன் PIM மற்றும் மின்னஞ்சல்"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20279,18 +20706,24 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "நினைவிலுள்ள அனைத்து கடவுச்சொல்லையும் மறக்க வேண்டும்?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Cannot start Evolution"
+msgstr "எவல்யூஷனை மீண்டும் தொடங்கு"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "தொடர்க"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "பதிப்பு {0} லிருந்து பழைய தகவலை நீக்க வேண்டுமா?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "எவல்யூஷன் துவங்க முடியவில்லை"
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20298,15 +20731,15 @@ msgstr ""
 "உங்கள் கடவுச்சொற்களை மறப்பதென்றால் எல்லா கடவுச்சொற்களும் துப்புரவாக்கப்படும். அடுத்த நேரம் "
 "தேவைப்படும் போது நீங்கள் கேட்கப்படுவீர்கள்."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "மேம்படுத்துவதற்கு வட்டில் இடம் இல்லை"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "தகவலை நீக்க வேண்டுமா"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20327,9 +20760,18 @@ msgstr ""
 "நீக்கப்பட்ட பின் பழைய வடிவ நிலை எவல்யூஷனுக்கு கைமுறை அல்லாது வேறு வழியில் கீழ்படுத்த "
 "முடியாது.\n"
 
-#: ../shell/shell.error.xml.h:15
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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 "
@@ -20342,11 +20784,11 @@ msgstr ""
 "நிரந்தரமாக நீக்கப்படும். தரவை வைத்துக்கொள்ள முடிவு செய்தால் பின்னால் வசதிபட்ட போது &quot;"
 "எவல்யூஷன்&quot; அடைவின் உள்ளடக்கங்களையும் நீக்கிக்கொள்ளலாம்.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "முந்தைய பதிப்பினை மேம்படுத்த முடியவில்லை: {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"
@@ -20359,7 +20801,7 @@ msgstr ""
 "\n"
 "மேலே தொடரும் முன் உங்கள் இல்லம் அடைவில் அதிக இடம் தயார் செய்ய வேண்டும்."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20369,7 +20811,7 @@ msgstr ""
 "\n"
 "உதவிக்கு இங்கே க்ளிக் செய்யவும்."
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20383,19 +20825,19 @@ msgstr ""
 "\n"
 "உதவிக்கு இங்கே க்ளிக் செய்யவும்."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "மற (_F)"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "(_K)தகவலை அப்படியே வை"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "(_R)பிறகு நினைவூட்டு."
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20463,7 +20905,7 @@ msgid "Purposes"
 msgstr "காரணம்"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "வரிசை எண்"
 
@@ -20581,7 +21023,7 @@ msgstr ""
 "இந்த CA வை பயன்படுத்துவதற்கு முன் அதன் முறை மற்றும் அனுமதி ஆகியவைகளை சோதிக்கவும்"
 "(கிடைத்தால்)"
 
-#: ../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 "சான்றிதழ்"
 
@@ -20657,11 +21099,11 @@ msgstr "நிறுவன பகுதி (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 கைரேகை"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL இரவலன் சான்றிதழ்"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL சான்றிதழ் சேவகன்"
 
@@ -20706,182 +21148,182 @@ msgid "_Edit CA Trust"
 msgstr "(_E) 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 "சான்றிதழ் ஏற்கெனவே உள்ளது"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "கையொப்பமிடு"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "குறிமுறையாக்கு"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "பதிப்பு"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "பதிப்பு 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "பதிப்பு 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "பதிப்பு 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 உடன் RSA குறிமுறையாக்கம்"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 உடன் RSA குறிமுறையாக்கம்"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 உடன் RSA குறிமுறையாக்கம்"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA குறிமுறையாக்கம்"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "சான்றிதழ் சாவி பயன்பாடு"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "நெட்ஸ்கேப் சான்றிதழ் வகை"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "சான்றிதழ் உரிமம் முக்கிய அடையாளம் காட்டி"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "பொருள் அடையாங்காணி (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "படிமுறை அடையாளங்காணி"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "படிமுறை அளவுரு"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "தலைப்பு பொதுவிசை தகவல்"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "தலைப்பு பொது விசை படிமுறை"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "தலைப்பின் பொது விசை"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "பிழை: விரிவாக்கத்தை செயல்படுத்த முடியவில்லை"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "பொருள் கையொப்பம்"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL சான்றிதழ் உரிமம்"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "மின்னஞ்சல் சான்றிதழ் உரிமமுள்ளவர்"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "கையொப்பமிடுகிறது"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "மறுப்பு இல்லை"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "விசைஇன்மை"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "தகவலின்மை"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "முக்கிய ஒப்பந்தம்"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "சான்றிதழ் கையொப்பமிடுபவர்"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL கையொப்பம்"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "சிக்கல்"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "சிக்கல் இல்லை"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "விரிவாக்கம்"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "சான்றிதழ் கையொப்ப படிமுறை"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "வழங்கியவர்"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "வழங்கியவரின் தனிப்பட்ட அடையாளம்"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "தலைப்பின் தனி அடையாளம்"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "சான்றிதழ் கையொப்ப மதிப்பு"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 கோப்பின் கடவுச்சொல்"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 கோப்புக்கான கடவுச்சொல்லை உள்ளிடவும்"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "இறக்குமதி செய்யப்பட்ட சான்றிதழ்"
 
@@ -20920,7 +21362,9 @@ msgid "Copy"
 msgstr "நகலெடு"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
 msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்புகளை வேறு அடைவுக்கு நகல் எடுக்கவும்..."
 
 #: ../ui/evolution-addressbook.xml.h:8
@@ -20969,7 +21413,9 @@ msgid "Mo_ve All Contacts To..."
 msgstr "அனைத்து தொடர்புகளையும் நகர்த்து... (_v)"
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
+#, fuzzy
+#| msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
 msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்புகளை வேறு அடைவுக்கு நகர்த்து..."
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -21010,14 +21456,16 @@ msgid "Save as VCard..."
 msgstr "விகார்ட் என சேமிக்கப்பட்டது..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+#| msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
 msgstr "தேர்வு செய்த தொடர்புகளை விகார்ட் இல் சேமி."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "தேர்ந்தெடுக்கப்பட்ட அடைவு தொடர்புகளை வீகார்ட் ஆக சேமிக்கவும்."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "அனைத்தையும் தேர்வு செய்"
 
@@ -21030,7 +21478,9 @@ msgid "Select all contacts"
 msgstr "அனைத்தையும் தேர்வு செய்"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+#| msgid "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
 msgstr "செய்தியை தேர்வு செய்துள்ளவர்களுக்கு அனுப்பு"
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -21038,7 +21488,9 @@ msgid "Send message to contact"
 msgstr "செய்தியை தொடர்புக்கு அனுப்பு"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+#| msgid "Send selected contacts to another person."
+msgid "Send selected contacts to another person"
 msgstr "தேர்வு செய்யபப்ட்ட தொடர்பை மற்றவருக்கு அனுப்பு"
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -21061,7 +21513,7 @@ msgstr "ஏற்றுவதை நிறுத்து"
 msgid "View the current contact"
 msgstr "தற்போதைய தொடர்பை பார்"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "(_A)செயல்கள்"
@@ -21216,15 +21668,23 @@ msgstr "வாரத்தில் வேலை நாட்களை காட
 msgid "View the current appointment"
 msgstr "தற்போதைய நேர ஒதுக்கத்தை பார்"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "நீண்ட செய்திகளுக்கு  வழு நீக்கு முனையத்தை காண்க."
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "வாரம்"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "வார வேலை"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "வழு நீக்கு பதிவுகள் (_D)"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "நேர ஒதுக்க ஏற்பாட்டினை திற (_O)"
 
@@ -21293,10 +21753,6 @@ msgstr "செய்தி முன்பார்வை சாளரத்த�
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "தொலை சேவையகங்களிலுள்ள அடைவுகளை சந்தாப்படுத்து அல்லது சந்தாநீக்கு"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "நீண்ட செய்திகளுக்கு  வழு நீக்கு முனையத்தை காண்க."
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "பழைமயான காட்சி"
@@ -21305,10 +21761,6 @@ msgstr "பழைமயான காட்சி"
 msgid "_Copy Folder To..."
 msgstr "அடைவில் நகலெடு... (_C)"
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "வழு நீக்கு பதிவுகள் (_D)"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "(_D) இணைப்பு விலகி காண செய்திகளை இறக்கு"
@@ -21333,7 +21785,9 @@ msgstr "_ம முன்பார்வை"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
+#, fuzzy
+#| msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "சந்தாக்கள் (_S)"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21413,10 +21867,6 @@ msgstr "இந்த அடைவில் உள்ள நீக்கிய �
 msgid "Permanently remove this folder"
 msgstr "இந்த அடைவினை நிரந்தரமாக நீக்கு"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "புதுப்பிக்க..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "அடைவை புதுப்பிக்கவும்"
@@ -22336,7 +22786,7 @@ msgid "Define Views for \"%s\""
 msgstr "\"%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"
@@ -22359,42 +22809,42 @@ msgid "_Replace existing view"
 msgstr "இருக்கும் பார்வையை மாற்று (_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "உங்கள் காட்சி..."
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "தனிப்பயன் காட்சியை சேமி"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "காட்சியை அறிதியிடு"
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "தற்போதைய பார்வை (_u)"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "காட்சியை தேர்ந்தெடு: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "நடப்பு காட்சி ஒரு தனிப்பயன் காட்சி"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "உங்கள் காட்சியை சேமி..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "தற்போதைய தனிப்பயன் காட்சியை சேமிக்கவும்"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "காட்சிகளை உருவாக்கு அல்லது திருத்து"
 
@@ -22418,17 +22868,17 @@ msgstr "காட்சியின் வகை"
 msgid "Type of view:"
 msgstr "பார்வையின் வகை:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "இணைப்பு பட்டை"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "கோப்பை இணைக்க முடியவில்லை %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "கோப்பை இணைக்க முடியவில்லை%s: இயல்பான கோப்பு இல்லை"
@@ -22458,76 +22908,76 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "மாத நாள்காட்டி"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "வண்ண நிரப்பி"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "GDK வண்ண நிரப்பி"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "புள்ளிகளால் நிரப்பு"
 
-#: ../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 "குறைந்தபட்ச அகலம்"
 
-#: ../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 "குறைந்தபட்ச அகலம்"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "இடைவெளி"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "இப்போது"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "நேரம் இந்த வடிவத்தில் இருக்க வேண்டும்: %s"
 
-#: ../widgets/misc/e-cell-percent.c:78
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "சதவிகித மதிப்பு 0 லிருந்து 100 க்குள் இருக்க வேண்டும்"
 
@@ -22626,85 +23076,85 @@ msgstr "மற்றவை..."
 msgid "Ch_aracter Encoding"
 msgstr "எழுத்துரு குறிமுறை (_a)"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "நாள் மற்றும் நேரம்"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "உள்ளீடு தேதிக்கான உரை உள்ளீடு"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "ஒரு நாள்காட்டியை காட்ட இந்தப் பொத்தானை சொடுக்கவும்"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "நேரத்தை தேர்ந்தெடுக்க கீழிறங்கும் தொகுப்பு  பெட்டி"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "_ப இப்போது"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_இன்று"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "செல்லாத தேதி மதிப்பு"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "செல்லாத நேர மதிப்பு"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "விரிக்கப்பட்ட"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "விரிவாக்கி விரிக்கப்பட்டதா இல்லையா"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "விரிவாக்க விளக்கச்சீட்டில் உள்ள உரை"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "அடிக்கோட்டை பயன்படுத்து"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "அமைக்கப்பட்டால், அடிகோடிட்ட உரை நிமோனிக் ஆக்சலரேட்டாராக செயல்படும்"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "விளக்க சீட்டு மற்றும் துணைசீட்டுக்கும் உள்ள இடைவெளி"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "சாளர அடையாளம்"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "வழக்கமான விரிவாக்க அடையாளத்தை காட்டும் சாளரம்"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "விரிவாக்கியின் அளவு"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "விரிவாக்க அம்புக்குறியின் அளவு"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "காட்டியின் இடைவெளி"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "விரிக்கப்பட்ட அம்பிக்குறிகளுக்குள் இடம்விடுகிறது"
 
@@ -22791,64 +23241,64 @@ msgstr "தனி பதிவேடுகளை ஒத்திசை"
 msgid "Sync Categories:"
 msgstr "வகைகளை ஒத்திசை"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "வெற்று செய்திகள்"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "மறுபாய்வு மாதிரி"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "நிரல் அகலம்"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "தேடு"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "தேடல் வகையை மாற்ற இங்கு சொடுக்கவும்"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "(_S)தேடு"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "(_N) இப்போது தேடு"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "(_C)தூய்மை"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "உருப்படி ID"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "உரை"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "சுட்டிகாட்டுதல்_w:"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "தேடு(_c):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr "உள்ளே"
 
@@ -23004,19 +23454,19 @@ msgid "_When opened:"
 msgstr "திறந்திருக்கும் போது: (_W)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% முடிவுற்றது)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "URLக்கு செல்ல இங்கு சொடுக்கவும்"
 
@@ -23056,23 +23506,23 @@ msgstr "குறிப்பிடப்பட்ட நெடுவரிச�
 msgid "Unselected Column"
 msgstr "தேர்வு செய்யப்படாத நெடுவரிசை"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "அடிக்கப்பட்ட நெடுவரிசை"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "அடிக்கோடிட்ட நெடுவரிசை"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "பெரிதாக்கப்பட்ட நெடுவரிசை"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "நிற நெடுவரிசை"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "BG நிற நெடுவரிசை"
 
@@ -23110,7 +23560,7 @@ msgid "A_vailable Fields:"
 msgstr "இருக்கும் புலங்கள்: (_v)"
 
 #: ../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 "மேலேறுகின்றது"
 
@@ -23123,7 +23573,7 @@ msgid "Clear _All"
 msgstr "(_A) அனைத்தையும் துடை"
 
 #: ../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 "இறங்குகின்றது"
 
@@ -23186,14 +23636,14 @@ msgstr "வரிசைப்படுத்து... (_S)"
 #: ../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 "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 "முழு தலைப்பு"
 
@@ -23231,7 +23681,7 @@ msgstr[1] "%s (%d உருப்படி)"
 #: ../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 "அடுத்தடுத்த வரிசை நிறங்கள்"
 
@@ -23239,7 +23689,7 @@ msgstr "அடுத்தடுத்த வரிசை நிறங்கள�
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "கிடைமட்ட கட்டங்கள்"
@@ -23248,7 +23698,7 @@ msgstr "கிடைமட்ட கட்டங்கள்"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "மேல்கீழ் கட்டங்கள்"
@@ -23257,7 +23707,7 @@ msgstr "மேல்கீழ் கட்டங்கள்"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "குறிப்பை வரை"
@@ -23266,7 +23716,7 @@ msgstr "குறிப்பை வரை"
 #: ../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 "கர்சர் பாங்கு"
 
@@ -23274,7 +23724,7 @@ msgstr "கர்சர் பாங்கு"
 #: ../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 "தேர்வு மாதிரி"
 
@@ -23282,8 +23732,8 @@ msgstr "தேர்வு மாதிரி"
 #: ../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 "துவக்க நீளம்"
@@ -23292,8 +23742,8 @@ msgstr "துவக்க நீளம்"
 #: ../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 "ஒத்த வரிசை உயரங்கள்"
@@ -23305,96 +23755,96 @@ msgstr "ஒத்த வரிசை உயரங்கள்"
 msgid "Frozen"
 msgstr "முடிவான"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "தற்போதைய காட்சியை தனிப்பயனாக்கு..."
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "_ஏறுவரிசையாக அடுக்குக"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "_இறங்கு வரிசையாக அடுக்குக"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_ந வரிசைப்படுத்தல் நீக்குக"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "இந்த புலம் வாராக குழு செய்க"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "பெட்டி வாராக குழு செய்க"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "_ந இந்த பத்தியை நீக்குக"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "_ச ஒரு பத்தியை சேர்க"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "_ச சீர்மை"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "_நல்ல பொருத்தம்"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "நெடுவரிசையை ஒழுங்கு செய்க..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "நடப்பு காட்சியை _தனிப்பயன் ஆக்குக..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "(_S) இதனால் வரிசைப்படுத்து"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "(_C) தனிப்பயன்"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "எழுத்துரு விவரணம்"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "வரிசைப்படுத்திய தகவல்"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "மரம்"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "அட்டவணை தலைப்பு"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "அட்டவணை மாதிரி"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "நிலைகாட்டி நிரை"
 
-#: ../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 "எப்போதும் தேடு"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "சேர்க்க க்ளிக் செய்யவும்"
 
@@ -23410,107 +23860,108 @@ msgstr "புதிய பார்வை"
 msgid "Draw lines and +/- expanders."
 msgstr "கோடுகள் +/- விரிவாக்கிகளை வரை"
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "உள்ளிடும் முறைகள்"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "நிகழ்வு செயல்முறைகள்"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "தடிமன்"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "அடிக்கவும்"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "இணைப்பு"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "சீராக்கு"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "க்ளிப் அகலம்"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "க்ளில் உயரம்"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "க்ளிப்"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "க்ளிக் செவ்வகத்தை நிரப்பு"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "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 "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 "உரை அகலம்"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "உரை உயரம்"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "நீள்வட்டத்தை பயன்படுத்து"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "நீள்வட்டம்"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "வரி மடக்கி"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "எழுத்து நிறுத்தம்"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "அதிகபட்ச வரிகள்"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "ஓரங்களை வரை"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "புதிய வரிகளை அனுமதி"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "பின்னனியை வரை"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "பட்டன்களை வரை"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "கர்சர் நிலை"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "IM சூழல்"
 
-#: ../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 "மேல்மீட்பினை கையாள்"
 
diff --git a/po/vi.po b/po/vi.po
index 1a29cc27c7..8e770057a8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5049,13 +5049,13 @@ msgstr "Định dạng thời gian 24 giờ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Đơn vị cho bộ nhắc nhở mặc định: « phút », « giờ » hay « ngày »."
+msgstr "Đơn vị cho bộ nhắc nhở mặc định, \"minutes\" (phút), \"hours\" (giờ) hoặc \"days\" (ngày)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Đơn vị để quyết định lúc nào ẩn cộng việc: « phút », « giờ » hay « ngày »."
+"Đơn vị để quyết định lúc nào ẩn cộng việc, \"minutes\" (phút), \"hours\" (giờ) hoặc \"days\" (ngày)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -12961,7 +12961,7 @@ msgstr "Độ rộng mặc định của Cửa sổ thư"
 
 #: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Kiểu dáng hiển thị thư (chuẩn, dòng đầu đây đủ, mã nguồn)"
+msgstr "Kiểu dáng hiển thị thư (\"normal\" - chuẩn, \"full headers\" - dòng đầu đây đủ, \"source\" - mã nguồn)"
 
 #: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
@@ -19444,8 +19444,8 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Kiểu dạng mọi cái nút cửa sổ. Có thể là « chữ », « ảnh », « cả hai » hay « thanh "
-"công cụ ». Nếu lập « thanh công cụ » thì thiết lập thanh công cụ GNOME sẽ "
+"Kiểu dạng mọi cái nút cửa sổ. Có thể là \"text\" (chữ), \"icons\" (ảnh), \"both\" (cả hai) hay \"toolbar\""
+" (thanh công cụ). Nếu lập « thanh công cụ » thì thiết lập thanh công cụ GNOME sẽ "
 "quyết định kiểu dạng các cái nút này."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8eb52008f5..f9302f252f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,14 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
 #
-#: ../shell/main.c:589
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:13+0000\n"
-"PO-Revision-Date: 2008-03-04 16:29+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2009-01-19 17:15+0000\n"
+"PO-Revision-Date: 2009-01-29 02:49+0800\n"
 "Last-Translator: YangZhang <zyangmath@gmail.com>\n"
 "Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
 "MIME-Version: 1.0\n"
@@ -21,21 +22,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "evolution 地址簿"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -131,7 +132,7 @@ msgstr "无事件。"
 #: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
-msgstr "周工作视图：%s。%s"
+msgstr "工作日视图：%s。%s"
 
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
@@ -143,14 +144,14 @@ msgstr "日视图：%s。%s"
 
 #: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
-msgstr "工作周的日历视图"
+msgstr "工作日的日历视图"
 
 #: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -161,8 +162,8 @@ msgstr "%Y年%-m月%-d日%A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
@@ -170,9 +171,9 @@ msgstr "%-m月%-d日%A"
 #: ../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 "%Y年%-m月%-d日%A"
 
@@ -180,10 +181,10 @@ msgstr "%Y年%-m月%-d日%A"
 #: ../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 "%Y年%-m月%-d日"
 
@@ -193,15 +194,15 @@ msgstr "%Y年%-m月%-d日"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%B%-d日"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
@@ -248,11 +249,11 @@ msgstr "弹出"
 msgid "popup a child"
 msgstr "弹出子对象"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "编辑"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "开始编辑此单元格"
 
@@ -265,19 +266,19 @@ msgstr "切换"
 msgid "toggle the cell"
 msgstr "切换单元格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "展开"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "在包含此单元格的 ETree 中展开行"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "折叠"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "在包含此单元格的 ETree 中折叠行"
 
@@ -407,7 +408,7 @@ msgstr "认证到 IMAP 服务器失败。"
 
 #. 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 "删除联系人失败"
 
@@ -420,6 +421,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 服务器无法响应有效的大纲信息。"
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "服务器版本"
 
@@ -540,7 +542,7 @@ msgstr "原样使用(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -549,21 +551,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "默认同步地址："
 
-#: ../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 "无法装入地址簿"
 
-#: ../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 "无法读入 Pilot 的地址应用程序块"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "自动补全"
 
@@ -581,9 +584,9 @@ msgstr "在此配置自动补全"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../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 "联系人"
@@ -622,15 +625,15 @@ msgstr "在此管理您的 S/MIME 证书"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:244
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "在此计算机中"
 
@@ -639,139 +642,138 @@ msgstr "在此计算机中"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "个人"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "在 LDAP 服务器上"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "联系人(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "新地址簿"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "地址簿(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升级地址簿设置或文件夹失败。"
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "基础"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
 
-#: ../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:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "常规"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../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 "细节"
 
-#: ../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 "搜索"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "下载"
 
-#: ../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 "地址簿属性"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "正在升迁..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "升迁“%s”："
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP 服务器"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "自动补全设置"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -782,7 +784,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -792,7 +794,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -802,7 +804,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -812,53 +814,60 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: ../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 "将“%s”文件夹重命名为："
 
-#: ../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 "重命名文件夹"
 
-#: ../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 "文件夹名不能含有字符“/”"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "另存为 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 "重命名(_R)..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "联系人源选择器"
 
@@ -879,8 +888,8 @@ msgstr "输入 %s 的密码(用户 %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "输入密码"
@@ -904,32 +913,50 @@ msgid ""
 msgstr "卡片和列表视图及预览面板之间垂直面板的位置，以像素计。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "显示预览面板"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "选择名称对话框中上次使用的文件夹 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "选择名称对话框中上次使用的文件夹 URI。"
 
-#: ../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:80
 msgid "Vertical pane position"
 msgstr "垂直面板的位置"
 
-#: ../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 "是否显示预览面板。"
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "总是显示自动补全的联系人的地址(_S)"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "在地址簿中查阅"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -971,7 +998,7 @@ msgid "Add Address Book"
 msgstr "添加地址簿"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "总是"
 
@@ -1010,14 +1037,14 @@ msgid "Lo_gin:"
 msgstr "登录(_G)："
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "从不"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "不加密"
 
@@ -1029,7 +1056,7 @@ msgstr "一次"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -1095,7 +1122,7 @@ msgstr "支持的搜索起点"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
@@ -1121,7 +1148,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
 
@@ -1134,11 +1161,11 @@ msgstr "这是可下载条目的最大数量。将此数值设定得太大将导
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
-"对 ldap 服务器的匿名访问权限。"
+"对 LDAP 服务器的匿名访问权限。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1185,7 +1212,7 @@ msgstr "登录方式(_L)："
 
 #: ../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:"
@@ -1200,7 +1227,7 @@ msgid "_Search scope:"
 msgstr "搜索范围(_S)："
 
 #: ../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 "服务器(_S)："
@@ -1218,13 +1245,14 @@ msgid "cards"
 msgstr "名片"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "分钟"
 
@@ -1265,8 +1293,8 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1277,16 +1305,16 @@ msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
 #: ../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 "联系人"
 
 #: ../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 "联系人编辑器"
 
@@ -1295,11 +1323,12 @@ msgid "Full _Name..."
 msgstr "全名(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "图像"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1312,1251 +1341,1262 @@ msgid "Nic_kname:"
 msgstr "昵称(_K)："
 
 #: ../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 "个人信息"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "电话"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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 "工作"
 
-#: ../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 "地址(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "周年(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "助手(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "生日(_B)："
 
-#: ../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:1893
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "城市(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "公司(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "国家/地区(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "部门(_D)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "存档为(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "忙/闲(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "主页(_H)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "经理(_M)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "注释(_N)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "办公室(_O)："
 
-#: ../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 "邮政邮箱(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "职业(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "配偶(_S)："
 
-#: ../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 "州/省(_S)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "头衔(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "视频聊天(_V)："
 
-#: ../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 "愿意接收 HTML 邮件(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web 日志："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "何处(_W)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "邮政编码(_Z)："
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "地址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "可编辑"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "美国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "阿尔巴尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "阿尔及利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "美洲萨摩亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "安道尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "安圭拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "南极洲"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "安提瓜和巴布达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "亚美尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "阿鲁巴岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "巴哈马群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "巴林岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "孟加拉国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "巴巴多斯岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "白俄罗斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "伯利兹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "贝宁"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "百慕大群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "不丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "玻利维亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "波斯尼亚和黑赛哥维纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "博茨瓦纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "布维岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "英属印度洋地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "文莱德鲁萨兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "保加利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "布基纳法索"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "布隆迪"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "柬埔寨"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "喀麦隆"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "佛得角"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "开曼群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "中非共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "乍得"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "智利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "中国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "圣诞岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "科科斯群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "哥伦比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "科摩罗群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "刚果"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "刚果人民民主共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "库克群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "科特迪瓦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "克罗地亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "古巴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "塞浦路斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "丹麦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "吉布提群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "多米尼加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "多米尼加共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "厄瓜多尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "埃及"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "萨尔瓦多"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "赤道几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "爱沙尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "埃塞俄比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "福克兰群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "斐济"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "法国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "法属波利尼西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "法属南部地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "加蓬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "冈比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "格鲁吉亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "德国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "加纳"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "直布罗陀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "希腊"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "格陵兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "格林纳达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "瓜德罗普岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "关岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "危地马拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "格恩西岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "几内亚比绍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "圭亚那"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "海地"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "赫德和麦克唐纳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "圣座"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "洪都拉斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "中国香港特别行政区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "冰岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "印度"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "以色列"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "意大利"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "牙买加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "日本"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "杰尔西"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "约旦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "哈萨克斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "肯尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "基里巴斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "韩国人民民主共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "韩国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "吉尔吉斯斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "老挝"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "拉脱维亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "莱索托"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "利比里亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "利比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "卢森堡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "中国澳门特别行政区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "马其顿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "马拉维"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "马来西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "马尔代夫"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "马里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "马耳他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "马提尼可岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "毛里塔尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "毛里求斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "马约特岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "摩尔多瓦共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "摩纳哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "蒙特塞拉特群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "莫桑比克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "缅甸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "纳米比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "瑙鲁"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "尼泊尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "荷属安的列斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "新喀里多尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "新西兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "尼日尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "尼日利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "纽埃岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "诺福克岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "北马里亚那群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "挪威"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "帕劳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地区"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "巴拿马"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "巴布亚新几内亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "秘鲁"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "菲利宾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "皮特克恩岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "波兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "卡塔尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "留尼汪"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "罗马尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "俄罗斯联邦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "卢旺达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "圣基德和吉维斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "圣卢西亚岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "圣文森特和格林纳达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "萨摩亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "圣马力诺"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "圣多美和普林西比"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "塞内加尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "塞尔维亚和黑山"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "塞舌尔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "索马里"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "南非"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "南乔治亚和南三文治群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "斯里兰卡"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "圣赫勒拿岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "圣皮埃尔和麦克伦群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "苏丹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "苏里南"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴和尖棉群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "斯威士兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "叙利亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "坦桑尼亚联邦共和国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "泰国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "东帝汶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "多哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "汤加"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "特里尼达和多巴哥"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "突尼斯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "土库曼斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "特克斯和凯科斯群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "图瓦卢"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "乌干达"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "乌克兰"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "美国小型外岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "乌拉圭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "乌兹别克斯坦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "努瓦阿图"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "越南"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "英属处女群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "美属处女群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "瓦利斯和富图纳群岛"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "也门"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "赞比亚"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "姓名"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL 即时通讯程序"
 
-#: ../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 "雅虎通"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu 即时通讯"
 
-#: ../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 "服务"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "位置"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "用户名"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "家庭"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c: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:2259
 msgid "Other"
 msgstr "其它"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "来源地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "目标地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "必需域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../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"
@@ -2564,67 +2604,67 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../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”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "电子邮件(_M)"
 
-#: ../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 "选择地址簿(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr "您确定要删除联系人列表(%s)吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 msgstr "您确定要删除联系人(%s)吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2729,9 +2769,9 @@ msgstr "即时通讯服务(_I)："
 
 #: ../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 "位置(_L)："
 
@@ -2745,6 +2785,9 @@ msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "选择..."
 
@@ -2770,9 +2813,9 @@ msgid "_Members"
 msgstr "成员(_M)"
 
 #: ../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"
@@ -2828,23 +2871,23 @@ msgstr "合并联系人"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "电子邮件"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "任何域含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
@@ -2852,34 +2895,34 @@ msgstr "邮件以此开头"
 msgid "Name contains"
 msgstr "姓名含有"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "无联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 个联系人"
 
-#: ../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 "查询"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "获取名簿视图出错"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "模型"
 
@@ -2887,31 +2930,31 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "姓名以此开头"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "来源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "类型"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "另存为 VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "打开(_O)"
@@ -2965,12 +3008,12 @@ msgid "Cu_t"
 msgstr "剪切(_T)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -2981,14 +3024,20 @@ msgid "P_aste"
 msgstr "粘贴(_A)"
 
 #. 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 "任何类别"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "无匹配"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "助手"
 
@@ -3018,7 +3067,7 @@ msgstr "车载电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3026,7 +3075,7 @@ msgid "Categories"
 msgstr "类别"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "公司"
 
@@ -3075,22 +3124,22 @@ msgid "Journal"
 msgstr "日记"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "经理"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "移动电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "昵称"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "注释"
 
@@ -3119,14 +3168,14 @@ msgid "Radio"
 msgstr "收音机"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3156,55 +3205,55 @@ msgstr "单位"
 msgid "Web Site"
 msgstr "网站"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "宽度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "高度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "有焦点"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "域"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "域名"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "文字模型"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "最大域名长度"
 
@@ -3274,83 +3323,83 @@ msgstr ""
 msgid "Adapter"
 msgstr "适配器"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "工作电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "家庭电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "其它电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "已选择"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "有光标"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: ../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 "复制链接位置(_C)"
 
-#: ../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 "把新信发送到(_S)..."
 
-#: ../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 "复制电子邮件地址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(地图)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "地图"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "列出成员"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "部门"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "职业"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "视频聊天"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c: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:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3361,207 +3410,202 @@ msgstr "视频聊天"
 msgid "Calendar"
 msgstr "日历"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "忙/闲"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "电话"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "传真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Web 日志"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "生日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "纪念日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "职称"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "后台忙"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "仓库脱机"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "地址簿不存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "未定义自身联系人"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "没有权限"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "找不到联系人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "联系人 ID 已经存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "已取消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "无法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "认证失败"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "必须认证"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS 不可用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "没有来源"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "脱机模式下不可用"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "其它错误"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "无效的服务器版本"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "不支持的认证方式"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+#| 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"
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用，或者尚未下载完"
 "成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../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 ""
-"我们无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
-"我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为 LDAP 服务器"
-"已经关闭。"
+"无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
 "LDAP，就必须安装启用了 LDAP 的 Evolution 包。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
-"我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经"
+"无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经"
 "关闭。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
-msgstr "错误细节："
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "错误细节消息："
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3572,56 +3616,56 @@ msgstr ""
 "Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
 "搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../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 ""
-"执行此查询的时间超过了服务器限制，或者超过了您为此地址簿配置的限制。\n"
+"执行此查询的时间超过了服务器限制，或者超过了为此地址簿配置的限制。\n"
 "请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
 "中将时间限制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr "此地址簿的后端无法解析此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr "此地址簿的后端拒绝执行此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "此查询未成功完成。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "修改联系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3633,16 +3677,16 @@ msgstr[0] ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "不显示(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "显示全部联系人(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3651,64 +3695,64 @@ msgstr ""
 "%s 已经存在\n"
 "您打算覆盖它吗？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "覆盖"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "联系人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "选择地址簿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "列表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "多个 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "%s 的 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "联系人信息"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的联系人信息"
@@ -3717,22 +3761,22 @@ msgstr "%s 的联系人信息"
 msgid "Querying Address Book..."
 msgstr "正在查询地址簿..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "有另外 %d 个联系人。"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "显示完整 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "显示紧凑 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "保存在地址簿中"
 
@@ -3741,10 +3785,10 @@ msgid "Card View"
 msgstr "名片视图"
 
 #: ../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 "正在导入..."
 
@@ -3772,19 +3816,19 @@ msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 数据交换格式(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 导入器"
 
@@ -3829,11 +3873,11 @@ msgid "Format"
 msgstr "格式"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c: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:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "页眉"
@@ -3936,9 +3980,9 @@ msgstr "阴影"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c: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 "大小："
 
@@ -3967,29 +4011,8 @@ msgstr "宽度："
 msgid "_Font..."
 msgstr "字体(_F)..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "联系人打印样式编辑器测试"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "版权 (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "这应该测试联系人打印样式编辑器部件"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "联系人打印测试"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "这应该测试联系人打印代码"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c: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 "无法打开文件"
@@ -4002,58 +4025,58 @@ msgstr "无法获得地址簿列表"
 msgid "failed to open book"
 msgstr "打开地址簿失败"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "列出本地地址簿文件夹"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "将名片显示为 vcard 还是 csv 文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "以异步模式导出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "异步模式中一个输出文件中的名片数，默认大小为 100。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "数字"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "命令行参数错误，请使用 --help 选项查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "仅支持 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "在异步模式中，输出必须是文件。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "在普通模式中，不应该有大小选项。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "未处理的错误"
 
@@ -4148,19 +4171,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "您确信您要删除该约会吗？"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗？"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "您确信您要删除该备忘吗？"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗？"
@@ -4178,183 +4201,216 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "您确定想要发送没有摘要的任务吗？"
 
 #: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "日历仓库脱机。"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "无法创建新事件"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "无法保存事件"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "删除备忘列表“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "不发送(_N)"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下载进行中。您想要保存约会吗？"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下载进行中。您想要保存任务吗？"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "无法装入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "将会向全部出席者发送电子邮件邀请，并允许他们接受此任务。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "将会向全部出席者发送电子邮件邀请，并允许他们答复。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "装入日历时出错"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "装入备忘列表出错"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "装入任务列表出错"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "{0} 出错"
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "如果您不发送取消通知，其他出席者也许不知道会议已经取消。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "如果您不发送取消通知，其他出席者可能不知道备忘已经删除。"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "如果您不发送取消通知，其他出席者可能不知道任务已经删除。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "服务器无响应。"
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "保存约会"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "保存备忘"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "保存任务"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "某些特性可能无法在您目前的服务器下工作。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Evolution 日历异常退出。"
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 备忘异常退出。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "备忘列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "无法装入日历"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "您想要保存对此备忘的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../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 "您是否想要为此备忘发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4363,107 +4419,107 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到支持的版本。"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../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 "您已经对此备忘做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 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 "除非您重新启动 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 "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../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 "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}。"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件："
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "无法启动 evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "无法读入 Pilot 的备忘应用程序块"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "无法写入 Pilot 备忘应用程序块"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "默认优先级："
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
-#: ../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 "无法写入 Pilot ToDo 应用程序块"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "日历"
 
@@ -4504,22 +4560,22 @@ msgid "Memo_s"
 msgstr "备忘(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "备忘"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../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
@@ -4540,24 +4596,25 @@ msgstr "任务(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "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] "分钟"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "开始时间"
 
@@ -4568,10 +4625,10 @@ msgstr "约会"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../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:1018
 msgid "Location:"
 msgstr "位置："
 
@@ -4580,52 +4637,56 @@ msgid "Snooze _time:"
 msgstr "午睡时间(_T)："
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr "错过(_D)"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "午睡(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "约会位置"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个提醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4637,7 +4698,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4653,15 +4714,15 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4672,7 +4733,7 @@ msgid "invalid time"
 msgstr "无效时间"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4680,7 +4741,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
 #. 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"
@@ -4690,7 +4751,7 @@ msgstr[0] "%d 分钟"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c: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"
@@ -4702,253 +4763,291 @@ msgid "Alarm programs"
 msgstr "提醒程序"
 
 #: ../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 "在状态栏中显示错误的时间秒数。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "删除项时要求确认"
 
-#: ../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 "今天到期任务的背景颜色，以“#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 "延期任务的背景颜色，以“#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 "运行提醒的日历"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
 
-#: ../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 "在月视图中压缩周末"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "确认销毁"
 
-#: ../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 "标为工作日的日子。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "默认约会提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "默认提醒单位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "默认提醒值"
 
-#: ../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 "保存提醒音频文件的目录"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "事件渐变"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "事件透明度"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "忙/闲服务器 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "忙/闲模板 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "日历视图中事件的渐变。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "隐藏已完成的任务"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "隐藏任务单位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "隐藏任务值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "水平面板位置"
 
-#: ../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 "工作日结束的小时，以 24 小时格式表示，0 到 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 "工作日开始的小时，以 24 小时格式表示，0 到 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 "日视图和工作日视图中显示的间隔，以分钟计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "上次提醒时间"
 
-#: ../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 "大于此级别的消息会被记录。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "列出发表忙/闲的服务器 URL。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 线"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 线颜色 - 日视图"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 线颜色 - 日期栏"
 
-#: ../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 "工作日结束的分钟，0 到 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 "工作日开始的分钟，0 到 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 "月视图水平面板的位置"
 
-#: ../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 "月视图中垂直面板的位置"
 
-#: ../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 "确定默认提醒的单位数量。"
 
-#: ../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 "决定何时隐藏任务的数字单位。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "日历列表和日期导航器日历之间垂直面板的位置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "任务列表和任务预览面板间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../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 "允许提醒运行的程序。"
 
-#: ../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 "保存提醒音频的目录"
 
-#: ../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 "在事件/任务/会议编辑器中显示请回复域"
 
-#: ../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 "在事件/任务/会议编辑器中显示角色域"
 
-#: ../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 "在周视图和月视图中显示约会结束时间"
 
-#: ../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 "在事件/会议/任务编辑器中显示分类域"
 
-#: ../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 "在通知托盘中显示提醒"
 
-#: ../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 "在事件/任务/会议编辑器中显示状态域"
 
-#: ../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 "显示“预览”面板"
 
-#: ../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 "显示“预览”面板。"
 
-#: ../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 "在事件/会议编辑器中显示时区域"
 
-#: ../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 "在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "在日和工作日视图中显示周数"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "在日期导航器中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "今天到期的任务颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "任务垂直面板位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4957,7 +5056,7 @@ msgstr ""
 "用作忙/闲数据发布的 URL 模板，%u 将替换为电子邮件的用户部分，而 %d 将替换为域"
 "名。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4965,202 +5064,211 @@ msgstr ""
 "日历中日期和时间所使用的默认时区，以未翻译的时区数据库位置表示，如“Asia/"
 "Shanghai”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "日视图的第二时区"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "提醒上次运行的时间，以 time_t 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "日历视图中事件的透明度，应该介于 0(透明)和 1(不透明)之间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "二十四小时时间格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "默认提醒的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "决定是否隐藏任务的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "一周开始"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "一周开始的日子，从星期日(0)到星期六(6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是否使用通知托盘来显示提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "删除约会或任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "销毁约会和任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "在月视图中是否压缩周末；压缩时将把周六和周日用一个单元格显示。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在周视图和月视图中显示事件的结束时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在任务视图中隐藏已完成的任务。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否为约会设置默认提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示请回复域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示状态域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "是否在日视图和工作日视图中显示周数。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期导航器中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "在显示事件时使用是否夏时制时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "工作日结束小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "工作日结束分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "工作日开始小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "工作日开始分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "夏时制时间"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "类别为"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "注释含有"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "位置含有"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "无匹配"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "已完成任务"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "打印"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5168,16 +5276,17 @@ msgid ""
 msgstr ""
 "该操作将永久删除所有比选中时间量早的事件。如果您继续，您将无法恢复这些事件。"
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "销毁较早的事件"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "天"
@@ -5186,99 +5295,109 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
 #: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "网上"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "生日和纪念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "天气"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../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 "复制(_C)..."
 
-#: ../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 "标为可脱机使用(_M)"
+
+#: ../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 "不标为可脱机使用(_D)"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "升级日历失败。"
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "无法打开日历“%s”来创建事件和会议"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有可创建事件和会议的日历"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "日历源选择器"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1522
 msgctxt "New"
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "新建会议"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1530
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1538
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1546
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -5288,7 +5407,7 @@ msgstr "日视图"
 
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
-msgstr "周工作视图"
+msgstr "工作日视图"
 
 #: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
@@ -5298,233 +5417,130 @@ msgstr "周视图"
 msgid "Month View"
 msgstr "月视图"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "任何域"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "附件"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "出席者"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "商务"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "类别"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分类"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "完成"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "机密"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "描述含有"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "最爱"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "礼物"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "目标"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "假日"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "节日卡"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "热络"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "想法"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "国际"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "关键客户"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "杂项"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "下一周"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "组织者"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "电话"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "保密"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "公开"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "再现"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "状态"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "战略"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "概要"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "概要含有"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "供应商"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "时间和花费"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "VIP"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "等待"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "含有"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "不含有"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "是"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "打开日历时出错"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "打开日历的方法不支持"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "没有权限打开日历"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "未知的错误"
 
@@ -5561,17 +5577,17 @@ msgid "Mes_sage:"
 msgstr "消息(_S)："
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "播放声音"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "弹出警告"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "运行程序"
 
@@ -5584,7 +5600,7 @@ msgid "Send To:"
 msgstr "发送给："
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "发送电子邮件"
 
@@ -5648,25 +5664,52 @@ msgid "A_dd"
 msgstr "添加(_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "提醒"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "建议自动显示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "添加附件"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../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:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "无"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(在日视图中显示)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5680,58 +5723,58 @@ msgstr ""
 "10 分钟\n"
 "5 分钟"
 
-#: ../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 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">常规</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">任务列表</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">时间</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">工作周</span>"
+msgstr "<span weight=\"bold\">工作日</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "调整夏时制时间(_V)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "一天结束(_E)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "显示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5741,13 +5784,13 @@ msgstr ""
 "小时\n"
 "天"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5765,242 +5808,258 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "周日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "第二时区(_C)："
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "选择用于提醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "显示一条提醒(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "显示一条提醒(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-#: ../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:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "在日视图和工作日视图中显示周数(_U)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "今天到期的任务(_A)："
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "周四(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "模板："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "时区(_Z)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "时间格式："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "一周开始于(_K)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "工作日："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小时(上/下午)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 小时"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "一天开始(_D)："
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "周五(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "周一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "延期任务(_O)："
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "周六(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "时间分割(_T)："
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "周二(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "周三(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "在每次约会前"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
 
-#: ../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 "将任务列表内容复制到本地以进行脱机操作(_Y)"
 
-#: ../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 "将备忘列表内容复制到本地以进行脱机操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "颜色(_R)："
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "备忘列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "此事件已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "此任务已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "此备注已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改，关闭编辑器吗？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "此事件已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "此任务已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "此备注已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗？"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
@@ -6010,354 +6069,359 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr " (完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加的信件 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的信件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "取消拖曳(_D)"
 
-#: ../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:3301 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分配的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "单击此处可关闭当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "将选中文字复制到剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "将选中文字剪切到剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "单击此处可查看可用的帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板中粘贴文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "单击此处可保存当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../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:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "单击此处可便附加文件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "分类为私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../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:1820
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "最近文档(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1839
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1934
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 个附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1966
 msgid "Hide Attachment _Bar"
 msgstr "隐藏附件栏(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1969
+#: ../calendar/gui/dialogs/comp-editor.c:2272
 msgid "Show Attachment _Bar"
 msgstr "显示附件栏(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "显示附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2295
 msgid "Press space key to toggle attachment bar"
 msgstr "按空格键可切换附件栏"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2488
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3363
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "无法打开源"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "无法打开目的"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "无法删除事件，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "无法删除任务，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "无法删除备忘，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "无法删除项目，原因是 corba 错误"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "无法删除事件，原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "无法删除任务，原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "无法删除备忘，原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "无法删除项目，原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "由于错误，无法删除事件"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "由于错误，无法删除任务"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "由于错误，无法删除备忘"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
@@ -6374,181 +6438,164 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "提醒(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "单击此处以设定或取消此事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "再现(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "插入高级发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "切换是否有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "将时间显示为忙(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "切换是否将时间显示为忙"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "忙/闲(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "约会(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "组织者(_G)："
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "添加(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "自定义"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "无"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "约会的 1 天前"
@@ -6624,19 +6671,19 @@ msgstr "联系人(_N)..."
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s”中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "收件人"
 
@@ -6650,58 +6697,62 @@ msgid "T_o:"
 msgstr "到(_O)："
 
 #: ../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 "组(_G)："
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "您即将修改再现事件。您想要修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "您即将代理再现事件。您想要代理何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "您即将修改再现任务。您想要修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "您即将修改再现备忘。您想要修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "只是本次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "本次和以前各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "本次和以后各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "所有各次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的再现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "在"
 
@@ -6709,7 +6760,7 @@ msgstr "在"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "第一个"
 
@@ -6718,7 +6769,7 @@ msgstr "第一个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "第二"
 
@@ -6726,7 +6777,7 @@ msgstr "第二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "第三个"
 
@@ -6734,7 +6785,7 @@ msgstr "第三个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "第四个"
 
@@ -6742,13 +6793,13 @@ msgstr "第四个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "最后一个"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6756,7 +6807,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -6764,7 +6815,7 @@ msgstr "上旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -6772,45 +6823,45 @@ msgstr "中旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "下旬"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "无法获得要修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "无法获得要删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -6861,6 +6912,10 @@ msgstr "周"
 msgid "year(s)"
 msgstr "年"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -6881,55 +6936,55 @@ msgstr "<span weight=\"bold\">状态</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "已完成"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "高"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "进行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6942,7 +6997,7 @@ msgid "Stat_us:"
 msgstr "状态(_U)："
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "未定义"
 
@@ -6968,28 +7023,28 @@ msgid "Click to change or view the status details of the task"
 msgstr "单击可更改或查看任务的状态细节"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "发送选项(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "任务细节"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "组织者(_Z)："
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
@@ -7011,129 +7066,129 @@ msgid "Time zone:"
 msgstr "时区："
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 周"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "执行未知的动作"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "在约会开始之前 %s %s"
 
 #. 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"
 
 #. 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"
 
 #. 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"
 
 #. 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"
 
 #. 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"
 
 #. 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 "在 %2$s 时 %1$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 为未知触发类型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "开始日期："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "描述："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "网页："
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "概要："
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "到期日期："
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../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:1043
 msgid "Status:"
 msgstr "状态："
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "优先级："
 
@@ -7147,17 +7202,17 @@ msgid "Start Date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "空闲"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "繁忙"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7167,225 +7222,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../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:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../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:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "选择保存选中附件的文件夹..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "保存选中(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者：%s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者：%s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "开始："
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "到期："
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "打印(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "分配任务(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "标记为未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "把任务标记为未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "删除选中任务(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "单击以添加任务"
@@ -7408,8 +7463,8 @@ msgid "Due date"
 msgstr "到期日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "优先级"
 
@@ -7417,108 +7472,153 @@ msgstr "优先级"
 msgid "Start date"
 msgstr "开始日期"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "状态"
+
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "移动项目"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "复制项目"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "新建会议(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "当前视图(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "选择今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "打印(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "代理会议(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "将此次发生变为可移动(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "接受"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "拒绝"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "暂时的"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "被委任的"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "需要动作"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间：%s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%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 "%Y-%m-%d %A %p%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"
@@ -7531,418 +7631,418 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "显示第二时区"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "下午"
 
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "第%d周"
+
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "每 %d 天"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每 %d 周"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "每 %d 周的"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " 和 "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "第 %s 天属于"
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 属于"
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "每 %d 月"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每 %d 年"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
-msgstr[0] " 总计 %d 次"
+msgid_plural "a total of %d times"
+msgstr[0] "总计 %d 次"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr "，结束于 "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "开始"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "结束"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "到期"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "未知的人"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "接受"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "拒绝"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "会议已经被取消，但无法在您的日历中找到该会议"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "任务已经被取消，但无法在您的任务列表中找到该任务"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "会议信息"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已有的会议。"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "会议答复"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "会议取消"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信件。"
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "错误的会议信件"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "任务信息"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "任务建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s<b> 希望加入到已有的任务。"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "任务更新"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务分配。"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "任务回复"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 取消了任务。"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "任务取消"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "错误的任务信件"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信件"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "信件的格式可能不正确"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "信件只含有不支持的请求。"
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日历信件"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前出席者。将响应者加为出席者吗？"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新出席者状态！\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "请回复"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
@@ -7970,112 +8070,93 @@ msgstr "正在装入日历..."
 msgid "Server Message:"
 msgstr "服务器消息："
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "需要动作"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "暂时的"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "被委任的"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "出席者                            "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "请回复"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "处理中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -8084,7 +8165,7 @@ msgstr "%Y年%m月%d日%A"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -8094,67 +8175,67 @@ msgstr "%Y年%m月%d日%A"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "出席者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
@@ -8182,16 +8263,15 @@ msgstr "语言"
 msgid "Member"
 msgstr "成员"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "删除选中备忘(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8200,16 +8280,16 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "装入备忘"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
@@ -8217,63 +8297,63 @@ msgstr "正在删除选中的对象..."
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "正在完成任务..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "选择时区"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "自定义视图(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "保存自定义视图(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "定义视图(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入位于 %s 的约会"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入位于 %s 的任务"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "装入位于 %s 的备忘"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "销毁"
 
@@ -8342,19 +8422,19 @@ msgstr "必须设定组织者。"
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
@@ -8362,111 +8442,166 @@ msgstr "忙闲信息"
 msgid "Calendar information"
 msgstr "日历信息"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "接受"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "暂时接受"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "拒绝"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "被委任的"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "取消"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "新建备忘列表(_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已选中 %d 个"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "升级备忘失败。"
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "无法打开备忘列表“%s”来创建事件和会议"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "没有可创建备忘的日历"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "备忘来源选择器"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "新建备忘"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1176
 msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "新建共享备忘"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1184
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "共享备忘(_S)"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "创建新的共享备忘"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1192
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "备忘列表(_S)"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "打印备忘"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "下一周"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8514,273 +8649,267 @@ msgstr "无法升迁任务“%s”"
 msgid "Notes"
 msgstr "笔记"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31日"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "六"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "出席者："
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "联系人："
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "升级任务失败。"
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "无法打开任务列表“%s”来创建事件和会议"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "没有可创建任务的日历"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "任务来源选择器"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "新建任务"
 
-#: ../calendar/gui/tasks-component.c:1326
-#, fuzzy
-msgctxt "New"
-msgid "_Task"
-msgstr "任务(_T)"
-
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "新建分配的任务"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1248
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分配的任务(_D)"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "创建新分配的任务"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "新建任务列表"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1256
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "任务列表(_K)"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8791,11 +8920,11 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "打印任务"
 
@@ -8804,57 +8933,57 @@ msgstr "打印任务"
 msgid "% Completed"
 msgstr "% 完成"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "进行中"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "大于"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "小于"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 文件(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
@@ -10407,247 +10536,251 @@ msgstr "太平洋/沃利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "无法打开自动保存文件"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器获取信件"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "插入附件"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "附件(_T)"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "无标题信件"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "添加附件"
 
-#: ../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 "关闭(_C)"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "关闭当前文件"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "保存当前文件"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "用不同的文件名保存当前文件"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "保存草稿(_D)"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
+msgstr "另存为草稿(_D)"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "另存为草稿"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "发送(_E)"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "发送这封信"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "插入发送选项"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "新建信件(_M)"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "打开新建信件窗口"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "字符编码(_E)"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "安全(_S)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "用 PGP 加密该信件"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "PGP 签名(_S)"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该信件"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "标为优先(_P)"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "将信件设定为高优先级"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "请求阅读收条(_Q)"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "当您的信件被阅读时得到投递通知"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 加密(_C)"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "用您的 S/MIME 加密证书加密该信件"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 签名(_N)"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该信件"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "暗送域(_B)"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "是否显示暗中转发域"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "抄送域(_C)"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "是否显示转发域"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "发件人域(_F)"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "是否显示发件人选择器"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "投递到域(_P)"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "是否显示投递到域"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "主题域(_C)"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "切换是否显示主题域"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "收件人域(_T)"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "是否显示寄给域"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "保存草稿"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "输入信件的收件人"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该信件副本的收件人地址"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "输入将接收该信件副本，但不出现在收件人列表中的收件人地址"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "发件人(_O)："
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "回复到(_R)："
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "收信人(_T)："
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "抄送(_C)："
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "暗送(_B)："
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "投递到(_P)："
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "签名(_G)："
 
@@ -10667,37 +10800,37 @@ msgstr "选择要将信件投递到哪个文件夹。"
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "显示附件栏(_A)"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签名：未对此账户设置签名证书"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密证书"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "隐藏附件栏(_A)"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "撰写新信件"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10780,9 +10913,9 @@ msgstr "在您上次编写新信件时 Evolution 意外退出。恢复邮件将�
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
-msgstr "发送选项只适用于 Novell Groupwise 和 Microsoft Exchange 账户。"
+msgstr "发送选项只适用于 Novell GroupWise 和 Microsoft Exchange 账户。"
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -10850,7 +10983,7 @@ msgstr "保存草稿(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 邮件及日历"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -10866,40 +10999,97 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "日历信息"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolution 错误"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolution 信息"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolution 查询"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "内部错误，请求了未知的错误“%s”"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "组件"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "记录日志的组件名称"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "调试日志"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "在状态栏显示错误(_E)"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "秒。"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "日志消息："
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "日志级别"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "时间"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "信件"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "警告和错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "调试"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "错误，警告和调试信息"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "已启用"
 
@@ -10948,164 +11138,168 @@ msgstr "覆盖文件吗？"
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "无法打开链接。"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "无法显示 Evolution 的帮助。"
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "个人(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "待办(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "稍候(_L)"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "标签名称(_N)："
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "编辑标签"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "添加标签"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "标签名称不能为空。"
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "服务器上已存在同名的标签。请重命名您的标签。"
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf 错误：%s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "后续所有的错误都只显示在终端。"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d 秒内"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d 分钟内"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d 小时内"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d 内"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 周前"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d 周内"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月前"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 个月内"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d 年内"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<单击此处以选择日期>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "现在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
@@ -11118,56 +11312,56 @@ msgstr "选择文件"
 msgid "Test"
 msgstr "测试"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "规则名(_U)："
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "添加过滤规则(_D)"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "添加动作(_D)"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
 msgstr "如果满足所有条件"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
 msgstr "如果满足任一条件"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "查找项目(_F)："
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "回复"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "包含线索(_N)"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -11261,7 +11455,7 @@ msgstr "未来"
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "秒"
 
@@ -11273,10 +11467,11 @@ msgstr "当前时间"
 msgid "the time you specify"
 msgstr "您指定的时间"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "周"
 
@@ -11284,15 +11479,15 @@ msgstr "周"
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "规则名"
 
@@ -11345,8 +11540,8 @@ msgstr "Evolution 邮件首选项控件"
 msgid "Evolution Network configuration control"
 msgstr "Evolution 网络配置控件"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
 #: ../mail/mail-component.c:597 ../mail/mail-component.c:598
 #: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
@@ -11359,7 +11554,7 @@ msgid "Mail Accounts"
 msgstr "邮件账户"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
@@ -11371,12 +11566,12 @@ msgstr "网络首选项"
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 许可协议"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11388,64 +11583,64 @@ msgstr ""
 "请仔细阅读下方显示的 %s 许可协议\n"
 "并选中复选框表明您接受该协议\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "每封信都询问"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "标识"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "默认"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "安全"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
@@ -11463,19 +11658,19 @@ msgid "Protocol"
 msgstr "协议"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "语言"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "添加签名脚本"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "签名"
 
@@ -11483,14 +11678,23 @@ msgstr "签名"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的信件 --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "未知发件人"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11498,7 +11702,7 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender}写道："
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-------- 原始信件 --------"
 
@@ -11548,7 +11752,7 @@ msgid "Date sent"
 msgstr "发送日期"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11627,7 +11831,7 @@ msgstr "未设置"
 msgid "is set"
 msgstr "已设置"
 
-#: ../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 "垃圾"
@@ -11636,7 +11840,7 @@ msgstr "垃圾"
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "标签"
 
@@ -11676,48 +11880,51 @@ msgstr "管道到程序"
 msgid "Play Sound"
 msgstr "播放声音"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件人"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "正则表达式匹配"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "已回复到"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "返回"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "返回小于"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "运行程序"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "分数"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "发送者"
 
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "发送者或接收者"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "设置标签"
@@ -11752,9 +11959,9 @@ msgstr "停止处理"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "主题"
 
@@ -11771,51 +11978,51 @@ msgstr "然后"
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "全部信件"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "未读信件"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "无标签"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "已读信件"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "最近信件"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信件"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "有附件的信件"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "重要信件"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "不是垃圾邮件"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "账户搜索"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "全部账户搜索"
 
@@ -11843,15 +12050,15 @@ msgid "Quota usage"
 msgstr "配额使用"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "文件夹属性"
@@ -11868,9 +12075,9 @@ msgstr "创建(_R)"
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "搜索文件夹"
 
@@ -11879,19 +12086,24 @@ msgstr "搜索文件夹"
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "模板"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "发件箱"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "已发箱"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "正在装入..."
 
@@ -11930,12 +12142,12 @@ msgstr "移动文件夹“%s”"
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件复制到文件夹 %s"
@@ -11952,331 +12164,331 @@ msgstr "复制到文件夹(_C)"
 msgid "_Move to Folder"
 msgstr "移至文件夹(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s”中扫描文件夹"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "移动(_M)..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "重命名(_R)..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "刷新(_F)"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "清空发件箱(_U)"
 
-#: ../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 "清空回收站(_E)"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "未读搜索文件夹(_U)"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "把“%s”复制到 %s"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "邮件删除失败"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您没有足够的权限删除此邮件。"
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../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 "转发(_F)"
 
 #. 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 "作为新信件进行编辑(_E)..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "标记为不重要(_I)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "标签(_L)"
 
 #. 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 "无(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "根据信件创建规则(_T)"
 
 #. 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 "基于主题的搜索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "基于发件人的搜索文件夹(_N)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "基于收件人的搜索文件夹(_R)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "基于邮件列表的搜索文件夹(_L)"
 
 #. 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 "基于主题过滤(_J)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "无法获取信件"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "正在收取信件..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "呼叫到(_A)..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "创建搜索文件夹(_S)"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "单击以呼叫 %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "查找(_D)："
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "匹配大小写(_A)"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此信件已签名，而且签名是有效的。这意味着这封信应该是可信的。"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "签名有效，但是无法校验发送者"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "签名已存在，但需要公钥"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "这封信的签名有效，但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12285,21 +12497,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12308,86 +12520,86 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%m月%d日%A，%p%l:%M完成"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%p%l:%M"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "适合宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "显示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "附件另存为"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "保存所选(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 个附件(_T)"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "保存(_A)"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "全部保存(_A)"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "无附件"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "无格式查看(_U)"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "无格式隐藏(_U)"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "打开方式(_P)"
 
-#: ../mail/em-format-html-display.c:2473
+#: ../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."
@@ -12460,7 +12672,7 @@ msgstr "密件抄送"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "邮件程序"
 
@@ -12477,14 +12689,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "发件人"
 
@@ -12494,8 +12706,8 @@ msgid "Reply-To"
 msgstr "回复至"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "日期"
 
@@ -12503,105 +12715,110 @@ msgstr "日期"
 msgid "Newsgroups"
 msgstr "新闻组"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "头像"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "无法解析 S/MIME 信件：未知错误"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 信件。显示源文本。"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "不支持 multipart/encrypted 的加密类型"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "无法解析 PGP/MIME 信件"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "无法解析 PGP/MIME 信件：未知错误"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "不支持的签名格式"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "校验签名错误"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "校验签名发生了未知错误"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "无法分析 PGP 信件"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "无法解析 PGP 信件：未知错误"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "每次"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "每天一次"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "每周一次"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "添加自定义垃圾信头"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "信头名称："
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "信头值含有："
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "包含值"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "颜色"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "标签"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s 插件可用，二进制文件已经安装。"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 插件不可用。请检查软件包是否已安装。"
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "没有可用的垃圾邮件插件"
 
@@ -12661,24 +12878,23 @@ msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "创建本地邮件存储“%s”失败：%s"
 
-#: ../mail/em-migrate.c:2898
-#, fuzzy
+#: ../mail/em-migrate.c:2952
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"自 Evolution 2.4 之后，Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "无法在“%s”创建本地邮件文件夹：%s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12686,65 +12902,65 @@ msgstr ""
 "无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
 "坏。"
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
 
-#: ../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 "回复邮件列表(_L)"
 
 #. 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 "添加到地址簿(_A)"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储不支持订阅，或订阅未启用。"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "没有选中服务器"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "信件"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "保存信件..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "添加地址"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信件"
@@ -12770,17 +12986,13 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "“发送和接收邮件”窗口宽度"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "允许 Evolution 显示被限制大小的文本部分"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "总是请求阅读收条"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "在状态栏中显示错误的时间秒数。"
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "自动识别表情图标"
@@ -12827,8 +13039,7 @@ msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数�
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
-msgstr ""
-"控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
+msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
@@ -12909,9 +13120,9 @@ msgid ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"决定是否在地址簿中查找发件人电子邮件。如果找到，则不应是垃圾邮件。这将在标记为"
-"自动补全的地址簿中查找，如果远程地址簿(如 LDAP)被标记为自动补全的话，可能会比"
-"较慢。"
+"决定是否在地址簿中查找发件人电子邮件。如果找到，则不应是垃圾邮件。这将在标记"
+"为自动补全的地址簿中查找，如果远程地址簿(如 LDAP)被标记为自动补全的话，可能会"
+"比较慢。"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
@@ -12941,8 +13152,8 @@ msgid "Directory for saving mail component files."
 msgstr "保存邮件组件文件的目录。"
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "禁用或启用文件夹数中文件夹名的省略显示"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13009,47 +13220,64 @@ msgstr "允许渲染被限制大小的信件文本部分。"
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "信件列表面板的高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隐藏单文件夹预览并移除选择"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果用户试图一次打开的信件大于等于十封，将会询问用户是否真的要这么做。"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "如果开启了“预览”面板，则以并列方式显示，而不是垂直方式显示。"
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:63
+#, 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."
+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 ""
 "如果 Evolution 内没有特定 MIME 类型的内置查看器，那么出现在此列表中的任何 "
 "MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
 "内容。"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13058,23 +13286,23 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "禁用/启用对多封邮件的标记。"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 msgstr "禁用/启用在进入离线模式前的是否需要离线同步的不停的提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13082,31 +13310,31 @@ msgid ""
 msgstr ""
 "禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信件时不断弹出的提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "上次清空垃圾邮件的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "上次清空回收站的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "大于此级别的消息会被记录。"
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "列出接受的许可"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "账户列表"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13114,15 +13342,15 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /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 "自定义头及该头是否启用。"
 
-#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13130,272 +13358,271 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”，其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-
-#: ../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 "列出接受协议的协议名称。"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
 msgstr "在 HTML 信件中装入 HTTP 图像"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"在 HTML 信件中装入 http(s) 图像。可供选择的值有：0 - 决不从网上装入图像，1 - "
+"在 HTML 信件中装入 HTTP(S) 图像。可供选择的值有：0 - 绝不从网上装入图像，1 - "
 "如果发送者在地址簿中则装入图像，2 - 总是从网上装入图像。"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信件“预览”中标出引用"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信件“预览”中标出引用。"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "信件窗口默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "信件窗口默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "信件显示风格(普通、全部邮件头、源代码)"
+msgstr "信件显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信件的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空回收站的最少天数"
 
-#: ../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 "退出时清空垃圾信件的最少时间，以天计。"
 
-#: ../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 "退出时清空回收站的最少天数。"
 
-#: ../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 "要在 TO/CC/BCC 中显示的地址数"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../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 "用户视图销毁文件夹时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "用户视图发送没有主题的邮件时提示。"
 
-#: ../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 "用户想立即离线时提示检查"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除搜索文件夹中的信件时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入 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 "当用户试图一次打开超过十封信时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "当用户试图发送没有 To 或 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 "当用户是否发送意外的 HTML 时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "标记多封信件时提示"
 
-#: ../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 "识别文本中的表情，并将其替换为图像。"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "识别文本中的链接并进行替换。"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件运行垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "保存目录"
 
-#: ../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 "在本地地址薄中搜索发件人照片"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "默认以 HTML 发送邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "默认以 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 "在信件列表中显示 email 地址列"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "服务器同步间隔"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../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 "在信件列表中显示删除了的信件(带有删除线)。"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "在信件列表中显示删除了的信件"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "显示发件人照片"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
 
-#: ../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 "在信件阅读面板中显示发件人照片。"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "内嵌拼写检查"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "拼写检查颜色"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "拼写检查语言"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "订阅对话框默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "订阅对话框默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "文本信件部分限制"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信件钩子插件"
 
-#: ../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 "上次清空垃圾信件的时间，以自新纪元后的天数显示。"
 
-#: ../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 "上次清空回收站的时间，以新纪元后的天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, 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 interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB，单位"
 "为 KB。"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13404,7 +13631,7 @@ msgstr ""
 "这是默认的垃圾邮件插件，即使启用了多个插件。如果默认列出的插件被禁用，它不会"
 "缺省到其它可用的插件。"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
@@ -13413,7 +13640,7 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13423,30 +13650,30 @@ msgstr ""
 "此键应包含指定自定义邮件头的 XML 结构列表，以及是否显示这些邮件头。XML 结构的"
 "格式为：&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "此选项能帮助提高获取信件的速度"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "设定默认信件视图中要显示的地址数，超过的部分显示为“...”。"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13455,129 +13682,129 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
 "启 Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "按线索编排信件列表。"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "将信件标为已看的超时时长"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "将信件标为已看的超时时长。"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "默认账户的 UID 字符串。"
 
-#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "使用垃圾克星守护程序和客户"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾邮件测试(无 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "使用并排还是宽屏布局"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "选中了查看/Bcc 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "选中了查看/Bcc 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "选中了查看/Cc 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "选中了查看/Cc 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "选中了查看/From 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "选中了查看/From 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "选中了查看/PostTo 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "选中了查看/PostTo 菜单项。"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "选中了查看/ReplyTo 菜单项"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "选中了查看/ReplyTo 菜单项。"
 
-#: ../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 "是否默认对所有信件添加阅读收条请求。"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
 
-#: ../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 "是否以线索中的最新信件来排序线索"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "信件列表面板的高度。"
 
@@ -13593,78 +13820,72 @@ msgstr "Evolution Elm 导入器"
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "目的文件夹："
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入器 Berkeley 邮箱格式文件夹"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "导入“%s”"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "扫描 %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "导入 Pine 数据"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "从 Pine 导入邮件。"
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "模板"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13713,92 +13934,36 @@ msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "新建信件"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "信件(_M)"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "撰写一封新信"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "新建邮件文件夹"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升级邮件设置或文件夹失败。"
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "错误"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "错误"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "警告和错误"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "调试"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "错误，警告和调试信息"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "调试日志"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "在状态栏显示错误(_E)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "秒。"
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "日志消息："
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "日志级别"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "时间"
-
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "信件"
-
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "关闭此窗口"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "检查支持的类型(_E)"
@@ -14076,126 +14241,125 @@ msgid "Empty trash folders on e_xit"
 msgstr "退出时清空已删除邮件(_X)"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
 msgstr "启用魔术空格键(_P)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "启用搜索文件夹(_R)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "加密证书(_P)："
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密寄出的信件(默认)(_G)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "等宽(_X)："
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "等宽字体(_E)："
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "字体属性"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化信件(_H)"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "全名(_E)："
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "HTML 信件"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "HTTP 代理服务器(_T)："
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "嵌入"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "嵌入(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 "标签"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "语言表"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "信件撰写器"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "不使用代理的情况(_P)："
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "注意：标签名中的下划线被用作菜单中的助记符。"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：直到您第一次连接的时候，才会询问密码。"
 
-#: ../mail/mail-config.glade.h:109
-#, fuzzy
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "如果找到匹配的自定义垃圾信头，此选项将被覆盖。"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "密码(_W)："
 
-#: ../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."
@@ -14203,7 +14367,7 @@ msgstr ""
 "请在下面的空白处输入此账户的描述性名称。\n"
 "此名称将只在显示时使用。"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14211,7 +14375,7 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14220,121 +14384,129 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "请从以下选项中选择"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "端口："
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "发送只有暗送收件人的信件时提示(_O)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "记住密码(_M)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "回复到(_P)："
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "记住密码(_P)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "SOCKS 主机(_O)："
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "仅在本地地址簿中搜索发件人照片(_E)"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "选择(_E)..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "发送信件收条(_E)："
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "标准字体(_T)："
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "选择草稿文件夹"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打印的 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "选择已发文件夹"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "发送邮件"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "已发送信件文件夹(_M)："
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N)："
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "签名(_U)："
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "签名"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "签名表"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "回复时在底部开始打字(_T)"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "类型(_Y)："
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "在此列出的语言反映了您所安装的字典。"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14343,7 +14515,7 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: ../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\""
@@ -14351,26 +14523,26 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "用户名(_E)："
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "使用身份验证(_N)"
 
-#: ../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 "用户名(_N)："
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "变宽(_A)："
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14380,124 +14552,124 @@ msgstr ""
 "\n"
 "单击“前进”开始。"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "添加签名(_A)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "总是从 Internet 上装入图像(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "自动代理服务器配置 URL(_A)："
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "默认的垃圾邮件插件(_D)："
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "直接连接到 Internet(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr "回复时保留原始信件的签名(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "装入来自联系人的邮件中的图像(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "仅在本地地址簿中查阅(_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "使它成为我的默认账户(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "手动代理服务器配置(_M)："
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "把信件标记为已读前等(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "绝不从 Internet 装入图像(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: ../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 "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "发送空主题行的信件时提示(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "脚本(_S)："
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "安全 HTTP 代理(_S)："
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "选择(_S)..."
 
 #. 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 "显示图像动画(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在电子邮件预览中显示发送者的照片(_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "使用安全连接(_U)："
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "使用默认值(_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "个地址"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "颜色"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "描述"
 
@@ -14545,7 +14717,7 @@ msgstr "查找(_I)："
 msgid "Find in Message"
 msgstr "在信件中查找"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
@@ -14597,26 +14769,26 @@ msgstr "标志(_F)："
 msgid "_Tick this to accept the license agreement"
 msgstr "选中此处以表明您接受许可协议(_T)"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "过滤选中的信件"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14625,121 +14797,121 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "发送信件"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第%d封信，共%d封"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "在第%d封信失败，共%d封"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "把信件保存到文件夹中"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把信件移至 %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把信件复制到 %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "转发的信件"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "打开文件夹 %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "正在获取文件加 %s 的配额信息"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "打开存储 %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "删除文件夹 %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储账户“%s”"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储账户“%s”"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "刷新文件夹"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "销毁文件夹"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的回收站"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "收取信件 %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收取 %d 封信"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "保存 %d 封信"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14748,11 +14920,11 @@ msgstr ""
 "在将信件保存到 %s 时发生错误：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "保存附件"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14761,27 +14933,27 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新连接到 %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备脱机使用账户“%s”"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "检查服务"
 
@@ -14797,39 +14969,39 @@ msgstr "发送和接收邮件"
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "检查新邮件"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "输入 %s 的密码"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
@@ -14874,21 +15046,21 @@ msgstr "无效的文件夹：“%s”"
 msgid "Setting up Search Folder: %s"
 msgstr "设置搜索文件夹：%s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新“%s:%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新“%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "编辑搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
@@ -15470,85 +15642,85 @@ msgstr "销毁(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信件"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%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 "昨天%p%l:%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%p%l:%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 "%m月%d日%p%l:%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 "%Y年%m月%d日"
 
 #. 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 "生成信件列表"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信件。"
 
@@ -15581,39 +15753,43 @@ msgstr "已发信件"
 msgid "Size"
 msgstr "大小"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "主题 - 被截断"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "呼叫"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "不要转发"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "跟随"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "给您的信息"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "转发"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "不必回复"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回复"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回复"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "回顾"
 
@@ -15665,8 +15841,8 @@ msgid ""
 "body."
 msgstr "消息主体中的用于附件提醒插件的线索列表。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "关键字"
 
@@ -15696,9 +15872,13 @@ msgid "_Edit Message"
 msgstr "编辑信件(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid ""
+#| "A formatter plugin which displays audio attachments inline and allows you "
+#| "to play them directly from evolution."
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "一个格式化插件，该插件将就地显示音频附件，允许您从 Evolution 中直接播放。"
 
@@ -15918,35 +16098,35 @@ msgstr "恢复设置(_E)..."
 msgid "_Backup Settings..."
 msgstr "备份设置(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -15964,27 +16144,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, fuzzy, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "打印时发生了错误"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
 msgid "Convert message text to _Unicode"
 msgstr "将信件文本转换为 _Unicode"
 
@@ -16011,21 +16191,31 @@ msgstr "Bogofilter 垃圾选项"
 msgid "Filters junk messages using Bogofilter."
 msgstr "使用 Bogofilter 过滤垃圾信件。"
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL："
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "刷新(_F)："
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV 日历资源"
@@ -16042,13 +16232,6 @@ msgstr "装入日历"
 msgid "Provides core functionality for local calendars."
 msgstr "提供本地日历的核心功能。"
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "刷新(_F)："
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "安全连接(_S)"
@@ -16065,48 +16248,63 @@ msgstr "HTTP 日历"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "提供 webcal 和 http 日历的核心功能。"
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "天气：多云"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "天气：雾"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "天气：少云"
+msgid "Weather: Cloudy"
+msgstr "天气：多云"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "天气：雨"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "天气：多云"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "天气：雨"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "天气：雪"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "天气：雪"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "天气：晴"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Weather: Clear Night"
+msgstr "天气月历"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "天气：暴风雨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "选择一个位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "单位(_U)："
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(摄氏、厘米等等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(华氏、英寸等等)"
 
@@ -16150,7 +16348,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端？"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16180,16 +16378,16 @@ msgid ""
 "default one."
 msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "自定义信头(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "键"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "值"
 
@@ -16224,6 +16422,12 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "打开其他用户的文件夹"
@@ -16241,32 +16445,32 @@ msgid "_User:"
 msgstr "用户(_U)："
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "安全密码"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "此选项将使用安全密码(NTLM)身份验证连接到 Exchange 服务器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "纯文本密码"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "办公室以外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16274,88 +16478,92 @@ msgstr ""
 "在您位于办公室外时，如果有人给您发送邮件，则会自动将下面指定的信件\n"
 "送回。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "我正在办公室外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "我正在办公室内"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "更改 Exchange 账户的密码"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "更改密码"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 账户的代理设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "代理助手"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "杂项"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "查看所有 Exchange 文件夹的大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "文件夹大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange 设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "身份验证(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "指定邮箱名(_P)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "邮件(_M)："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "身份验证类型(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "检查支持的类型(_E)"
 
-#: ../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."
@@ -16397,32 +16605,32 @@ msgstr "您目前的密码已经过期。请立即更改您的密码。"
 msgid "Your password will expire in the next %d days"
 msgstr "您的密码即将于 %d 后过期"
 
-#: ../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 "自定义"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "编辑(读取、创建、编辑)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "作者(读取、创建)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "复查者(只读)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "代理权限"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16431,7 +16639,7 @@ msgstr "%s 的权限"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16441,25 +16649,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "你在我的文件夹上拥有下列权限："
 
 #. 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 "你还可以查看我的私人项目。"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "但是你不能查看我的私人项目。"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "您现在已经被授权为 %s 的代理人"
@@ -16660,8 +16868,8 @@ msgstr "添加用户："
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "添加用户"
 
@@ -16779,11 +16987,11 @@ msgstr "敏感度(_S)："
 msgid "_User"
 msgstr "用户(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "选择用户"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "地址簿..."
 
@@ -16806,32 +17014,36 @@ msgid "Exchange Operations"
 msgstr "Exchange 操作"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "因为配置文件问题无法更改密码。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "无法显示文件夹。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "无法执行操作。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr "对 Exchange 账户“{0}”配置的更改将在您退出并重新启动 Evolution 后生效。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "无法认证到服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "无法更改密码。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -16840,59 +17052,59 @@ msgstr ""
 "无法配置 Exchange 账户，原因是发生了未知错误。请检查 URL、用户名、密码，然后"
 "再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "无法连接到 Exchange 服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "无法连接到服务器 {0}。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "无法确定代理人的文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "找不到 Exchange Web 存储系统。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "无法定位服务器 {0}。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "无法授权给 {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "无法读取文件夹权限"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "无法读取文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "无法读取不在办公室状态"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "无法更新文件夹权限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "无法更新不在办公室状态"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Exchange 账户脱机。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16916,102 +17128,102 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "更新代理人失败："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "文件夹已经存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "文件夹不存在"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "文件夹脱机"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "常规错误"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "全局目录服务器无法访问"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr "如果 OWA 运行于不同的路径上，您必须在账户配置对话框中指定该路径。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} 的邮箱不在此服务器上。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "请确定 URL 正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "请确定服务器名称拼写正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "请确定用户名和密码正确，然后再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "没有为此账户配置全局编目服务器。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "用户 {0} 在 {1} 上没有邮箱。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "没有用户 {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "密码已经成功更改。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "请输入一个代理人 ID 或取消选中“以代理人身份发送”选项。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "请确定全局目录服务器名称正确。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "请重新启动 Evolution 以便使得更改生效"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "请选择用户。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "服务器拒绝了密码，因为该密码的安全级别太低。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "当您退出 Evolution 时，Exchange 账户将被禁用"
 
-#: ../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 "当您退出 Evolution 时 Exchange 账户将被删除"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17019,7 +17231,7 @@ msgstr ""
 "服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
 "2000 和 2003。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17032,88 +17244,88 @@ msgstr ""
 "\n"
 "或者，您可能拼错了密码。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "请用不同的密码再试一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "无法将用户添加到访问控制列表中："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "无法编辑代理人。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "查阅 {0} 时发生未知错误"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "未知类型"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "您即将用完您在此服务器上的存储邮件的配额。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "您被允许每次只能够以一个(而非多个)代理人的身份发送信件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "您不能授权给您自己"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "您已经超过了在此服务器上存储邮件的配额。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "您只能配置单个 Exchange 账户。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr "您目前使用了 {0} KB。您将无法发送邮件，除非您通过删除邮件来清理空间。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "您的密码已经过期。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} 无法添加到访问控制列表中"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} 已被授权"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} 已经在列表中"
 
@@ -17206,18 +17418,14 @@ msgstr ""
 "象。它以 base64 编码并保存在 ~/.evolution/faces 下。这将在以后发出的邮件中使"
 "用。"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "头像"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "无法退订文件夹“%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 "允许在文件夹树的快捷菜单中退订邮件文件夹。"
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr "允许在侧边栏的快捷菜单中退订邮件文件夹。"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17229,43 +17437,41 @@ msgstr "退订(_U)"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "请先输入用户名。"
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "输入用户 %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"
 "%s"
-msgstr "无法从 Google 服务器上读取数据。\n%s"
+msgstr ""
+"无法从 Google 服务器上读取数据。\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "日历(_E)："
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "获取列表(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>服务器</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "设置 Google 日历和联系人的插件。"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17277,14 +17483,14 @@ msgid "Checklist"
 msgstr "待办清单"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "设置 Groupwise 日历和联系人源的插件。"
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "设置 GroupWise 日历和联系人源的插件。"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Groupwise 账户设置"
+msgid "GroupWise Account Setup"
+msgstr "GroupWise 账户设置"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17309,11 +17515,11 @@ msgstr ""
 "单击“前进”可安装共享文件夹\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "安装共享文件夹"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "共享文件夹安装"
 
@@ -17339,7 +17545,7 @@ msgid "Email:"
 msgstr "电子邮件："
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "禁用(_D)"
 
@@ -17371,15 +17577,21 @@ msgid "Retract Mail"
 msgstr "收回邮件"
 
 #: ../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"
+msgid "Add Send Options to GroupWise messages"
 msgstr "将发送选项添加到 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."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Groupwise 账户特性的插件。"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+#| msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Groupwise 特性"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17397,22 +17609,25 @@ msgstr "将选中邮件转换为新任务"
 msgid "Invalid user"
 msgstr "无效用户"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "无法保存到文件“{0}”。"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "指定用户"
 
-#: ../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
 #, fuzzy
 msgid "You have already given proxy permissions to this user."
 msgstr "你在我的文件夹上拥有下列权限："
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 
@@ -17436,23 +17651,25 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "将此事件标为重复发生"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
 msgid "Would you like to accept it?"
 msgstr "您希望保存更改吗？"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 #, fuzzy
 msgid "Would you like to decline it?"
 msgstr "您希望保存更改吗？"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
 #, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "无法保存到自动保存文件“{0}”。"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17541,7 +17758,8 @@ msgstr "写入(_W)"
 msgid "permission to read|_Read"
 msgstr "读(_R)"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "代理服务器"
 
@@ -17549,14 +17767,15 @@ msgstr "代理服务器"
 msgid "<b>Account Name</b>"
 msgstr "<b>账户名</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "代理服务器登录"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s输入 %s 的密码(用户 %s)"
@@ -17564,20 +17783,26 @@ msgstr "%s输入 %s 的密码(用户 %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "代理服务器登录(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代理服务器标签仅当账户联机时才可用。"
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理服务器标签仅当账户启用时才可用。"
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "高级发送选项"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "用户"
 
@@ -17593,68 +17818,68 @@ msgstr "新建共享文件夹(_S)..."
 msgid "Sharing"
 msgstr "共享"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "自定义通知"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "添加"
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "信件状态"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "主题："
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "发件人："
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "创建日期："
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "收件人："
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "已投递："
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "已打开："
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "已接受："
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "已删除："
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "已拒绝："
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "已完成："
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "未投递："
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "跟踪信件状态..."
 
@@ -17757,11 +17982,11 @@ msgstr "导入到日历"
 msgid "Imports ICS attachments to calendar."
 msgstr "将 ICS 附件导入到日历。"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "硬件抽象层(HAL)尚未加载"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -17769,19 +17994,19 @@ msgstr ""
 "需要“hald”服务但它目前尚未运行。请启用该服务并重新支持此程序，或联系您的系统"
 "管理员。"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "搜索 iPod 失败"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
 "Evolution 找不到要同步的 iPod。您可能没有将其连接到系统，或者没有开机。"
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格式(.ics)"
 
@@ -17798,642 +18023,652 @@ msgstr "同步到 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod 同步"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%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 "日历“%s”中的一个约会与此会议冲突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息，会议不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息，任务不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法发送备忘信息，备忘不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 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:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "信件的确包含日历，但是日历不包含事件、任务或忙/闲信息"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要处理这些全部项目，应该保存文件并导入日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "此会议重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "此任务重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "此备忘重现"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "操作后删除消息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%-m月%-d日%A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%-m月%-d日%A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "请以 <b>%s</b> 的身份回应"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "以 <b>%s</b> 的身份接收"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 通过 %s 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代理了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 通过 %s 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s 取消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更："
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 请求给 %s 分配下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您分配了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您分配了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 取消了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 取消分配的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒绝了分配的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 通过 %s 发布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 发布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入到已有的备忘中："
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> 通过 %s 取消了下列共享备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 取消了下列共享备忘："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "拒绝(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "发送信息(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "开始时间："
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "结束时间："
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "回复发件人(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "给出席者发送更新(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "应用到全部实例(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "将时间显示为空闲(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "保留我的提醒(_P)"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "附件提醒"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "任务(_T)："
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "备忘："
 
@@ -18460,7 +18695,7 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "此响应并非来自当前出席者。将响应者加为出席者吗？"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "代理服务器注销(_L)"
 
@@ -18538,20 +18773,20 @@ msgstr "是否闪烁图标。"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "是否只通知收件箱文件夹中的新信件。"
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "生成 _D-Bus 消息"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Evolution 邮件通知"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "邮件通知属性"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18561,54 +18796,54 @@ msgid_plural ""
 "in %s."
 msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "新电子邮件"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "在通知区显示图标(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "闪烁通知区图标(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "同时弹出图标和消息(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "新邮件到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "响铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "播放声音文件(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "指定文件名(_F)："
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "播放(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件箱中的新信件(_I)"
 
@@ -18744,9 +18979,15 @@ msgid "Send e-mail message to mailing list?"
 msgstr "把信件发送到邮件列表吗？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+#, fuzzy
+#| msgid ""
+#| "The action could not be performed. This means the header for this action "
+#| "did not contain any action we could process.\n"
+#| "\n"
+#| "Header: {0}"
+msgid ""
+"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 ""
@@ -18856,22 +19097,6 @@ msgstr "把信件标记为已读(_S)"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "用于将文件夹内的全部信件全部标为已读"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "将日历标为脱机"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "将选中日历标为脱机查看。"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "不标为可脱机使用(_D)"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "标为可脱机使用(_M)"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "实现 mono 插件的插件。"
@@ -18939,19 +19164,19 @@ msgstr "纯文字模式"
 msgid "Prefer plain-text"
 msgstr "首选纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "首选纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "仅显示纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
@@ -18963,6 +19188,18 @@ msgstr "Evolution 配置器"
 msgid "Writes a log of profiling data events."
 msgstr "编写配置数据事件的日志。"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "从 PST 文件中导入 Outlook 邮件"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Outlook PST 导入"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook 个人文件夹(.pst)"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "允许将日历发布到 Web"
@@ -18979,9 +19216,9 @@ msgstr "位置"
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "您确定您想要删除此 URL 吗？"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "您确定您想要删除此位置吗？"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19019,7 +19256,7 @@ msgstr "发布频率(_F)："
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19027,7 +19264,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"安全 FTP (SSH)\n"
 "公开 FTP\n"
 "FTP (需登录)\n"
 "Windows 共享\n"
@@ -19067,6 +19304,14 @@ msgstr ""
 "iCal\n"
 "忙/闲"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "新建位置"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "编辑位置"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 #, fuzzy
 msgid "Hello Python"
@@ -19085,62 +19330,60 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr ""
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr ""
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-#, fuzzy
 msgid "Python Loader"
-msgstr "Mono 装入器"
+msgstr "Python 装入器"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "垃圾克星(内置)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, fuzzy, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "垃圾克星插件"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, fuzzy, c-format
 msgid "Failed to create pipe: %s"
 msgstr "创建本地邮件存储“%s”失败：%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, fuzzy, c-format
 msgid "Error after fork: %s"
 msgstr ""
 "%s 错误：\n"
 " %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 ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "发送选项不可用。"
+msgstr "垃圾克星不可用。"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "这将让过滤器更可靠，但稍慢"
+msgstr "这将让垃圾克星更可靠，但稍慢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "包含远程测试(_N)"
 
@@ -19151,12 +19394,12 @@ msgid ""
 msgstr "使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "垃圾克星插件"
+msgid "SpamAssassin Options"
+msgstr "垃圾克星选项"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "垃圾克星选项"
+msgid "SpamAssassin junk plugin"
+msgstr "垃圾克星插件"
 
 #: ../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."
@@ -19164,7 +19407,7 @@ msgstr "一次保存全部附件或信件的不同部分的插件。"
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "保存附件"
 
@@ -19176,15 +19419,15 @@ msgstr "保存附件..."
 msgid "Save all attachments"
 msgstr "保存全部附件"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "选择保存基础名称"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME 类型"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "保存"
 
@@ -19192,79 +19435,79 @@ msgstr "保存"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "描述列表"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "类别列表"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "注释列表"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "创建时间"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "开始"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "结束"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "完成百分比"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "出席者列表"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "CSV 格式的高级选项"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "前置头"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "值分隔符："
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "记录分隔符："
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "将值以下列形式封装："
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "逗号分隔的值格式(.csv)"
 
@@ -19285,15 +19528,15 @@ msgstr "保存到磁盘(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式(.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "选择目的文件"
 
@@ -19325,15 +19568,15 @@ msgstr "指引您进行初始帐户的设置。"
 msgid "Setup Assistant"
 msgstr "设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19345,28 +19588,28 @@ msgstr ""
 "\n"
 "请单击“前进”按钮继续。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "导入文件"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "正在导入数据。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "请稍候"
@@ -19395,15 +19638,15 @@ msgid ""
 "message body."
 msgstr "消息主体中的用于附件提醒插件的线索列表。"
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "无标题"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "另存为模板(_T)"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "另存为模板"
 
@@ -19412,8 +19655,8 @@ msgid "Drafts based template plugin"
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "一个使用 ytnef 来解码 tnef 附件的简单插件。"
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "一个使用 yTNEF 来解码 TNEF 附件的简单插件。"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19438,7 +19681,7 @@ msgid "URL:"
 msgstr "URL："
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19573,7 +19816,7 @@ msgstr "侧边栏可见"
 msgid "Skip development warning dialog"
 msgstr "跳过开发警告对话框"
 
-#: ../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 "以脱机模式启动"
 
@@ -19641,8 +19884,8 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏，则工具栏的"
-"样式由 GNOME 设置决定。"
+"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、"
+"“toolbar”(工具栏)。如果设置为“toolbar”(工具栏)，则工具栏的样式由 GNOME 设置决定。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
@@ -19726,8 +19969,7 @@ msgstr "选择要运行的导入器类型："
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
-msgstr ""
-"选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
+msgstr "选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -19770,7 +20012,7 @@ msgstr "Evolution 首选项"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19795,77 +20037,71 @@ msgstr "无法运行 Bug buddy。"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "开源软件国际化之简体中文组\n"
 "http://i18n.linux.net.cn"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "打开 FAQ 网页时出错。"
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "联机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: ../shell/e-shell-window.c:381
-#, fuzzy
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
-msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
+msgstr "Evolution 目前联机。\n单击该按钮可脱机工作。"
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在脱机过程中。"
 
-#: ../shell/e-shell-window.c:395
-#, fuzzy
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
-msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
+msgstr "Evolution 目前脱机。\n单击该按钮可联机工作。"
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "未知的系统错误。"
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld 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 "确定"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "无效参数"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
@@ -19880,7 +20116,6 @@ msgid "New Test"
 msgstr "新建测试"
 
 #: ../shell/test/evolution-test-component.c:106
-#, fuzzy
 msgctxt "New"
 msgid "_Test"
 msgstr "测试(_T)"
@@ -19910,8 +20145,8 @@ msgid "Importer Type"
 msgstr "导入器类型"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "选择导入器"
+msgid "Select Information to Import"
+msgstr "选择要导入的信息"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -19927,7 +20162,7 @@ msgstr ""
 "本助手将全程指导您将外部文件导入 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"
@@ -19959,7 +20194,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19967,43 +20202,43 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "启动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "以联机模式启动"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 重新升迁"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "禁止装入任何插件。"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20017,32 +20252,36 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "您确定要忘记记住的所有密码吗？"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "无法启动 Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "继续"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "删除版本 {0} 中的旧数据吗？"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution 无法启动。"
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候，您必须重新输入。"
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "磁盘空间不足以进行升级。"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "真的要删除旧数据吗？"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20061,9 +20300,18 @@ msgstr ""
 "\n"
 "删除之后，您将无法降级至先前版本的 Evolution，除非您手动从头来过。\n"
 
-#: ../shell/shell.error.xml.h:15
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid ""
+#| "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"
+msgid ""
+"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 "
@@ -20075,11 +20323,11 @@ msgstr ""
 "如果您选择删除此数据，“evolution”目录中的全部内容都将被永久删除。如果您选择保"
 "留此数据，那么您可以在您方便的时候手动删除“evolution”目录。\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "从先前版本升级失败：{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"
@@ -20091,7 +20339,7 @@ msgstr ""
 "\n"
 "您需要在继续之前在主目录中腾出更多空间。"
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20101,7 +20349,7 @@ msgstr ""
 "\n"
 "请单击帮助查看详情"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20115,19 +20363,19 @@ msgstr ""
 "\n"
 "请单击帮助查看详情。"
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "忘记(_F)"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "保留数据(_K)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "稍后提醒(_R)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20191,7 +20439,7 @@ msgid "Purposes"
 msgstr "用途"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "序列号"
 
@@ -20307,7 +20555,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
 
-#: ../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 "证书"
 
@@ -20383,11 +20631,11 @@ msgstr "组织单元(OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL 客户证书"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL 服务器证书"
 
@@ -20433,182 +20681,182 @@ msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "版本"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "版本 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "版本 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "证书密钥用途"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape 证书类型"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "证书颁发密钥身份"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "对象标识符(%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "算法标识符"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "算法参数"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "主题公钥信息"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "主题公钥算法"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "主题公钥"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "错误：无法处理扩展"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "对象签名者"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL 证书颁发机构"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "电子邮件证书颁发机构"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "不可抵赖"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "密钥编码器"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "数据编码器"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "证书签名者"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL 签名者"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "关键"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "非关键"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "扩展"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "发行者唯一 ID"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "主题唯一 ID"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "输入 PKCS12 文件的密码："
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "导入的证书"
 
@@ -20647,8 +20895,8 @@ msgid "Copy"
 msgstr "复制"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "把选中的联系人复制到其它文件夹..."
+msgid "Copy selected contacts to another folder"
+msgstr "把选中的联系人复制到其它文件夹"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -20696,8 +20944,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "将全部联系人移至(_V)..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "把选中的联系人移至其它文件夹..."
+msgid "Move selected contacts to another folder"
+msgstr "把选中的联系人移至其它文件夹"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -20737,14 +20985,14 @@ msgid "Save as VCard..."
 msgstr "另存为 VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "把选中的联系人保存为 VCard。"
+msgid "Save selected contacts as a VCard"
+msgstr "把选中的联系人保存为 VCard"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "把选中文件夹中的的联系人保存为 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 "全选"
 
@@ -20757,16 +21005,16 @@ msgid "Select all contacts"
 msgstr "选中全部联系人"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "给选中的联系人发信件。"
+msgid "Send a message to the selected contacts"
+msgstr "给选中的联系人发信件"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "给联系人发信件"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "把选中的联系人发送给其他人。"
+msgid "Send selected contacts to another person"
+msgstr "把选中的联系人发送给其他人"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -20788,7 +21036,7 @@ msgstr "停止载入"
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "操作(_A)"
@@ -20878,7 +21126,7 @@ msgid "Month"
 msgstr "月"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "下一项"
 
@@ -20887,7 +21135,7 @@ msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "上一项"
 
@@ -20943,15 +21191,23 @@ msgstr "显示工作周"
 msgid "View the current appointment"
 msgstr "查看当前约会"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "查看调试控制台以获得日志信息"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "周"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
-msgstr "一周工作日"
+msgstr "工作日"
+
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "调试日志(_D)"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
@@ -21020,10 +21276,6 @@ msgstr "显示信件预览窗口"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程服务器上的文件夹"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "查看调试控制台以获得日志信息"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "分类视图(_C)"
@@ -21032,10 +21284,6 @@ msgstr "分类视图(_C)"
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "调试日志(_D)"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信件以离线使用(_D)"
@@ -21060,8 +21308,8 @@ msgstr "预览(_P)"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "订阅(_S)"
+msgid "_Subscriptions..."
+msgstr "订阅(_S)..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -21141,10 +21389,6 @@ msgstr "从该文件夹永久删除所有已删除的信件"
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "刷新(_F)..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
@@ -21885,9 +22129,8 @@ msgid "View/Hide the Status Bar"
 msgstr "查看/隐藏状态栏"
 
 #: ../ui/evolution.xml.h:39
-#, fuzzy
 msgid "Work _Offline"
-msgstr "脱机工作"
+msgstr "脱机工作(_O)"
 
 #: ../ui/evolution.xml.h:40
 msgid "_About"
@@ -21963,7 +22206,7 @@ msgstr "月视图(_M)"
 
 #: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
-msgstr "周工作视图(_W)"
+msgstr "工作日视图(_W)"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
@@ -22065,17 +22308,17 @@ msgid "Define Views for \"%s\""
 msgstr "定义“%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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "实例"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "保存当前视图"
 
@@ -22088,42 +22331,42 @@ msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "保存自定义视图"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "定义视图..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "选择视图：%s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "创建或编辑视图"
 
@@ -22147,17 +22390,17 @@ msgstr "视图类型"
 msgid "Type of view:"
 msgstr "视图类型："
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "附件栏"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "无法附加文件 %s：%s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "无法附加文件 %s：不是普通文件"
@@ -22183,80 +22426,80 @@ msgstr "建议自动显示附件"
 msgid "%B %Y"
 msgstr "%Y年%B"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "月历"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "GDK 填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "点绘填充"
 
-#: ../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 "最小宽度"
 
-#: ../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 "最小宽度"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "间距"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "现在"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "时间必须采用格式：%s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "百分比值必需在 0 到 100 之间，含 0 和 100"
 
@@ -22355,85 +22598,85 @@ msgstr "其它..."
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "单击此按钮可显示日历"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "今天(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "已展开"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "是否展开扩展器"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "扩展器标签的文本"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "使用下划线"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果设置了此选项，将会在表明加速键的字符下面加下划线"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "标签及其子空间中间的间距"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "标签部件"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "在通常扩展器标签的位置显示的部件"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "扩展器大小"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "扩展器箭头的大小"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "标识器间距"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "扩展器箭头旁边的间距"
 
@@ -22493,7 +22736,6 @@ msgid "World Map"
 msgstr "世界地图"
 
 #: ../widgets/misc/e-map.c:629
-#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22501,11 +22743,11 @@ msgstr ""
 "基于鼠标交互的地图部件，可用来选择时区。键盘用户可以从下方的组合框中选择时"
 "区。"
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "在线"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "按钮状态为在线"
 
@@ -22521,74 +22763,74 @@ msgstr "同步私有记录："
 msgid "Sync Categories:"
 msgstr "同步类别："
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "空信件"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "回流模型"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "列宽"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "搜索"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "项目 ID"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "文字"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "显示(_W)："
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "搜索(_C)："
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " 于(_N) "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "光标行"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "光标列"
 
@@ -22734,19 +22976,19 @@ msgid "_When opened:"
 msgstr "打开时(_W)："
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "单击此处转到 URL"
 
@@ -22786,23 +23028,23 @@ msgstr "聚焦列"
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "给列着色"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "给列着背景色"
 
@@ -22840,7 +23082,7 @@ msgid "A_vailable Fields:"
 msgstr "可用域(_V)："
 
 #: ../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 "升序"
 
@@ -22853,7 +23095,7 @@ msgid "Clear _All"
 msgstr "全部清除(_A)"
 
 #: ../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 "降序"
 
@@ -22914,16 +23156,16 @@ msgid "_Sort..."
 msgstr "排序(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "拖放代码"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "完整标题"
 
@@ -22957,7 +23199,7 @@ msgstr[0] "%s (%d 项)"
 #: ../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 "交替行色"
 
@@ -22965,8 +23207,8 @@ msgstr "交替行色"
 #: ../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:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "水平绘制网格"
 
@@ -22974,8 +23216,8 @@ msgstr "水平绘制网格"
 #: ../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:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "垂直绘制网格"
 
@@ -22983,8 +23225,8 @@ msgstr "垂直绘制网格"
 #: ../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:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "绘制焦点"
 
@@ -22992,7 +23234,7 @@ msgstr "绘制焦点"
 #: ../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 "光标模式"
 
@@ -23000,7 +23242,7 @@ msgstr "光标模式"
 #: ../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 "选择模型"
 
@@ -23008,9 +23250,9 @@ msgstr "选择模型"
 #: ../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:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "长度阀值"
 
@@ -23018,9 +23260,9 @@ msgstr "长度阀值"
 #: ../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:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "统一行高"
 
@@ -23031,211 +23273,212 @@ msgstr "统一行高"
 msgid "Frozen"
 msgstr "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "字体描述"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "排序信息"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "树"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "表头"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "光标行"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "总是搜索"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "单击可添加"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ETree 表格适配器"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "火箭外观"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "绘制行和 +/- 扩展柄。"
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "事件处理器"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "两端对齐"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "裁剪宽度"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "裁剪高度"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "填充裁剪矩形"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "水平偏移"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "垂直偏移"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "椭圆"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "换行"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "换行字符"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "最多行数"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "绘制边框"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "允许新行"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "绘制按钮"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "光标位置"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "处理弹出"
diff --git a/tools/killev.c b/tools/killev.c
index 374aa1be7c..6d9fd925cb 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -83,7 +83,7 @@ kill_process (const char *proc_name, KillevComponent *comp)
 }
 
 static const char *patterns[] = {
-	"%s", "%.16s", "lt-%s", "lt-%.13s"
+	"%s", "%.16s", "lt-%s", "lt-%.13s", "%s.bin"
 };
 static const int n_patterns = G_N_ELEMENTS (patterns);
 
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index e8c1a5023d..2c1046f0a6 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-30  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #342446
+
+	** Committing on behalf of Behnam Esfahbod
+
+	* e-calendar-item.c (e_calendar_item_draw_day_numbers),
+	(e_calendar_item_recalc_sizes), (e_calendar_item_position_menu):
+	Use localized digits in the calendar widget.
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-attachment-bar.c (eab_icon_clicked_cb):
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 3bf1fe65a7..da4c063175 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -1395,7 +1395,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	gboolean today, selected, has_focus, drop_target = FALSE;
 	gboolean bold, draw_day, finished = FALSE;
 	gint today_year, today_month, today_mday, month_offset;
-	gchar buffer[2];
+	gchar buffer[9];
 	gint day_style = 0;
 	PangoContext *pango_context;
 	PangoFontMetrics *font_metrics;
@@ -1505,12 +1505,12 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 			if (week_num >= 10) {
 				digit = week_num / 10;
 				text_x -= calitem->week_number_digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
+				num_chars += sprintf (&buffer[num_chars], "%Id", digit);
 			}
 
 			digit = week_num % 10;
 			text_x -= calitem->week_number_digit_widths[digit] + 6;
-			buffer[num_chars++] = digit + '0';
+			num_chars += sprintf (&buffer[num_chars], "%Id", digit);
 
 			cairo_save (cr);
 			gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]);
@@ -1618,12 +1618,12 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 				if (day_num >= 10) {
 					digit = day_num / 10;
 					day_x -= calitem->digit_widths[digit];
-					buffer[num_chars++] = digit + '0';
+					num_chars += sprintf (&buffer[num_chars], "%Id", digit);
 				}
 
 				digit = day_num % 10;
 				day_x -= calitem->digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
+				num_chars += sprintf (&buffer[num_chars], "%Id", digit);
 
 				cairo_save (cr);
 				if (fg_color) {
@@ -1913,7 +1913,6 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 {
 	GnomeCanvasItem *canvas_item;
 	GtkStyle *style;
-	gchar *digits = "0123456789";
 	gint day, max_day_width, digit, max_digit_width, max_week_number_digit_width;
 	gint char_height, width, min_cell_width, min_cell_height;
 	PangoFontDescription *font_desc, *wkfont_desc;
@@ -1956,7 +1955,12 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 	max_digit_width = 0;
 	max_week_number_digit_width = 0;
 	for (digit = 0; digit < 10; digit++) {
-		pango_layout_set_text (layout, &digits [digit], 1);
+		gchar locale_digit[5];
+		int locale_digit_len;
+		
+		locale_digit_len = sprintf (locale_digit, "%Id", digit);
+
+		pango_layout_set_text (layout, locale_digit, locale_digit_len);
 		pango_layout_get_pixel_size (layout, &width, NULL);
 
 		calitem->digit_widths[digit] = width;
@@ -1966,7 +1970,7 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 			pango_context_set_font_description (pango_context, wkfont_desc);
 			pango_layout_context_changed (layout);
 
-			pango_layout_set_text (layout, &digits [digit], 1);
+			pango_layout_set_text (layout, locale_digit, locale_digit_len);
 			pango_layout_get_pixel_size (layout, &width, NULL);
 
 			calitem->week_number_digit_widths[digit] = width;
@@ -3352,7 +3356,9 @@ e_calendar_item_position_menu	(GtkMenu            *menu,
 
 	gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
 
-	*x -= 2;
+	*x -= (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL)
+		? requisition.width - 2
+		: 2;
 	*y -= requisition.height / 2;
 
 	screen_width = gdk_screen_width ();
diff --git a/win32/Makefile.am b/win32/Makefile.am
index c8e5297334..8d4f0859e2 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -29,36 +29,36 @@ noinst_DATA = $(BOOTSTRAP_LIBS)
 libemiscwidgets.la: dummy.la libemiscwidgets.def
 	sed -e s!%DLL%!libemiscwidgets-0! -e s!%LIB%!libemiscwidgets! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libemiscwidgets.dll.a --dllname=libemiscwidgets-0.dll --input-def=libemiscwidgets.def
+	$(DLLTOOL) --output-lib=.libs/libemiscwidgets.dll.a --dllname=libemiscwidgets-0.dll --input-def=libemiscwidgets.def
 
 libetable.la: dummy.la libetable.def
 	sed -e s!%DLL%!libetable-0! -e s!%LIB%!libetable! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libetable.dll.a --dllname=libetable-0.dll --input-def=libetable.def
+	$(DLLTOOL) --output-lib=.libs/libetable.dll.a --dllname=libetable-0.dll --input-def=libetable.def
 
 libetext.la: dummy.la libetext.def
 	sed -e s!%DLL%!libetext-0! -e s!%LIB%!libetext! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libetext.dll.a --dllname=libetext-0.dll --input-def=libetext.def
+	$(DLLTOOL) --output-lib=.libs/libetext.dll.a --dllname=libetext-0.dll --input-def=libetext.def
 
 libevolution-addressbook.la: dummy.la libevolution-addressbook.def
 	sed -e s!%DLL%!libevolution-addressbook! -e s!%LIB%!libevolution-addressbook! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-addressbook.dll.a --dllname=libevolution-addressbook.dll --input-def=libevolution-addressbook.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-addressbook.dll.a --dllname=libevolution-addressbook.dll --input-def=libevolution-addressbook.def
 
 libevolution-calendar.la: dummy.la libevolution-calendar.def
 	sed -e s!%DLL%!libevolution-calendar! -e s!%LIB%!libevolution-calendar! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-calendar.dll.a --dllname=libevolution-calendar.dll --input-def=libevolution-calendar.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-calendar.dll.a --dllname=libevolution-calendar.dll --input-def=libevolution-calendar.def
 
 libevolution-mail.la: dummy.la libevolution-mail.def
 	sed -e s!%DLL%!libevolution-mail! -e s!%LIB%!libevolution-mail! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def
 
 libfilter.la: dummy.la libfilter.def
 	sed -e s!%DLL%!libfilter-0! -e s!%LIB%!libfilter! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libfilter.dll.a --dllname=libfilter-0.dll --input-def=libfilter.def
+	$(DLLTOOL) --output-lib=.libs/libfilter.dll.a --dllname=libfilter-0.dll --input-def=libfilter.def
 
 CLEANFILES = $(BOOTSTRAP_LIBS)