Merge branch 'master' into kill-bonobo

86 files changed, 7644 insertions, 6768 deletions

diff --git a/NEWS b/NEWS
index 66fde4fbf2..5d7748733f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,51 @@
+Evolution 2.27.3 2009-06-15
+---------------------------
+
+Bugs Fixed:
+	#585523 - Don't link against libsoftoken3 explicitly (Jeff Cai)
+	#584902 - Disabled default account hides "From" in composer (Matthew Barnes)
+	#585554 - Opening PDF attachment crashes in e_attachment_open_handle_error()
+		  (Matthew Barnes)
+	#584733 - Fixed account setup to work after Anjal merge (Srinivasa Ragavan)
+	#573263 - Crash in reset_layout (text) at e-text.c (Milan Crha)
+	#362907 - Give icons to Drafts/Sent/Templates folders (Milan Crha)
+	#584733 - Cannot create new account (Srinivasa Ragavan)
+	#581780 - Remember passwords in keyring for web calendars too (Milan Crha)
+	#572543 – Doesn't show correct application for pdf attachments (Matthew Barnes)
+	#581280 - Wrong attachment name in event (Matthew Barnes)
+	#582939 - Drop support for CDE (Matthew Barnes)
+	#574940 - Do not use freed memory in EMFolderView/Browser (Milan Crha)
+	#337082 - Do not produce unnamed folders in a folder tree (Milan Crha)
+	#580212 - Report inline parts only when found both tags (Milan Crha)
+	#323037 - Folder emblem to show new mail arrival (Milan Crha)
+	#583446 - refresh folder hook (Lucian Langa)
+	#584154 – custom icon folder hook does not work (Milan Crha)
+	#583991 - "Suggest automatic display of attachment" does not work (Matthew Barnes)
+	#583441 - bbdb plugin is getting information from composer now (Milan Crha)
+	#535516 - Crash in GConf Bridge while replying (Milan Crha)
+	#540269 - Do not crash in em_format_is_attachment (Milan Crha)
+	#540269 - Do not crash in em_format_is_attachment (Milan Crha)
+	#578335 - CalDAV - replace '@' in username to "%40" (Milan Crha)
+	#524497 - Change the order of getting an account (Jeff Cai)
+	
+Translations:
+	Manoj Kumar (or)
+	Runa Bhattacharjee (bn_IN)
+	Claude Paroz (fr)
+	Kjartan Maraas (nb)
+	Jorge Gonzalez (es)
+	Gabor Kelemen (hu)
+	Ask H. Larsen (da)
+
+Other Fixes:
+	Added couple of APIS for EAttachmentPaned to hide combo and get the
+	widget's container.(Srinivasa Ragavan)
+	Fix a runtime warning for zero-length attachments. (Matthew Barnes)
+	Fix Compiler warnings. (Matthew Barnes)
+	Fix build on Windows: link with needed libraries. (Tor Lillqvist)
+	(Fridrich Strba)
+	Replace libgnome function with equivalent glib functions. (Fridrich Strba)
+
 Evolution 2.27.2 2009-05-25
 ---------------------------
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index ccd40deebb..29ddb6ee9c 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 751bab4203..d6f77c3261 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -29,18 +29,17 @@
 #include "ebook/e-card.h"
 
 #define TEST_VCARD \
-"BEGIN:VCARD" \
-"FN:Nat" \
-"N:Friedman;Nat;D;Mr." \
-"BDAY:1977-08-06" \
-"TEL;WORK:617 679 1984" \
-"TEL;CELL:123 456 7890" \
-"EMAIL;INTERNET:nat@nat.org" \
-"EMAIL;INTERNET:nat@ximian.com" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA" \
-"END:VCARD" \
-""
+"BEGIN:VCARD\n" \
+"FN:Nat\n" \
+"N:Friedman;Nat;D;Mr.\n" \
+"BDAY:1977-08-06\n" \
+"TEL;WORK:617 679 1984\n" \
+"TEL;CELL:123 456 7890\n" \
+"EMAIL;INTERNET:nat@nat.org\n" \
+"EMAIL;INTERNET:nat@ximian.com\n" \
+"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;\n" \
+"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA\n" \
+"END:VCARD\n"
 
 static gchar *
 read_file (gchar *name)
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 491c1ba62b..608707395d 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index bcd1ca705e..a1ed7c0900 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -1074,8 +1074,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 		e_cal_component_get_categories_list (comp, &categories_list);
 
 		if (num_icons != 0) {
-			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD)
-			    * num_icons) {
+			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons) {
 				icon_x_inc = 0;
 				icon_y_inc = E_DAY_VIEW_ICON_HEIGHT
 					+ E_DAY_VIEW_ICON_Y_PAD;
@@ -1085,7 +1084,9 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_y_inc = 0;
 			}
 
-			if (draw_reminder_icon) {
+			#define fit_in_event() icon_x + icon_x_inc < item_x + item_w && icon_y + icon_y_inc < item_y + item_h
+
+			if (draw_reminder_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
 				max_icon_h = item_y + item_h - icon_y
@@ -1104,7 +1105,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_y += icon_y_inc;
 			}
 
-			if (draw_recurrence_icon) {
+			if (draw_recurrence_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
 				max_icon_h = item_y + item_h - icon_y
@@ -1122,7 +1123,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_x += icon_x_inc;
 				icon_y += icon_y_inc;
 			}
-			if (draw_attach_icon) {
+			if (draw_attach_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
 				max_icon_h = item_y + item_h - icon_y
@@ -1139,7 +1140,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_x += icon_x_inc;
 				icon_y += icon_y_inc;
 			}
-			if (draw_timezone_icon) {
+			if (draw_timezone_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
 				max_icon_h = item_y + item_h - icon_y
@@ -1159,7 +1160,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 			}
 
 
-			if (draw_meeting_icon) {
+			if (draw_meeting_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
 				max_icon_h = item_y + item_h - icon_y
@@ -1175,7 +1176,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 			}
 
 			/* draw categories icons */
-			for (elem = categories_list; elem; elem = elem->next) {
+			for (elem = categories_list; elem && fit_in_event (); elem = elem->next) {
 				gchar *category;
 				GdkPixmap *pixmap = NULL;
 				GdkBitmap *mask = NULL;
@@ -1208,6 +1209,8 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_y += icon_y_inc;
 			}
 
+			#undef  fit_in_event
+
 			gdk_gc_set_clip_mask (gc, NULL);
 		}
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 802ddd8f8b..173fa054a6 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4687,8 +4687,6 @@ e_day_view_reshape_day_event (EDayView *day_view,
 		if (num_icons > 0) {
 			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)
 				icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;
-			else
-				icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;
 		}
 
 		if (!event->canvas_item) {
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index bcd30b0105..8fe302293f 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -546,7 +546,7 @@ gnome_calendar_get_current_view_widget (GnomeCalendar *gcal)
 }
 
 static void
-get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time)
+get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time, time_t *select_time)
 {
 	GnomeCalendarPrivate *priv;
 	gint shown, display_start;
@@ -615,6 +615,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_
 
 		*start_time = icaltime_as_timet_with_zone (tt, priv->zone);
 		*end_time = time_add_day_with_zone (*start_time, days_shown, priv->zone);
+
+		if (select_time && E_DAY_VIEW (priv->views[view_type])->selection_start_day == -1)
+			time (select_time);
 		break;
 	case GNOME_CAL_WEEK_VIEW:
 		/* FIXME We should be using the same day of the week enum every where */
@@ -622,6 +625,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_
 
 		*start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone);
 		*end_time = time_add_week_with_zone (*start_time, 1, priv->zone);
+
+		if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1)
+			time (select_time);
 		break;
 	case GNOME_CAL_MONTH_VIEW:
 		shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (priv->views[view_type]));
@@ -632,6 +638,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_
 			*start_time = time_month_begin_with_zone (*start_time, priv->zone);
 		*start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone);
 		*end_time = time_add_week_with_zone (*start_time, shown, priv->zone);
+
+		if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1)
+			time (select_time);
 		break;
 	case GNOME_CAL_LIST_VIEW:
 		/* FIXME What to do here? */
@@ -843,7 +852,7 @@ set_search_query (GnomeCalendar *gcal, const gchar *sexp)
 			e_cal_model_set_search_query_with_time_range (e_calendar_view_get_model (priv->views [i]), sexp, start, end);
 		} else {
 			start = priv->base_view_time;
-			get_times_for_views (gcal, GNOME_CAL_LIST_VIEW, &start, &end);
+			get_times_for_views (gcal, GNOME_CAL_LIST_VIEW, &start, &end, NULL);
 
 			e_cal_model_set_search_query_with_time_range (e_calendar_view_get_model (priv->views [i]), sexp, start, end);
 
@@ -1788,19 +1797,22 @@ update_view_times (GnomeCalendar *gcal, time_t start_time)
 	GnomeCalendarPrivate *priv;
 	ECalModel *model;
 	time_t real_start_time = start_time;
-	time_t end_time;
+	time_t end_time, select_time = 0;
 
 	priv = gcal->priv;
 
 	priv->base_view_time = start_time;
 
 	model = e_calendar_view_get_model (priv->views [priv->current_view_type]);
-	get_times_for_views (gcal, priv->current_view_type, &real_start_time, &end_time);
+	get_times_for_views (gcal, priv->current_view_type, &real_start_time, &end_time, &select_time);
 
 	if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range)
 		return;
 
 	e_cal_model_set_time_range (model, real_start_time, end_time);
+
+	if (select_time != 0 && select_time >= real_start_time && select_time <= end_time)
+		e_calendar_view_set_selected_time_range (priv->views [priv->current_view_type], select_time, select_time);
 }
 
 static void
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index 272d822a2c..2eddfbfec6 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -98,13 +98,18 @@ tag_calendar_cb (ECalComponent *comp,
 	struct calendar_tag_closure *c = data;
 	struct icaltimetype start_tt, end_tt;
 	ECalComponentTransparency transparency;
+	guint8 style = 0;
 
 	/* If we are skipping TRANSPARENT events, return if the event is
 	   transparent. */
-	if (c->skip_transparent_events) {
-		e_cal_component_get_transparency (comp, &transparency);
-		if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
+	e_cal_component_get_transparency (comp, &transparency);
+	if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
+		if (c->skip_transparent_events)
 			return TRUE;
+
+		style = E_CALENDAR_ITEM_MARK_ITALIC;
+	} else {
+		style = E_CALENDAR_ITEM_MARK_BOLD;
 	}
 
 	start_tt = icaltime_from_timet_with_zone (istart, FALSE, c->zone);
@@ -114,7 +119,8 @@ tag_calendar_cb (ECalComponent *comp,
 				   start_tt.day,
 				   end_tt.year, end_tt.month - 1,
 				   end_tt.day,
-				   E_CALENDAR_ITEM_MARK_BOLD);
+				   style,
+				   TRUE);
 
 	return TRUE;
 }
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index f1524a62e6..713c123b74 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -69,10 +69,6 @@ composer_header_addaction_clicked_cb (GtkButton *button,
 				      EComposerHeader *header)
 {
 	gboolean show = !e_composer_header_get_visible(header);
-	if (!show)
-		gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
-	else
-		gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));
 
 	e_composer_header_set_visible (header, show);
 }
@@ -105,6 +101,7 @@ composer_header_constructor (GType type,
 			GTK_LABEL (widget), header->input_widget);
 	}
 
+	header->priv->action_label = NULL;
 	if (header->priv->addaction) {
 		GtkWidget *box, *tmp;
 		gchar *str;
@@ -428,6 +425,12 @@ e_composer_header_set_visible (EComposerHeader *header,
 
 	header->priv->visible = visible;
 
+	if (header->priv->action_label) {
+		if (!visible)
+			gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
+		else
+			gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));	
+	}
 	g_object_notify (G_OBJECT (header), "visible");
 }
 
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 1a8f4676e7..1d5eb39d80 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -29,7 +29,7 @@
 #include <libedataserver/e-account.h>
 #include <libebook/e-destination.h>
 #include <gtkhtml-editor.h>
-#include <widgets/misc/e-attachment-view.h>
+#include <misc/e-attachment-view.h>
 
 #include "e-composer-header-table.h"
 
diff --git a/configure.ac b/configure.ac
index 565499187c..4975ff1d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Evolution Versions
 m4_define([evo_major_version], [2])
 m4_define([evo_minor_version], [27])
-m4_define([evo_micro_version], [3])
+m4_define([evo_micro_version], [4])
 m4_define([evo_version],
           [evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],
@@ -52,7 +52,7 @@ m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
 m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess
 m4_define([libgnomecanvas_minimum_version], [2.0.0])    # XXX Just a Guess
 m4_define([libgnomeui_minimum_version], [2.0.0])        # XXX Just a Guess
-m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
+m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
 m4_define([unique_minimum_version], [1.0])              # XXX Just a Guess
 
@@ -261,12 +261,9 @@ AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv,
 	       AC_TRY_LINK([
 #include <iconv.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]))
 
 if test $ac_cv_libiconv = yes; then
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 585b611e66..9540067602 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -1672,6 +1672,73 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
 	}
 }
 
+/* RFC 4155 */
+static void
+emf_application_mbox (EMFormat *emf,
+                      CamelStream *stream,
+                      CamelMimePart *mime_part,
+                      const EMFormatHandler *info)
+{
+	const EMFormatHandler *handle;
+	CamelMimeParser *parser;
+	CamelStream *mem_stream;
+	camel_mime_parser_state_t state;
+
+	/* Extract messages from the application/mbox part and
+	 * render them as a flat list of messages. */
+
+	/* XXX If the mbox has multiple messages, maybe render them
+	 *     as a multipart/digest so each message can be expanded
+	 *     or collapsed individually.
+	 *
+	 *     See attachment_handler_mail_x_uid_list() for example. */
+
+	/* XXX This is based on em_utils_read_messages_from_stream().
+	 *     Perhaps refactor that function to return an array of
+	 *     messages instead of assuming we want to append them
+	 *     to a folder? */
+
+	handle = em_format_find_handler (emf, "x-evolution/message/rfc822");
+	g_return_if_fail (handle != NULL);
+
+	parser = camel_mime_parser_new ();
+	camel_mime_parser_scan_from (parser, TRUE);
+
+	mem_stream = camel_stream_mem_new ();
+	camel_data_wrapper_decode_to_stream (
+		CAMEL_DATA_WRAPPER (mime_part), mem_stream);
+	camel_seekable_stream_seek (
+		CAMEL_SEEKABLE_STREAM (mem_stream), 0, CAMEL_STREAM_SET);
+	camel_mime_parser_init_with_stream (parser, mem_stream);
+	camel_object_unref (mem_stream);
+
+	/* Extract messages from the mbox. */
+	state = camel_mime_parser_step (parser, NULL, NULL);
+	while (state == CAMEL_MIME_PARSER_STATE_FROM) {
+		CamelMimeMessage *message;
+
+		message = camel_mime_message_new ();
+		mime_part = CAMEL_MIME_PART (message);
+
+		if (camel_mime_part_construct_from_parser (mime_part, parser) == -1) {
+			camel_object_unref (message);
+			break;
+		}
+
+		/* Render the message. */
+		handle->handler (emf, stream, mime_part, handle);
+
+		camel_object_unref (message);
+
+		/* Skip past CAMEL_MIME_PARSER_STATE_FROM_END. */
+		state = camel_mime_parser_step (parser, NULL, NULL);
+
+		state = camel_mime_parser_step (parser, NULL, NULL);
+	}
+
+	camel_object_unref (parser);
+}
+
 static void
 emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
 {
@@ -1835,6 +1902,7 @@ static EMFormatHandler type_builtin_table[] = {
 #ifdef ENABLE_SMIME
 	{ (gchar *) "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
 #endif
+	{ (gchar *) "application/mbox", emf_application_mbox, EM_FORMAT_HANDLER_INLINE },
 	{ (gchar *) "multipart/alternative", emf_multipart_alternative },
 	{ (gchar *) "multipart/appledouble", emf_multipart_appledouble },
 	{ (gchar *) "multipart/encrypted", emf_multipart_encrypted },
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 4a1e831451..2927938200 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -175,8 +175,8 @@ rule_editor_new (RuleContext *rc, const gchar *source, const gchar *label)
 	gui = glade_xml_new (filter_glade, "rule_editor", NULL);
 	g_free (filter_glade);
 	rule_editor_construct (re, rc, gui, source, label);
-	gtk_widget_hide(glade_xml_get_widget (gui, "label17"));
-	gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "label17"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "filter_source_combobox"));
 	g_object_unref (gui);
 
 	return re;
diff --git a/help/cs/figures/evo_adv_search_a.png b/help/cs/figures/evo_adv_search_a.png
new file mode 100644
index 0000000000..80173bcc0a
--- /dev/null
+++ b/help/cs/figures/evo_adv_search_a.png
diff --git a/help/cs/figures/evo_cal_advsearch.png b/help/cs/figures/evo_cal_advsearch.png
new file mode 100644
index 0000000000..2680736d89
--- /dev/null
+++ b/help/cs/figures/evo_cal_advsearch.png
diff --git a/help/cs/figures/evo_contacteditor_a.png b/help/cs/figures/evo_contacteditor_a.png
new file mode 100644
index 0000000000..73f03c4070
--- /dev/null
+++ b/help/cs/figures/evo_contacteditor_a.png
diff --git a/help/cs/figures/evo_edit_rule_a.png b/help/cs/figures/evo_edit_rule_a.png
new file mode 100644
index 0000000000..284d6fd257
--- /dev/null
+++ b/help/cs/figures/evo_edit_rule_a.png
diff --git a/help/cs/figures/evo_edit_search.png b/help/cs/figures/evo_edit_search.png
new file mode 100644
index 0000000000..e3d1b4e9cd
--- /dev/null
+++ b/help/cs/figures/evo_edit_search.png
diff --git a/help/cs/figures/evo_flag_follow_up_a.png b/help/cs/figures/evo_flag_follow_up_a.png
new file mode 100644
index 0000000000..af7d20848a
--- /dev/null
+++ b/help/cs/figures/evo_flag_follow_up_a.png
diff --git a/help/cs/figures/evo_googlecontacts.png b/help/cs/figures/evo_googlecontacts.png
new file mode 100644
index 0000000000..f608e6c5cc
--- /dev/null
+++ b/help/cs/figures/evo_googlecontacts.png
diff --git a/help/cs/figures/evo_gwreceiveedit_a.png b/help/cs/figures/evo_gwreceiveedit_a.png
new file mode 100644
index 0000000000..b93fa589bd
--- /dev/null
+++ b/help/cs/figures/evo_gwreceiveedit_a.png
diff --git a/help/cs/figures/evo_gwreceiveoptedit_a.png b/help/cs/figures/evo_gwreceiveoptedit_a.png
new file mode 100644
index 0000000000..15be81cdb7
--- /dev/null
+++ b/help/cs/figures/evo_gwreceiveoptedit_a.png
diff --git a/help/cs/figures/evo_gwstatustrack.png b/help/cs/figures/evo_gwstatustrack.png
new file mode 100644
index 0000000000..0041f4edf8
--- /dev/null
+++ b/help/cs/figures/evo_gwstatustrack.png
diff --git a/help/cs/figures/evo_identityedit_a.png b/help/cs/figures/evo_identityedit_a.png
new file mode 100644
index 0000000000..dc427bf960
--- /dev/null
+++ b/help/cs/figures/evo_identityedit_a.png
diff --git a/help/cs/figures/evo_imapheader_a.png b/help/cs/figures/evo_imapheader_a.png
new file mode 100644
index 0000000000..805395e68a
--- /dev/null
+++ b/help/cs/figures/evo_imapheader_a.png
diff --git a/help/cs/figures/evo_junk_a.png b/help/cs/figures/evo_junk_a.png
new file mode 100644
index 0000000000..5551ed3344
--- /dev/null
+++ b/help/cs/figures/evo_junk_a.png
diff --git a/help/cs/figures/evo_message_filters_a.png b/help/cs/figures/evo_message_filters_a.png
new file mode 100644
index 0000000000..6248a71e8f
--- /dev/null
+++ b/help/cs/figures/evo_message_filters_a.png
diff --git a/help/cs/figures/evo_rule_a.png b/help/cs/figures/evo_rule_a.png
new file mode 100644
index 0000000000..8b5334c123
--- /dev/null
+++ b/help/cs/figures/evo_rule_a.png
diff --git a/help/cs/figures/evo_select_add_folder.png b/help/cs/figures/evo_select_add_folder.png
new file mode 100644
index 0000000000..fd5cf01d45
--- /dev/null
+++ b/help/cs/figures/evo_select_add_folder.png
diff --git a/help/cs/figures/evo_select_folder.png b/help/cs/figures/evo_select_folder.png
new file mode 100644
index 0000000000..cefc8fab0e
--- /dev/null
+++ b/help/cs/figures/evo_select_folder.png
diff --git a/help/cs/figures/evo_send_option_a.png b/help/cs/figures/evo_send_option_a.png
new file mode 100644
index 0000000000..2957692197
--- /dev/null
+++ b/help/cs/figures/evo_send_option_a.png
diff --git a/help/cs/figures/evo_sendstatus_a.png b/help/cs/figures/evo_sendstatus_a.png
new file mode 100644
index 0000000000..e39b6d4b60
--- /dev/null
+++ b/help/cs/figures/evo_sendstatus_a.png
diff --git a/help/cs/figures/evo_shd_memo_a.png b/help/cs/figures/evo_shd_memo_a.png
new file mode 100644
index 0000000000..0ed4b46387
--- /dev/null
+++ b/help/cs/figures/evo_shd_memo_a.png
diff --git a/help/cs/figures/exchg-identity.png b/help/cs/figures/exchg-identity.png
new file mode 100644
index 0000000000..0330a16320
--- /dev/null
+++ b/help/cs/figures/exchg-identity.png
diff --git a/help/cs/figures/exchng-identity.png b/help/cs/figures/exchng-identity.png
new file mode 100644
index 0000000000..eb520a7294
--- /dev/null
+++ b/help/cs/figures/exchng-identity.png
diff --git a/help/cs/figures/exchng-rec-mail.png b/help/cs/figures/exchng-rec-mail.png
new file mode 100644
index 0000000000..53315b4c23
--- /dev/null
+++ b/help/cs/figures/exchng-rec-mail.png
diff --git a/help/cs/figures/exchng-rec-option.png b/help/cs/figures/exchng-rec-option.png
new file mode 100644
index 0000000000..ec114bfe8e
--- /dev/null
+++ b/help/cs/figures/exchng-rec-option.png
diff --git a/help/cs/figures/exchng-settings.png b/help/cs/figures/exchng-settings.png
new file mode 100644
index 0000000000..e97db8fcf1
--- /dev/null
+++ b/help/cs/figures/exchng-settings.png
diff --git a/help/cs/figures/filter-new-fig.png b/help/cs/figures/filter-new-fig.png
new file mode 100644
index 0000000000..bc5db705e2
--- /dev/null
+++ b/help/cs/figures/filter-new-fig.png
diff --git a/help/cs/figures/google_cal_view.png b/help/cs/figures/google_cal_view.png
new file mode 100644
index 0000000000..7cf5153a89
--- /dev/null
+++ b/help/cs/figures/google_cal_view.png
diff --git a/help/cs/figures/mailer_preferences.png b/help/cs/figures/mailer_preferences.png
new file mode 100644
index 0000000000..5220298604
--- /dev/null
+++ b/help/cs/figures/mailer_preferences.png
diff --git a/help/cs/figures/network_pref.png b/help/cs/figures/network_pref.png
new file mode 100644
index 0000000000..30bf832f4e
--- /dev/null
+++ b/help/cs/figures/network_pref.png
diff --git a/help/cs/figures/quick_add_a.png b/help/cs/figures/quick_add_a.png
new file mode 100644
index 0000000000..5a814d4d4e
--- /dev/null
+++ b/help/cs/figures/quick_add_a.png
diff --git a/help/cs/figures/quick_reference.png b/help/cs/figures/quick_reference.png
new file mode 100644
index 0000000000..5ef9bd0c22
--- /dev/null
+++ b/help/cs/figures/quick_reference.png
diff --git a/help/de/de.po b/help/de/de.po
index c8af841c92..9bce635722 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-10 17:02+0000\n"
-"PO-Revision-Date: 2009-03-11 18:07+0100\n"
+"POT-Creation-Date: 2009-05-20 17:16+0000\n"
+"PO-Revision-Date: 2009-06-27 23:16+0200\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"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 0.3\n"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -168,15 +168,13 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1121(None)
-msgid ""
-"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1293(None)
-msgid ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -196,8 +194,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1375(None)
-msgid ""
-"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -206,8 +203,7 @@ msgstr "a"
 #, fuzzy
 #| msgid ""
 #| "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgid ""
-"@@image: 'figures/evo_newmess_a.png'; md5=7349234fd8d9d8085745b8c101e6e1ce"
+msgid "@@image: 'figures/evo_newmess_a.png'; md5=7349234fd8d9d8085745b8c101e6e1ce"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -228,17 +224,12 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1627(None)
-msgid ""
-"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1671(None)
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/attach_reminder_a.png'; "
-#| "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 msgid ""
 "@@image: 'figures/attach_reminder_a.png'; "
 "md5=e0c90f77e6df9ad52589af09fdbbfdd7"
@@ -291,8 +282,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:2632(None)
-msgid ""
-"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -372,8 +362,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:3496(None)
-msgid ""
-"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -387,8 +376,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:3802(None)
-msgid ""
-"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -437,8 +425,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:4182(None)
-msgid ""
-"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -547,8 +534,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:5608(None)
-msgid ""
-"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -621,8 +607,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6392(None)
-msgid ""
-"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -649,15 +634,13 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6745(None)
-msgid ""
-"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6771(None)
-msgid ""
-"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -679,8 +662,7 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:7014(None)
-msgid ""
-"@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
+msgid "@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -709,8 +691,9 @@ msgstr "2002-2009"
 
 #: C/evolution.xml:29(revnumber) C/evolution.xml:37(revnumber)
 #: C/evolution.xml:80(productnumber)
-msgid "2.24"
-msgstr "2.24"
+#| msgid "2.24"
+msgid "2.26"
+msgstr "2.26"
 
 #: C/evolution.xml:30(date)
 msgid "March 2009"
@@ -754,8 +737,9 @@ msgid "October 5, 2006"
 msgstr "5. Oktober 2006"
 
 #: C/evolution.xml:70(releaseinfo)
-msgid "This manual describes version 2.24 of Evolution"
-msgstr "Dieses Handbuch beschreibt Version 2.24 von »Evolution«"
+#| msgid "This manual describes version 2.24 of Evolution"
+msgid "This manual describes version 2.26 of Evolution"
+msgstr "Dieses Handbuch beschreibt Version 2.26 von »Evolution«"
 
 #: C/evolution.xml:74(para)
 msgid ""
@@ -775,21 +759,26 @@ msgid "February 2008"
 msgstr "Februar 2008"
 
 #: C/evolution.xml:82(title) C/evolution.xml:7813(para)
-msgid "Evolution 2.24 User Guide"
-msgstr "Evolution 2.24 Benutzerhandbuch"
+#| msgid "Evolution 2.24 User Guide"
+msgid "Evolution 2.26 User Guide"
+msgstr "Evolution 2.26 Benutzerhandbuch"
 
 #: C/evolution.xml:87(title)
 msgid "About This Guide"
 msgstr "Über dieses Benutzerhandbuch"
 
 #: C/evolution.xml:88(para)
+#| msgid ""
+#| "This guide describes how to use and manage <trademark>Evolution</"
+#| "trademark> 2.24 client software. This guide is intended for users and is "
+#| "divided into the following sections:"
 msgid ""
 "This guide describes how to use and manage <trademark>Evolution</trademark> "
-"2.24 client software. This guide is intended for users and is divided into "
+"2.26 client software. This guide is intended for users and is divided into "
 "the following sections:"
 msgstr ""
 "Dieses Benutzerhandbuch beschreibt die Nutzung der Software "
-"<trademark>Evolution</trademark> 2.24 und ist in folgende Kapitel unterteilt:"
+"<trademark>Evolution</trademark> 2.26 und ist in folgende Kapitel unterteilt:"
 
 #: C/evolution.xml:91(link) C/evolution.xml:152(title)
 msgid "Getting Started"
@@ -953,8 +942,7 @@ msgstr ""
 
 #: C/evolution.xml:206(para)
 msgid "Using the first-run assistant takes two to five minutes."
-msgstr ""
-"Die Nutzung des Erste-Schritte-Assistenten dauert zwei bis fünf Minuten."
+msgstr "Die Nutzung des Erste-Schritte-Assistenten dauert zwei bis fünf Minuten."
 
 #: C/evolution.xml:207(para)
 msgid ""
@@ -1102,7 +1090,9 @@ msgstr "Novell GroupWise:"
 msgid ""
 "Select this option if you connect to a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> server."
-msgstr "Wählen Sie diese Option, wenn Sie eine Verbindung zu einem Novell <trademark class=\"registered\">GroupWise</trademark>-Server herstellen möchten."
+msgstr ""
+"Wählen Sie diese Option, wenn Sie eine Verbindung zu einem Novell <trademark "
+"class=\"registered\">GroupWise</trademark>-Server herstellen möchten."
 
 #: C/evolution.xml:273(para) C/evolution.xml:279(para)
 #: C/evolution.xml:289(para) C/evolution.xml:294(para)
@@ -1111,8 +1101,8 @@ msgid ""
 "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
 "Configuration Options</link>."
 msgstr ""
-"Für Anleitungen zur Konfiguration siehe "
-"<link linkend=\"bstfw13\">Fernzugriff-Einstellungsoptionen</link>."
+"Für Anleitungen zur Konfiguration siehe <link linkend=\"bstfw13"
+"\">Fernzugriff-Einstellungsoptionen</link>."
 
 #: C/evolution.xml:275(title)
 msgid "Microsoft Exchange:"
@@ -1122,12 +1112,16 @@ msgstr "Microsoft Exchange:"
 msgid ""
 "Available only if the evolution-exchange package is installed. Select this "
 "option if you connect to a Microsoft Exchange 2000 or 2003 server."
-msgstr "Dies ist nur verfügbar, wenn das Paket evolution-exchange installiert ist. Wählen Sie diese Option, wenn Sie eine Verbindung zu einem Microsoft Exchange 2000 or 2003-Server herstellen möchten."
+msgstr ""
+"Dies ist nur verfügbar, wenn das Paket evolution-exchange installiert ist. "
+"Wählen Sie diese Option, wenn Sie eine Verbindung zu einem Microsoft "
+"Exchange 2000 or 2003-Server herstellen möchten."
 
 #: C/evolution.xml:278(para) C/evolution.xml:284(para)
 msgid "Email, calendar, and contact information are stored on the server."
 msgstr ""
-"E-Mails sowie Kalender- und Kontaktinformationen werden auf dem Server gespeichert."
+"E-Mails sowie Kalender- und Kontaktinformationen werden auf dem Server "
+"gespeichert."
 
 #: C/evolution.xml:281(title)
 msgid "MAPI Exchange:"
@@ -1138,7 +1132,11 @@ msgid ""
 "Available only if you have installed the evolution-mapi package and if the "
 "Exchange MAPI plugin from the Edit &gt; Plugins menu is enabled. It allows "
 "you to connect to a Microsoft Exchange 2007 server."
-msgstr "Dies ist nur verfügbar, wenn das Paket evolution-mapi installiert ist und das Exchange MAPI-Plugin unter Bearbeiten &gt; Plugins aktiviert ist. Wählen Sie diese Option, wenn Sie eine Verbindung zu einem Microsoft Exchange 2007-Server herstellen möchten."
+msgstr ""
+"Dies ist nur verfügbar, wenn das Paket evolution-mapi installiert ist und "
+"das Exchange MAPI-Plugin unter Bearbeiten &gt; Plugins aktiviert ist. Wählen "
+"Sie diese Option, wenn Sie eine Verbindung zu einem Microsoft Exchange 2007-"
+"Server herstellen möchten."
 
 #: C/evolution.xml:286(title)
 msgid "IMAP:"
@@ -1169,8 +1167,7 @@ msgid "USENET News:"
 msgstr "USENET-News:"
 
 #: C/evolution.xml:297(para)
-msgid ""
-"Connects to a news server and downloads a list of available news digests."
+msgid "Connects to a news server and downloads a list of available news digests."
 msgstr ""
 "Verbindet Evolution mit einem News-Server und lädt eine Liste verfügbarer "
 "Nachrichten aus Newsgroups herunter."
@@ -1201,7 +1198,8 @@ msgid ""
 "For configuration instructions, see <link linkend=\"bstgbqn\">Local "
 "Configuration Options</link>."
 msgstr ""
-"Für weitere Informationen zur Konfiguration siehe <link linkend=\"bstgbqn\">Lokale Konfigurationseinstellungen</link>."
+"Für weitere Informationen zur Konfiguration siehe <link linkend=\"bstgbqn"
+"\">Lokale Konfigurationseinstellungen</link>."
 
 #: C/evolution.xml:306(title)
 msgid "MH Format Mail Directories:"
@@ -1211,12 +1209,15 @@ msgstr "E-Mail-Verzeichnisse im MH-Format"
 msgid ""
 "If you download your email using MH or another MH-style program, you should "
 "use this option."
-msgstr "Wählen Sie diese Option falls Sie E-Mails per MH oder durch eine MH-gleiche Anwendung "
-"herunterladen möchten."
+msgstr ""
+"Wählen Sie diese Option falls Sie E-Mails per MH oder durch eine MH-gleiche "
+"Anwendung herunterladen möchten."
 
 #: C/evolution.xml:309(para) C/evolution.xml:315(para)
 msgid "You need to provide the path to the mail directory you want to use."
-msgstr "Hierfür müssen Sie den Pfad zum Mail-Verzeichnis angeben, das benutzt werden soll."
+msgstr ""
+"Hierfür müssen Sie den Pfad zum Mail-Verzeichnis angeben, das benutzt werden "
+"soll."
 
 #: C/evolution.xml:312(title)
 msgid "Maildir Format Mail Directories:"
@@ -1226,8 +1227,9 @@ msgstr "E-Mail-Verzeichnisse im Maildir-Format"
 msgid ""
 "If you download your email using Qmail or another Maildir-style program, you "
 "should use this option."
-msgstr "Wählen Sie diese Option falls Sie E-Mails per Qmail oder durch eine Maildir-gleiche Anwendung "
-"herunterladen möchten."
+msgstr ""
+"Wählen Sie diese Option falls Sie E-Mails per Qmail oder durch eine Maildir-"
+"gleiche Anwendung herunterladen möchten."
 
 #: C/evolution.xml:318(title)
 msgid "Standard Unix mbox Spool File:"
@@ -1464,8 +1466,7 @@ msgstr "Sie müssen die folgende Optionen für diesen Server-Typen angeben:"
 #: C/evolution.xml:728(para) C/evolution.xml:751(para)
 #: C/evolution.xml:5956(para)
 msgid "Select if you want Evolution to automatically check for new mail."
-msgstr ""
-"Wählen Sie, ob Evolution automatisch nach neuen Nachrichten schauen soll."
+msgstr "Wählen Sie, ob Evolution automatisch nach neuen Nachrichten schauen soll."
 
 #: C/evolution.xml:412(para) C/evolution.xml:453(para)
 #: C/evolution.xml:585(para) C/evolution.xml:629(para)
@@ -1653,14 +1654,16 @@ msgid ""
 "If you select Microsoft Exchange MAPI as your receiving server type, you "
 "need to specify the following options:"
 msgstr ""
-"Falls Sie Microsoft Exchange MAPI als Servertypen gewählt haben, sind folgende "
-"Einstellungen zu treffen:"
+"Falls Sie Microsoft Exchange MAPI als Servertypen gewählt haben, sind "
+"folgende Einstellungen zu treffen:"
 
 #: C/evolution.xml:492(para)
 msgid ""
 "Select the desired options as given in the following table, then click "
 "Forward."
-msgstr "Wählen Sie die gewünschten Optionen aus der nachfolgenden Tabelle auss, und klicken Sie auf Vor."
+msgstr ""
+"Wählen Sie die gewünschten Optionen aus der nachfolgenden Tabelle auss, und "
+"klicken Sie auf Vor."
 
 #: C/evolution.xml:500(para)
 msgid "Options"
@@ -1681,16 +1684,17 @@ msgid ""
 "mail. If you select this option, you need to specify how often Evolution "
 "should check for new messages."
 msgstr ""
-"Wählen Sie diese Option falls Evolution automatisch nach neuen Nachrichten schauen soll. Falls Sie diese Option wählen müssen Sie angeben, wie oft Evolution nach neuen Nachrichten schauen soll."
+"Wählen Sie diese Option falls Evolution automatisch nach neuen Nachrichten "
+"schauen soll. Falls Sie diese Option wählen müssen Sie angeben, wie oft "
+"Evolution nach neuen Nachrichten schauen soll."
 
 #: C/evolution.xml:518(para)
 msgid "Check for new messages in all folders"
-msgstr ""
-"Nach neuen Nachrichten in allen Ordnern schauen"
+msgstr "Nach neuen Nachrichten in allen Ordnern schauen"
 
 #: C/evolution.xml:526(para)
 msgid "Global Catalog server name"
-msgstr ""
+msgstr "Name des globalen Katalog-Servers"
 
 #: C/evolution.xml:535(para)
 msgid "Limit number of GAL responses"
@@ -1702,13 +1706,11 @@ msgstr "Konto automatisch lokal abgleichen"
 
 #: C/evolution.xml:552(para)
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
+msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
 #: C/evolution.xml:560(para)
 msgid "Check new messages for Junk contents"
-msgstr ""
-"Neue Nachrichten auf unerwünschte Inhalte überprüfen"
+msgstr "Neue Nachrichten auf unerwünschte Inhalte überprüfen"
 
 #: C/evolution.xml:588(para)
 msgid ""
@@ -1797,8 +1799,7 @@ msgstr ""
 "evolution.mail würde also als evolution dargestellt werden."
 
 #: C/evolution.xml:692(para)
-msgid ""
-"Select if you want to use the <emphasis>.folders</emphasis> summary file."
+msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr "Wählen Sie, ob die .folders-Zusammenfassungsdatei genutzt werden soll."
 
 #: C/evolution.xml:725(title)
@@ -1806,8 +1807,7 @@ msgid "Standard Unix mbox Spool File Receiving Options"
 msgstr "Empfangsoptionen für Standard-Unix-mbox-Spool-Datei"
 
 #: C/evolution.xml:735(para) C/evolution.xml:758(para)
-msgid ""
-"Select if you want to store status headers in Elm, Pine, and Mutt formats."
+msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Wählen Sie, ob die Statuskopfzeilen im Elm-, Pine- oder Mutt-Format "
 "gespeichert werden sollen."
@@ -2483,8 +2483,7 @@ msgstr ""
 "die lokale Festplatte zur Offline-Nutzung kopiert werden soll."
 
 #: C/evolution.xml:1017(para)
-msgid ""
-"You can also rearrange folders and messages by dragging and dropping them."
+msgid "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "Sie können auch Ordner und Dateien anders anordnen, indem Sie diese mit der "
 "linken Maustaste an eine andere Stelle ziehen und loslassen (Drag and Drop)."
@@ -2815,8 +2814,7 @@ msgstr ""
 
 #: C/evolution.xml:1104(para) C/evolution.xml:1122(para)
 msgid "Evolution will auto-restart after the process."
-msgstr ""
-"Evolution wird nach Beendigung des Vorgangs automatisch wieder gestartet."
+msgstr "Evolution wird nach Beendigung des Vorgangs automatisch wieder gestartet."
 
 #: C/evolution.xml:1109(title)
 msgid "Restoring Evolution"
@@ -3233,6 +3231,9 @@ msgid ""
 "Select this option to display a new mail icon in the notification area when "
 "a new message arrives. You have two options to select from:"
 msgstr ""
+"Wählen Sie diese Option um ein Symbol im Benachrichtigungsfeld angezeigt zu "
+"bekommen wenn eine neue Nachricht empfangen wurde. Sie können aus zwei "
+"Möglichkeiten auswählen:"
 
 #: C/evolution.xml:1311(title)
 msgid "Blinking icon in the notification area:"
@@ -3243,6 +3244,8 @@ msgid ""
 "Select this option to make the new mail icon blink in the notification area "
 "on arrival of a new message."
 msgstr ""
+"Wählen Sie dies, damit das Symbol im Benachrichtigungsfeld blinkt, wenn eine "
+"neue Nachricht empfangen wurde."
 
 #: C/evolution.xml:1317(title)
 msgid "Popup message together with the icon:"
@@ -3253,6 +3256,8 @@ msgid ""
 "Select this option to make the new message pop up along with the new mail "
 "icon."
 msgstr ""
+"Wählen Sie dies, damit die neue Nachricht im einem Vorschaufenster zusammen mit "
+"dem Symbol im Benachrichtigungsfeld angezeigt wird."
 
 #: C/evolution.xml:1323(title)
 msgid "Play sound when new messages arrive:"
@@ -3267,8 +3272,7 @@ msgid "Beep:"
 msgstr "Warnton:"
 
 #: C/evolution.xml:1330(para)
-msgid ""
-"Select this option to play a beep sound on the arrival of a new message."
+msgid "Select this option to play a beep sound on the arrival of a new message."
 msgstr ""
 "Wählen Sie diese Option, wenn ein Signalton beim Eintreffen einer neuen "
 "Nachricht ausgegeben werden soll."
@@ -3350,8 +3354,7 @@ msgid "Classical View:"
 msgstr "Klassische Ansicht:"
 
 #: C/evolution.xml:1368(para)
-msgid ""
-"To switch to classical view, click View &gt; Preview &gt; Classical View."
+msgid "To switch to classical view, click View &gt; Preview &gt; Classical View."
 msgstr "Wählen Sie Ansicht &gt; Vorschau &gt; Klassische Ansicht."
 
 #: C/evolution.xml:1373(title)
@@ -3370,8 +3373,7 @@ msgstr ""
 "Adressen selbst bestimmen."
 
 #: C/evolution.xml:1376(para)
-msgid ""
-"Use the following procedure to set the limit of addresses to be displayed:"
+msgid "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Gehen Sie wie folgt vor, um die Anzahl der anzuzeigenden Adressen zu "
 "bestimmen:"
@@ -3426,8 +3428,7 @@ msgstr ""
 
 #: C/evolution.xml:1399(para)
 msgid "Download your mail in the other application as you would normally."
-msgstr ""
-"Laden Sie Ihre E-Mails in der anderen Anwendung wie sonst auch herunter."
+msgstr "Laden Sie Ihre E-Mails in der anderen Anwendung wie sonst auch herunter."
 
 #: C/evolution.xml:1402(para)
 msgid "In Evolution:"
@@ -3971,8 +3972,7 @@ msgstr ""
 "Umschalttaste+Steuerung+M."
 
 #: C/evolution.xml:1580(para)
-msgid ""
-"Select Insert &gt; Custom Header to open the Email Custom Header window."
+msgid "Select Insert &gt; Custom Header to open the Email Custom Header window."
 msgstr ""
 
 #: C/evolution.xml:1582(para)
@@ -4954,9 +4954,7 @@ msgstr "Um die Vorgabe-Einstellungen zu ändern,"
 
 #: C/evolution.xml:2019(para)
 msgid "Select the mail account whose settings you want to change."
-msgstr ""
-"Wählen Sie das E-Mail-Konto aus, dessen Einstellungen Sie ändern "
-"möchten."
+msgstr "Wählen Sie das E-Mail-Konto aus, dessen Einstellungen Sie ändern möchten."
 
 #: C/evolution.xml:2022(para) C/evolution.xml:6578(para)
 #: C/evolution.xml:6646(para)
@@ -5150,18 +5148,21 @@ msgid ""
 "send mail with the same pattern. Evolution allows you to create and edit "
 "message templates."
 msgstr ""
+"Eine Nachrichtenvorlage ist eine Standardnachricht, welche sie zum wiederholten "
+"Versenden von Nachrichten mit dem selben Muster verwenden können. Evolution "
+"ermöglicht das Erstellen und Bearbeiten von Nachrichtenvorlagen."
 
 #: C/evolution.xml:2125(link) C/evolution.xml:2145(title)
 msgid "Creating a Message Template from an Existing Message"
-msgstr ""
+msgstr "Eine Nachrichtenvorlage aus einer bestehenden Nachricht erstellen"
 
 #: C/evolution.xml:2128(link) C/evolution.xml:2172(title)
 msgid "Saving a New Message as a Template"
-msgstr ""
+msgstr "Eine neue Nachricht als Vorlage speichern"
 
 #: C/evolution.xml:2131(link) C/evolution.xml:2184(title)
 msgid "Using a Message Template as a Reply"
-msgstr ""
+msgstr "Eine Nachrichtenvorlage als Antwort verwenden"
 
 #: C/evolution.xml:2134(link) C/evolution.xml:2201(title)
 msgid "Configuring Message Templates"
@@ -5182,6 +5183,8 @@ msgstr "Wählen Sie die Nachricht aus."
 #: C/evolution.xml:2151(para)
 msgid "Right-click &gt; Move to folder / Copy to folder."
 msgstr ""
+"Klicken Sie mit der rechten Maustaste und wählen Sie »In Ordner verschieben« / "
+"»In Ordner kopieren«."
 
 #: C/evolution.xml:2154(para)
 msgid "Select the Template local folder."
@@ -5190,6 +5193,8 @@ msgstr "Wählen Sie den lokalen Ordner »Vorlagen« aus."
 #: C/evolution.xml:2157(para)
 msgid "You can also edit an existing message and save it as a template."
 msgstr ""
+"Sie können auch eine bestehende Nachricht bearbeiten und diese als Vorlage "
+"speichern."
 
 #: C/evolution.xml:2160(para)
 msgid "Open the message and click Reply."
@@ -5198,6 +5203,7 @@ msgstr "Öffnen Sie die Nachricht und klicken Sie auf »Antworten«."
 #: C/evolution.xml:2163(para)
 msgid "Edit the message body or the addresses according to your requirements."
 msgstr ""
+"Bearbeiten Sie den Inhalt der Nachricht oder die Empfänger nach Ihren Wünschen."
 
 #: C/evolution.xml:2166(para) C/evolution.xml:2178(para)
 msgid "Select File &gt; Save as Template."
@@ -5217,12 +5223,14 @@ msgstr ""
 
 #: C/evolution.xml:2188(para)
 msgid "This option lists all the message templates in the Template folder."
-msgstr ""
+msgstr "Dies listet alle Nachrichtenvorlagen im Ordner »Vorlagen« auf."
 
 #: C/evolution.xml:2191(para)
 msgid ""
 "Select Open the message template of your choice and make changes if required."
 msgstr ""
+"Wählen Sie die gewünschte Nachrichtenvorlage aus und nehmen Sie Änderungen vor "
+"(falls gewünscht)."
 
 #: C/evolution.xml:2195(para)
 msgid ""
@@ -5236,6 +5244,9 @@ msgid ""
 "message templates. You can add, edit or remove the key-value pairs. You can "
 "specify any number of key-value pairs."
 msgstr ""
+"Unter »Bearbeiten > Plugins > Vorlagen > Konfiguration« können Sie Ihre "
+"Nachrichtenvorlagen bearbeiten. Sie können Paare von Schlüsselwörtern und "
+"Werten hinzufügen, löschen und bearbeiten."
 
 #: C/evolution.xml:2203(para)
 msgid ""
@@ -5389,8 +5400,7 @@ msgstr ""
 
 #: C/evolution.xml:2253(para)
 msgid "Evolution displays a list of available files and folders."
-msgstr ""
-"Evolution zeigt Ihnen eine Liste der verfügbaren Dateien und Ordner an."
+msgstr "Evolution zeigt Ihnen eine Liste der verfügbaren Dateien und Ordner an."
 
 #: C/evolution.xml:2256(para)
 msgid "Select a file or folder by clicking it."
@@ -5408,8 +5418,7 @@ msgstr ""
 "diese."
 
 #: C/evolution.xml:2260(para)
-msgid ""
-"Enable the corresponding checkbox to add a folder to the subscribed list."
+msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Wählen Sie die zu abonnierenden Ordner aus, indem Sie das Ankreuzfeld "
 "anwählen."
@@ -5749,8 +5758,7 @@ msgstr "Klicken Sie auf den Reiter Sicherheit."
 
 #: C/evolution.xml:2377(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
-msgstr ""
-"Fügen Sie Ihre Schlüsselkennung in das Feld PGP/GPG-Schlüsselkennung ein."
+msgstr "Fügen Sie Ihre Schlüsselkennung in das Feld PGP/GPG-Schlüsselkennung ein."
 
 #: C/evolution.xml:2386(para)
 msgid ""
@@ -6055,8 +6063,7 @@ msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
 #: C/evolution.xml:2547(para)
-msgid ""
-"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "CSV- oder Tabulator-Dateien, die von Evolution, Microsoft Outlook und "
 "Mozilla gespeichert werden können."
@@ -6117,15 +6124,14 @@ msgstr "Klicken Sie auf Datei &gt; Importieren."
 
 #: C/evolution.xml:2574(para)
 msgid "Select Import a Single File, then click Forward."
-msgstr ""
-"Wählen Sie Eine einzelne Datei importieren aus, und klicken Sie auf Vor."
+msgstr "Wählen Sie Eine einzelne Datei importieren aus, und klicken Sie auf Vor."
 
 #: C/evolution.xml:2578(para)
-#, fuzzy
 #| msgid "Select the file to import, then click Forward."
 msgid ""
 "Browse and find the location to save the imported email, then click Forward."
-msgstr "Wählen Sie die zu importierende Datei aus, und klicken Sie auf Vor."
+msgstr ""
+"Wählen Sie den Ort für die zu speichernde Datei aus, und klicken Sie auf Vor."
 
 #: C/evolution.xml:2581(para)
 msgid "Select the file to import, then click Forward."
@@ -6144,8 +6150,7 @@ msgstr ""
 "es erkennen kann."
 
 #: C/evolution.xml:2600(para)
-msgid ""
-"Select Import Data and Settings From Older Programs, then click Forward."
+msgid "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Wählen Sie Daten und Einstellungen aus älteren Programmen importieren aus "
 "und klicken Sie auf Vor."
@@ -6188,8 +6193,7 @@ msgstr ""
 "Format nutzt)."
 
 #: C/evolution.xml:2614(para)
-msgid ""
-"Copy the files to the system or partition that Evolution is installed on."
+msgid "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Kopieren Sie die Dateien auf das System oder die Partition, auf der "
 "Evolution installiert ist."
@@ -6340,13 +6344,11 @@ msgstr "Um E-Mails zu sortieren, befolgen Sie folgende Schritte:"
 
 #: C/evolution.xml:2650(para)
 msgid "Right-click message header bar."
-msgstr ""
-"Klicken Sie mit der rechten Maustaste auf die Kopfzeile der E-Mail-Liste."
+msgstr "Klicken Sie mit der rechten Maustaste auf die Kopfzeile der E-Mail-Liste."
 
 #: C/evolution.xml:2653(para)
 msgid "Click Sort by to get a list of options."
-msgstr ""
-"Wählen Sie »Sortieren nach«, um eine Liste der Möglichkeiten zu erhalten."
+msgstr "Wählen Sie »Sortieren nach«, um eine Liste der Möglichkeiten zu erhalten."
 
 #: C/evolution.xml:2655(title)
 msgid "Sort by:"
@@ -6929,8 +6931,7 @@ msgid "Sender Contain:"
 msgstr "Absender enthält:"
 
 #: C/evolution.xml:2918(para)
-msgid ""
-"Finds messages whose From: header contains a match for your search text."
+msgid "Finds messages whose From: header contains a match for your search text."
 msgstr "Findet Nachrichten, die den gesuchten Text im Absender enthalten."
 
 #: C/evolution.xml:2921(title)
@@ -7784,8 +7785,7 @@ msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Prüft, ob alle ausgewählten Kriterien auf die Nachricht zutreffen."
 
 #: C/evolution.xml:3347(para)
-msgid ""
-"Select which folders will be used for the search folder. Your options are:"
+msgid "Select which folders will be used for the search folder. Your options are:"
 msgstr ""
 "Wählen Sie, welche Ordner für den Suchordner genutzt werden sollen. "
 "Verfügbar sind:"
@@ -8251,7 +8251,7 @@ msgstr ""
 
 #: C/evolution.xml:3513(para)
 msgid "To configure your Google Address Book in Evolution contacts:"
-msgstr ""
+msgstr "Um Ihr Google-Adressbuch im Evolution-Adressbuch zu benutzen:"
 
 #: C/evolution.xml:3516(para) C/evolution.xml:7186(para)
 msgid "Click File &gt; New &gt; Address Book."
@@ -9077,8 +9077,7 @@ msgstr "Ändern Sie den Namen im Name-Feld."
 
 #: C/evolution.xml:3980(para)
 msgid "To assign a color for the calendar, click the Color button."
-msgstr ""
-"Um einem Kalender eine Farbe zuzuweisen, klicken Sie auf den Farb-Knopf."
+msgstr "Um einem Kalender eine Farbe zuzuweisen, klicken Sie auf den Farb-Knopf."
 
 #: C/evolution.xml:3983(para)
 msgid "Select the color and click OK."
@@ -9195,8 +9194,7 @@ msgstr ""
 "Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren« aus."
 
 #: C/evolution.xml:4042(para)
-msgid ""
-"If you select this option, you cannot modify or create the calendar items."
+msgid "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Falls Sie diese Option wählen können Sie Kalendereinträge weder erzeugen "
 "noch bearbeiten."
@@ -9241,8 +9239,7 @@ msgid "Using the Free/Busy View"
 msgstr "Die Verfügbarkeitsansicht benutzen"
 
 #: C/evolution.xml:4074(link) C/evolution.xml:4400(title)
-msgid ""
-"Publishing Calendar and Free/Busy Information Without a Groupware Server"
+msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Kalender- und Verfügbarkeitsinformationen veröffentlichen ohne einen "
 "GroupWare-Server"
@@ -9295,8 +9292,7 @@ msgstr ""
 "welche Sie in der Kalenderansicht geklickt haben."
 
 #: C/evolution.xml:4109(para)
-msgid ""
-"Select the required duration on the calender view and enter the summary."
+msgid "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Wählen Sie die gewünschte Dauer des Termins in der Kalenderansicht und geben "
 "Sie eine Zusammenfassung ein."
@@ -9511,8 +9507,7 @@ msgid "Display:"
 msgstr "Alarm-Popup anzeigen:"
 
 #: C/evolution.xml:4194(para)
-msgid ""
-"A notification pops up on your screen to remind you of your appointment."
+msgid "A notification pops up on your screen to remind you of your appointment."
 msgstr ""
 "Ein Benachrichtigungsfenster öffnet sich auf Ihrem Bildschirm, um Sie an den "
 "Termin zu erinnern."
@@ -9615,8 +9610,7 @@ msgstr ""
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
-msgstr ""
-"Wählen Sie die gewünschten Ankreuzfelder der jeweiligen Kategorien aus."
+msgstr "Wählen Sie die gewünschten Ankreuzfelder der jeweiligen Kategorien aus."
 
 #: C/evolution.xml:4240(para)
 msgid ""
@@ -9743,8 +9737,7 @@ msgstr ""
 "hinzuzufügen, die Sie einladen möchten."
 
 #: C/evolution.xml:4273(para)
-msgid ""
-"To remove an attendee from the list, select an attendee and press Remove."
+msgid "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Um einen Teilnehmer von der Liste zu entfernen, wählen Sie den Teilnehmer "
 "aus und klicken Sie auf den Entfernen-Knopf."
@@ -9782,8 +9775,7 @@ msgstr ""
 "Besprechung zu speichern."
 
 #: C/evolution.xml:4336(para)
-msgid ""
-"An email is sent out to all the recipients, inviting them to your event."
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Eine E-Mail wird an alle Teilnehmer verschickt, um diese für das Ereignis "
 "einzuladen."
@@ -10371,8 +10363,7 @@ msgid "Searching for Task Items"
 msgstr "Nach Aufgaben suchen"
 
 #: C/evolution.xml:4760(para)
-msgid ""
-"Evolution enables you to find the task items by using Customized Search."
+msgid "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution ermöglicht das Auffinden von Aufgaben, indem Sie die Individuelle "
 "Suche benutzen."
@@ -10417,8 +10408,7 @@ msgstr "Nicht einsortiert:"
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
-msgstr ""
-"Zeigt alle Aufgaben an, die in keine der aufgelisteten Kategorien fallen."
+msgstr "Zeigt alle Aufgaben an, die in keine der aufgelisteten Kategorien fallen."
 
 #: C/evolution.xml:4817(title)
 msgid "Next 7 Days' Tasks:"
@@ -10595,8 +10585,7 @@ msgstr ""
 "Schnelle Suche nach Notizen durchführen."
 
 #: C/evolution.xml:4996(para)
-msgid ""
-"Evolution enables you to find the Memo items by using a Customized Search."
+msgid "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution ermöglicht das Auffinden von Notizen indem Sie die Individuelle "
 "Suche benutzen."
@@ -10616,8 +10605,7 @@ msgstr ""
 
 #: C/evolution.xml:5128(para)
 msgid "You can view the desired items listed in the Memo view."
-msgstr ""
-"Sie können die gewünschten Einträge nun in der Notizenansicht betrachten."
+msgstr "Sie können die gewünschten Einträge nun in der Notizenansicht betrachten."
 
 #: C/evolution.xml:5136(para)
 msgid "Evolution supports the use of multiple time zones."
@@ -10628,9 +10616,8 @@ msgid ""
 "If you share calendar files with friends or co-workers, you might need to "
 "configure your time zone."
 msgstr ""
-"Falls Sie Kalenderdateien "
-"mit Freunden oder Arbeitskollegen teilen, so sollten Sie gegebenenfalls Ihre "
-"Zeitzone angeben. "
+"Falls Sie Kalenderdateien mit Freunden oder Arbeitskollegen teilen, so "
+"sollten Sie gegebenenfalls Ihre Zeitzone angeben. "
 
 #: C/evolution.xml:5143(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
@@ -11098,7 +11085,7 @@ msgstr "Öffentliche Ordner abonnieren"
 
 #: C/evolution.xml:5430(link) C/evolution.xml:5627(title)
 msgid "Setting an Out of Office Message"
-msgstr ""
+msgstr "Eine »Nicht im Büro«-Nachricht setzen"
 
 #: C/evolution.xml:5439(para)
 msgid ""
@@ -11127,13 +11114,12 @@ msgstr ""
 
 #: C/evolution.xml:5450(para)
 msgid "Select the exchange account from the From field."
-msgstr ""
+msgstr "Wählen Sie Ihr Exchange-Konto im »Von«-Feld."
 
 #: C/evolution.xml:5453(para)
-#, fuzzy
 #| msgid "Click Folder &gt; Subscriptions."
 msgid "Click Insert &gt; Send Options."
-msgstr "Klicken Sie auf Ordner &gt; Abonnements."
+msgstr "Klicken Sie auf Einfügen &gt; Versandoptionen."
 
 #: C/evolution.xml:5458(para) C/evolution.xml:6147(para)
 msgid ""
@@ -11361,8 +11347,7 @@ msgid "Check the folders you want to subscribe to."
 msgstr "Wählen Sie die Ordner aus, die Sie abonnieren möchten."
 
 #: C/evolution.xml:5613(para)
-msgid ""
-"The folders you have subscribed to appear in the folder list at the left."
+msgid "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Die Ordner, die Sie abonniert haben, erscheinen in der Ordnerleiste links "
 "auf dem Bildschirm."
@@ -11402,8 +11387,7 @@ msgstr ""
 
 #: C/evolution.xml:5634(para)
 msgid "Select the Exchange account, then click Edit."
-msgstr ""
-"Wählen Sie das Exchange-Konto aus und klicken Sie dann auf »Bearbeiten«."
+msgstr "Wählen Sie das Exchange-Konto aus und klicken Sie dann auf »Bearbeiten«."
 
 #: C/evolution.xml:5637(para)
 msgid ""
@@ -11441,12 +11425,11 @@ msgid "Create a new appointment in the calendar."
 msgstr "Erstellen Sie einen neuen Termin im Kalender."
 
 #: C/evolution.xml:5663(para)
-#, fuzzy
 #| msgid "Right-click in the text, then click Insert Link."
 msgid "Right-click the appointment, then select Schedule Meeting."
 msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Termin, und wählen Sie Link "
-"einfügen."
+"Klicken Sie mit der rechten Maustaste auf den Termin, und wählen Sie "
+"»Besprechung ansetzen«."
 
 #: C/evolution.xml:5666(para)
 msgid "Click the Add tab to enter the email addresses into the list."
@@ -11459,8 +11442,7 @@ msgid ""
 msgstr ""
 
 #: C/evolution.xml:5670(para)
-msgid ""
-"You can directly select the participants from the following address lists."
+msgid "You can directly select the participants from the following address lists."
 msgstr ""
 
 #: C/evolution.xml:5676(para)
@@ -11542,15 +11524,15 @@ msgstr ""
 
 #: C/evolution.xml:5729(link) C/evolution.xml:6063(title)
 msgid "Managing Sent Items"
-msgstr ""
+msgstr "Verschickte Objekte verwalten"
 
 #: C/evolution.xml:5732(link) C/evolution.xml:6252(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
-msgstr ""
+msgstr "Anderen Personen Zugriff auf Ihre E-Mails oder Ihren Kalender gewähren"
 
 #: C/evolution.xml:5735(link) C/evolution.xml:6423(title)
 msgid "Junk Mail Handling"
-msgstr ""
+msgstr "Handhaben unerwünschter Nachrichten"
 
 #: C/evolution.xml:5741(para)
 msgid ""
@@ -11936,7 +11918,7 @@ msgstr ""
 
 #: C/evolution.xml:6097(title)
 msgid "Request a Reply:"
-msgstr ""
+msgstr "Eine Antwort anfordern:"
 
 #: C/evolution.xml:6098(para)
 msgid ""
@@ -11953,7 +11935,7 @@ msgstr "Statusverfolgung aktivieren"
 #: C/evolution.xml:6105(para) C/evolution.xml:6144(para)
 #: C/evolution.xml:6160(para)
 msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr ""
+msgstr "Wählen Sie im Nachrichteneditor »Einfügen &gt; Versandoptionen«."
 
 #: C/evolution.xml:6106(para) C/evolution.xml:6227(para)
 msgid "Select Status Tracking."
@@ -11992,8 +11974,7 @@ msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 
 #: C/evolution.xml:6133(para)
-msgid ""
-"Right-click an email in your Sent folder, then click Track Message Status."
+msgid "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 
 #: C/evolution.xml:6134(para)
@@ -12839,8 +12820,7 @@ msgid "All Headers:"
 msgstr "Alle Kopfzeilen:"
 
 #: C/evolution.xml:6628(para)
-msgid ""
-"All available IMAP mail headers for all the messages will be downloaded."
+msgid "All available IMAP mail headers for all the messages will be downloaded."
 msgstr ""
 
 #: C/evolution.xml:6631(title)
@@ -12906,8 +12886,7 @@ msgid ""
 msgstr "Klicken Sie auf den Reiter »IMAP-Kopfzeilen«."
 
 #: C/evolution.xml:6654(para)
-msgid ""
-"Click Fetch All Headers to download all the available header information."
+msgid "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Wählen Sie »Alle Kopfzeilen laden«, um alle verfügbaren Kopfzeilen-"
 "Informationen herunterzuladen. "
@@ -12939,8 +12918,7 @@ msgstr ""
 
 #: C/evolution.xml:6669(para)
 msgid "Click Remove to remove the custom headers."
-msgstr ""
-"Klicken Sie auf Entfernen, um benutzerdefinierte Kopfzeilen zu entfernen."
+msgstr "Klicken Sie auf Entfernen, um benutzerdefinierte Kopfzeilen zu entfernen."
 
 #: C/evolution.xml:6676(para)
 msgid ""
@@ -13775,8 +13753,7 @@ msgstr "Netzwerkeinstellungen"
 
 #: C/evolution.xml:7013(para)
 msgid "This interface lets you configure your network proxy settings."
-msgstr ""
-"In diesem Bereich können Sie die Netzwerk-Proxy-Einstellungen vornehmen."
+msgstr "In diesem Bereich können Sie die Netzwerk-Proxy-Einstellungen vornehmen."
 
 #: C/evolution.xml:7017(title)
 msgid "Use system defaults:"
@@ -14185,8 +14162,7 @@ msgid "Search Filter:"
 msgstr "Suchfilter:"
 
 #: C/evolution.xml:7265(para)
-msgid ""
-"The search filter can be set here for all the LDAP queries. For example:"
+msgid "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Hier kann der Suchfilter für alle LDAP-Anfragen bestimmt werden. Zum "
 "Beispiel:"
@@ -14357,8 +14333,7 @@ msgid "Copy From Pilot:"
 msgstr "Vom Pilot kopieren:"
 
 #: C/evolution.xml:7333(para)
-msgid ""
-"If there is any new data on the handheld device, copy it to the computer."
+msgid "If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 "Falls neue Daten auf dem tragbaren Gerät vorhanden sind werden diese auf den "
 "Computer kopiert."
@@ -14554,8 +14529,7 @@ msgid "To import the data files:"
 msgstr "Um die Dateien zu importieren:"
 
 #: C/evolution.xml:7396(para)
-msgid ""
-"In Evolution, open the File Import assistant by clicking File &gt; Import."
+msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "Öffnen Sie den Import-Assistenten in Evolution, indem Sie auf Datei &gt; "
 "Importieren klicken."
@@ -14694,8 +14668,7 @@ msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Die Anzeige in der Nachrichtenvorschau hoch und hinunter bewegen:"
 
 #: C/evolution.xml:7473(para)
-msgid ""
-"Press the Spacebar to move down a page. Press Backspace to move up a page."
+msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Drücken Sie die Leertaste um sich hinunter zu bewegen. Drücken Sie die "
 "Löschen-Taste (Backspace) um sich hoch zu bewegen."
@@ -15338,8 +15311,7 @@ msgstr "Suchbereich"
 
 #: C/evolution.xml:7744(para)
 msgid "Search Scope states how much of the search base to search."
-msgstr ""
-"Der Suchbereich definiert, wieviel der Suchbasis durchsucht werden soll."
+msgstr "Der Suchbereich definiert, wieviel der Suchbasis durchsucht werden soll."
 
 #: C/evolution.xml:7748(glossterm)
 msgid "Sendmail"
@@ -15613,8 +15585,7 @@ msgstr ""
 
 #: C/evolution.xml:7822(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
-msgstr ""
-"SUSE ist ein registriertes Warenzeichen der SUSE AG, einer Novell-Firma."
+msgstr "SUSE ist ein registriertes Warenzeichen der SUSE AG, einer Novell-Firma."
 
 #: C/evolution.xml:7823(member)
 msgid ""
@@ -15633,3 +15604,4 @@ msgstr ""
 #: C/evolution.xml:0(None)
 msgid "translator-credits"
 msgstr "Andre Klapper <ak-47@gmx.net>, 2007, 2008, 2009"
+
diff --git a/help/de/figures/account_editor_a.png b/help/de/figures/account_editor_a.png
new file mode 100644
index 0000000000..b39de9c33b
--- /dev/null
+++ b/help/de/figures/account_editor_a.png
diff --git a/help/de/figures/evo_flag_follow_up_a.png b/help/de/figures/evo_flag_follow_up_a.png
new file mode 100644
index 0000000000..a4abe39bc5
--- /dev/null
+++ b/help/de/figures/evo_flag_follow_up_a.png
diff --git a/help/de/figures/evo_newmail.png b/help/de/figures/evo_newmail.png
new file mode 100644
index 0000000000..5f43fceb97
--- /dev/null
+++ b/help/de/figures/evo_newmail.png
diff --git a/help/de/figures/evo_select_folder.png b/help/de/figures/evo_select_folder.png
new file mode 100644
index 0000000000..a3dacfcc1f
--- /dev/null
+++ b/help/de/figures/evo_select_folder.png
diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h
index 38a4a86fae..93c1b89261 100644
--- a/mail/e-mail-attachment-bar.h
+++ b/mail/e-mail-attachment-bar.h
@@ -23,7 +23,7 @@
 #define E_MAIL_ATTACHMENT_BAR_H
 
 #include <gtk/gtk.h>
-#include <widgets/misc/e-attachment-view.h>
+#include <misc/e-attachment-view.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_ATTACHMENT_BAR \
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 346344cfc4..7ffc873cb8 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1606,10 +1606,12 @@ mail_reader_key_press_event_cb (EMailReader *reader,
 			break;
 
 		case GDK_period:
+		case GDK_bracketleft:
 			action_name = "mail-next-unread";
 			break;
 
 		case GDK_comma:
+		case GDK_bracketright:
 			action_name = "mail-previous-unread";
 			break;
 
@@ -1623,7 +1625,7 @@ mail_reader_key_press_event_cb (EMailReader *reader,
 			break;
 #endif
 
-		case '!':
+		case GDK_exclam:
 			action_name = "mail-toggle-important";
 			break;
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e835d28a87..e25d0553cb 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -3047,9 +3047,11 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
 	const gchar *tmp;
 	EAccount *ea;
 	gboolean refresh = FALSE;
+	gboolean edit;
 
 	account = em_account_editor_get_modified_account (emae);
 	original_account = em_account_editor_get_modified_account (emae);
+	edit = (original_account != NULL);
 
 	/* We use the page-check of various pages to 'prepare' or
 	   pre-load their values, only in the druid */
@@ -3088,7 +3090,7 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
 				index = check_servers (at);
 				gtk_entry_set_text (emae->priv->source.username, user);
 				gtk_entry_set_text (emae->priv->transport.username, user);
-				if (uri && (url = camel_url_new (uri, NULL)) != NULL) {
+				if (!edit && uri && (url = camel_url_new (uri, NULL)) != NULL) {
 					refresh = TRUE;
 					camel_url_set_protocol (url, mail_servers[index].proto);
 					camel_url_set_param (url, "use_ssl", mail_servers[index].ssl);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 23dcd94bbe..40abdcf37d 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -760,7 +760,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 /* Editing messages... */
 
-static void
+static GtkWidget *
 edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 {
 	EMsgComposer *composer;
@@ -785,7 +785,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 		content = camel_medium_get_content_object ((CamelMedium *) message);
 		if (!content)
-			return;
+			return NULL;
 
 		/*
 		 * Get non-multipart content from multipart message.
@@ -798,11 +798,11 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 		}
 
 		if (!mime_part)
-			return;
+			return NULL;
 
 		type = camel_mime_part_get_content_type (mime_part);
 		if (!camel_content_type_is (type, "text", "plain"))
-			return;
+			return NULL;
 
 		mem = camel_stream_mem_new ();
 		camel_data_wrapper_decode_to_stream (content, mem);
@@ -909,7 +909,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 	composer_set_no_change (composer, TRUE, FALSE);
 
-	gtk_widget_show (GTK_WIDGET (composer));
+	if (!e_msg_composer_get_lite())
+		gtk_widget_show (GTK_WIDGET (composer));
+
+	return (GtkWidget *)composer;
 }
 
 /**
@@ -920,15 +923,18 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
  * Opens a composer filled in with the headers/mime-parts/etc of
  * @message.
  **/
-void
+GtkWidget *
 em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
 {
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+	GtkWidget *composer = NULL;
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
 	if (folder)
-		edit_message (message, folder, NULL);
+		composer = edit_message (message, folder, NULL);
 	else
-		edit_message (message, NULL, NULL);
+		composer = edit_message (message, NULL, NULL);
+
+	return composer;
 }
 
 static void
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index b16a1e56b3..f8c2cd580c 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -38,7 +38,7 @@ EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
 
-void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
+GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
 void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace);
 
 void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index d10b88d645..96c2e13b3e 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -535,9 +535,6 @@ emft_key_press_event (GtkWidget *widget,
 	tree_view = GTK_TREE_VIEW (widget);
 	selection = gtk_tree_view_get_selection (tree_view);
 
-	if (event->keyval == GDK_space)
-		return TRUE;
-
 	if (gtk_tree_selection_get_mode (selection) == GTK_SELECTION_SINGLE)
 		emft_clear_selected_list (EM_FOLDER_TREE (widget));
 
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 1aab32d503..9c6f5f8908 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -113,7 +113,8 @@ em_vfolder_editor_new (EMVFolderContext *vc)
 	g_free (gladefile);
 
 	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Search _Folders"));
-        gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "label17"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "filter_source_combobox"));
 	g_object_unref (gui);
 
 	return GTK_WIDGET (ve);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 9cc75057fa..323d21f4d7 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -797,8 +797,15 @@ get_folders (CamelStore *store, GPtrArray *folders, CamelFolderInfo *info)
 	camel_exception_init (&ex);
 
 	while (info) {
-		if (camel_store_can_refresh_folder (store, info, &ex))
-			g_ptr_array_add (folders, g_strdup (info->uri));
+		if (camel_store_can_refresh_folder (store, info, &ex)) {
+			CamelURL *url = camel_url_new (info->uri, NULL);
+
+			if (url && (!camel_url_get_param (url, "noselect") || !g_str_equal (camel_url_get_param (url, "noselect"), "yes")))
+				g_ptr_array_add (folders, g_strdup (info->uri));
+
+			if (url)
+				camel_url_free (url);
+		}
 		camel_exception_clear (&ex);
 
 		get_folders (store, folders, info->child);
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index d410abb9c2..ca2aa8592e 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -49,6 +49,51 @@ mail_shell_view_folder_tree_selected_cb (EMailShellView *mail_shell_view,
 	e_shell_view_update_actions (shell_view);
 }
 
+static gboolean
+mail_shell_view_folder_tree_key_press_event_cb (EMailShellView *mail_shell_view,
+                                                GdkEventKey *event)
+{
+	EMailReader *reader;
+	gboolean handled = FALSE;
+
+	if ((event->state & GDK_CONTROL_MASK) != 0)
+		goto ctrl;
+
+	/* <keyval> alone */
+	switch (event->keyval) {
+		case GDK_period:
+		case GDK_comma:
+		case GDK_bracketleft:
+		case GDK_bracketright:
+			goto emit;
+
+		default:
+			goto exit;
+	}
+
+ctrl:
+	/* Ctrl + <keyval> */
+	switch (event->keyval) {
+		case GDK_period:
+		case GDK_comma:
+			goto emit;
+
+		default:
+			goto exit;
+	}
+
+	/* All branches jump past this. */
+	g_return_val_if_reached (FALSE);
+
+emit:
+	/* Forward the key press to the EMailReader interface. */
+	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
+	g_signal_emit_by_name (reader, "key-press-event", event, &handled);
+
+exit:
+	return handled;
+}
+
 static void
 mail_shell_view_folder_tree_popup_event_cb (EShellView *shell_view,
                                             GdkEventButton *event)
@@ -315,6 +360,11 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 		mail_shell_view);
 
 	g_signal_connect_swapped (
+		folder_tree, "key-press-event",
+		G_CALLBACK (mail_shell_view_folder_tree_key_press_event_cb),
+		mail_shell_view);
+
+	g_signal_connect_swapped (
 		folder_tree, "popup-event",
 		G_CALLBACK (mail_shell_view_folder_tree_popup_event_cb),
 		mail_shell_view);
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 0437d0471d..785d53557a 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/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
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index e550851762..b4f0d98011 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -55,18 +55,18 @@ static void
 backup (const gchar *filename, gboolean restart)
 {
 	if (restart)
-		 execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (char *)NULL);
 	else
-		 execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (char *)NULL);
 }
 
 static void
 restore (const gchar *filename, gboolean restart)
 {
 	if (restart)
-		 execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (char *)NULL);
 	else
-		 execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (char *)NULL);
 }
 
 static gboolean
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 92adb2d7a4..1ca9a52dc2 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -51,11 +51,11 @@ static gchar *chk_file = NULL;
 static gboolean restart_arg = FALSE;
 static gboolean gui_arg = FALSE;
 static gchar **opt_remaining = NULL;
-static gint result=0;
+static gint result = 0;
 static GtkWidget *progress_dialog;
 static GtkWidget *pbar;
 static gchar *txt = NULL;
-gboolean complete = FALSE;
+static gboolean complete = FALSE;
 
 static GOptionEntry options[] = {
 	{ "backup", '\0', 0, G_OPTION_ARG_NONE, &backup_op,
@@ -76,9 +76,11 @@ static GOptionEntry options[] = {
 #define d(x)
 
 #define print_and_run(x) G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END
-
 #define CANCEL(x) if (x) return;
 
+static gboolean check (const gchar *filename);
+
+
 static GString *
 replace_string (const gchar *text, const gchar *find, const gchar *replace)
 {
@@ -228,6 +230,20 @@ restore (const gchar *filename)
 	gchar *quotedfname;
 
 	g_return_if_fail (filename && *filename);
+
+	if (!check (filename)) {
+		g_message ("Cannot restore from an incorrect archive '%s'.", filename);
+
+		if (restart_arg) {
+			CANCEL (complete);
+			txt = _("Restarting Evolution");
+			complete=TRUE;
+			run_cmd (EVOLUTION);
+		}
+
+		return;
+	}
+
 	quotedfname = g_shell_quote(filename);
 
 	/* FIXME Will the versioned setting always work? */
@@ -273,38 +289,51 @@ restore (const gchar *filename)
 
 }
 
-static void
+static gboolean
 check (const gchar *filename)
 {
 	gchar *command;
 	gchar *quotedfname;
 
-	g_return_if_fail (filename && *filename);
+	g_return_val_if_fail (filename && *filename, FALSE);
 	quotedfname = g_shell_quote(filename);
 
-	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname);
+	command = g_strdup_printf ("tar ztf %s 1>/dev/null", quotedfname);
 	result = system (command);
 	g_free (command);
 
 	g_message ("First result %d", result);
-	if (result)
-		exit (result);
+	if (result) {
+		g_free (quotedfname);
+		return FALSE;
+	}
+
+	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname);
+	result = system (command);
+	g_free (command);
+
+	g_message ("Second result %d", result);
+	if (result) {
+		g_free (quotedfname);
+		return FALSE;
+	}
 
 	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/%s$\"", quotedfname, GCONF_DUMP_FILE);
 	result = system (command);
 	g_free (command);
 	g_free (quotedfname);
 
-	g_message ("Second result %d", result);
+	g_message ("Third result %d", result);
 
+	return result != 0;
 }
 
 static gboolean
-pbar_update()
+pbar_update (gpointer data)
 {
 	if (!complete) {
-		 gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
-		 gtk_progress_bar_set_text ((GtkProgressBar *)pbar, txt);
+		gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
+		gtk_progress_bar_set_text ((GtkProgressBar *)pbar, txt);
 		return TRUE;
 	}
 
@@ -334,7 +363,7 @@ idle_cb(gpointer data)
 
 	if (gui_arg) {
 		/* Show progress dialog */
-		 gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
+		gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
 		g_timeout_add (50, pbar_update, NULL);
 	}
 
@@ -356,6 +385,21 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data)
 	/* We will kill just the tar operation. Rest of the them will be just a second of microseconds.*/
 	run_cmd ("pkill tar");
 
+	if (bk_file && backup_op && response == GTK_RESPONSE_REJECT) {
+		/* backup was canceled, delete the backup file as it is not needed now */
+		gchar *cmd, *filename;
+
+		g_message ("Backup canceled, removing partial backup file.");
+
+		filename = g_shell_quote (bk_file);
+		cmd = g_strconcat ("rm ", filename, NULL);
+
+		run_cmd (cmd);
+
+		g_free (cmd);
+		g_free (filename);
+	}
+
 	gtk_main_quit ();
 }
 
@@ -495,9 +539,9 @@ main (gint argc, gchar **argv)
 		g_signal_connect (progress_dialog, "response", G_CALLBACK(dlg_response), NULL);
 		gtk_widget_show_all (progress_dialog);
 	} else if (check_op) {
-		 /* For sanity we don't need gui */
-		 check (chk_file);
-		 exit (result);
+		/* For sanity we don't need gui */
+		check (chk_file);
+		exit (result == 0 ? 0 : 1);
 	}
 
 	g_idle_add (idle_cb, NULL);
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 51811eaaf9..0a44dc0c26 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/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
+
 AM_CPPFLAGS =						\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index c05b22a3c5..8c47bca60c 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
+
 AM_CPPFLAGS =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index d475bf8036..45d21ba762 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -49,9 +49,9 @@
 
 #include "google-contacts-source.h"
 
-#define CALENDAR_LOCATION "http://www.google.com/calendar/feeds/"
+#define CALENDAR_LOCATION "://www.google.com/calendar/feeds/"
 #define CALENDAR_DEFAULT_PATH "/private/full"
-#define URL_GET_SUBSCRIBED_CALENDARS "http://www.google.com/calendar/feeds/default/allcalendars/full"
+#define URL_GET_SUBSCRIBED_CALENDARS "://www.google.com/calendar/feeds/default/allcalendars/full"
 
 #define d(x)
 
@@ -99,19 +99,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 
 
 /********************************************************************************************************************/
-#if 0
-
-FIXME: Not sure why this function is declared but called no where. This needs fixing.
-
-static void
-ssl_changed (GtkToggleButton *button, ESource *source)
-{
-	e_source_set_property(source, "ssl",
-			      gtk_toggle_button_get_active(button) ? "1" : "0");
-}
-
-#endif
-
 
 static gboolean
 is_email (const gchar *address)
@@ -149,12 +136,12 @@ sanitize_user_mail (const gchar *user)
 }
 
 static gchar *
-construct_default_uri (const gchar *username)
+construct_default_uri (const gchar *username, gboolean is_ssl)
 {
 	gchar *user, *uri;
 
 	user = sanitize_user_mail (username);
-	uri = g_strconcat (CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL);
+	uri = g_strconcat (is_ssl ? "https" : "http", CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL);
 	g_free (user);
 
 	return uri;
@@ -165,40 +152,43 @@ static gboolean
 is_default_uri (const gchar *given_uri, const gchar *username)
 {
 	gchar *uri, *at;
-	gint ats;
-	gboolean res;
+	gint ats, i;
+	gboolean res = FALSE;
 
 	if (!given_uri)
 		return TRUE;
 
-	uri = construct_default_uri (username);
+	for (i = 0; !res && i < 2; i++) {
+		/* try both versions here, with and without ssl */
+		uri = construct_default_uri (username, i == 0);
 
-	/* count number of '@' in given_uri to know how much memory will be required */
-	ats = 0;
-	for (at = strchr (given_uri, '@'); at; at = strchr (at + 1, '@')) {
-		ats++;
-	}
-
-	if (!ats)
-		res = g_ascii_strcasecmp (given_uri, uri) == 0;
-	else {
-		const gchar *last;
-		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats)));
-
-		last = given_uri;
-		for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) {
-			strncat (tmp, last, at - last);
-			strcat (tmp, "%40");
-			last = at + 1;
+		/* count number of '@' in given_uri to know how much memory will be required */
+		ats = 0;
+		for (at = strchr (given_uri, '@'); at; at = strchr (at + 1, '@')) {
+			ats++;
 		}
-		strcat (tmp, last);
 
-		res = g_ascii_strcasecmp (tmp, uri) == 0;
+		if (!ats)
+			res = g_ascii_strcasecmp (given_uri, uri) == 0;
+		else {
+			const gchar *last;
+			gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats)));
+
+			last = given_uri;
+			for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) {
+				strncat (tmp, last, at - last);
+				strcat (tmp, "%40");
+				last = at + 1;
+			}
+			strcat (tmp, last);
 
-		g_free (tmp);
-	}
+			res = g_ascii_strcasecmp (tmp, uri) == 0;
 
-	g_free (uri);
+			g_free (tmp);
+		}
+
+		g_free (uri);
+	}
 
 	return res;
 }
@@ -209,15 +199,16 @@ static void
 user_changed (GtkEntry *editable, ESource *source)
 {
 	gchar       *uri;
-	const gchar *user;
+	const gchar *user, *ssl;
 
 	/* two reasons why set readonly to FALSE:
 	   a) the e_source_set_relative_uri does nothing for readonly sources
 	   b) we are going to set default uri, which should be always writeable */
 	e_source_set_readonly (source, FALSE);
 
+	ssl = e_source_get_property (source, "ssl");
 	user = gtk_entry_get_text (GTK_ENTRY (editable));
-	uri = construct_default_uri (user);
+	uri = construct_default_uri (user, !ssl || g_str_equal (ssl, "1"));
 	e_source_set_relative_uri (source, uri);
 	g_free (uri);
 
@@ -360,8 +351,10 @@ cal_combo_changed (GtkComboBox *combo, ESource *source)
 
 		gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TITLE, &title, COL_URL_PATH, &uri, COL_READ_ONLY, &readonly, -1);
 
-		if (!uri)
-			uri = construct_default_uri (e_source_get_property (source, "username"));
+		if (!uri) {
+			const gchar *ssl = e_source_get_property (source, "ssl");
+			uri = construct_default_uri (e_source_get_property (source, "username"), !ssl || g_str_equal (ssl, "1"));
+		}
 
 		if (is_default_uri (uri, e_source_get_property (source, "username"))) {
 			/* do not store title when we use default uri */
@@ -404,7 +397,8 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	GDataGoogleService *service;
 	GDataFeed *feed;
 	gchar *password, *tmp;
-	const gchar *username;
+	const gchar *username, *ssl;
+	gchar *get_subscribed_url;
 	GError *error = NULL;
 	GtkWindow *parent;
 
@@ -434,7 +428,10 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	memset (password, 0, strlen (password));
 	g_free (password);
 
-	feed = gdata_service_get_feed (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS, &error);
+	ssl = e_source_get_property (source, "ssl");
+	get_subscribed_url = g_strconcat ((!ssl || g_str_equal (ssl, "1")) ? "https" : "http", URL_GET_SUBSCRIBED_CALENDARS, NULL);
+	feed = gdata_service_get_feed (GDATA_SERVICE (service), get_subscribed_url, &error);
+	g_free (get_subscribed_url);
 
 	if (feed) {
 		GSList *l;
@@ -544,6 +541,20 @@ retrieve_list_sensitize (GtkEntry *username_entry,
 	gtk_widget_set_sensitive (button, sensitive);
 }
 
+static void
+ssl_toggled (GtkToggleButton *check, ESource *source)
+{
+	g_return_if_fail (check != NULL);
+	g_return_if_fail (source != NULL);
+
+	if (gtk_toggle_button_get_active (check))
+		e_source_set_property (source, "ssl", "1");
+	else
+		e_source_set_property (source, "ssl", "0");
+
+	user_changed (GTK_ENTRY (g_object_get_data (G_OBJECT (check), "username")), source);
+}
+
 GtkWidget *
 plugin_google  (EPlugin                    *epl,
 	     EConfigHookItemFactoryData *data)
@@ -585,19 +596,27 @@ plugin_google  (EPlugin                    *epl,
 		return NULL;
 	}
 
+	e_uri_free (euri);
+
 	username = e_source_get_property (source, "username");
-	g_free (euri->user);
-	euri->user = NULL;
-	uri = e_uri_to_string (euri, FALSE);
 
 	ssl_prop = e_source_get_property (source, "ssl");
-	if (ssl_prop && ssl_prop[0] == '1') {
+	if (!ssl_prop || g_str_equal (ssl_prop, "1")) {
 		ssl_enabled = TRUE;
 	} else {
 		ssl_enabled = FALSE;
 	}
 
-	e_source_set_property (source, "ssl", "1");
+	if (!ssl_prop) {
+		e_source_set_property (source, "ssl", "1");
+	} else if (ssl_enabled) {
+		const gchar *rel_uri = e_source_peek_relative_uri (source);
+
+		if (rel_uri && g_str_has_prefix (rel_uri, "http://")) {
+			ssl_enabled = FALSE;
+			e_source_set_property (source, "ssl", "0");
+		}
+	}
 
 	/* Build up the UI */
 	parent = data->parent;
@@ -664,13 +683,14 @@ plugin_google  (EPlugin                    *epl,
 
 	gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row + 2, row + 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
+	g_object_set_data (G_OBJECT (cssl), "username", user);
+	g_signal_connect (cssl, "toggled", G_CALLBACK (ssl_toggled), source);
+
 	g_signal_connect (G_OBJECT (user),
 			  "changed",
 			  G_CALLBACK (user_changed),
 			  source);
 
-        g_free (uri);
-
 	label = gtk_label_new_with_mnemonic (_("Cal_endar:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 3bab9f6596..41b3f91170 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index a090848cad..d21841f7c7 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am
index b19fcff84b..74522a41a3 100644
--- a/plugins/ipod-sync/Makefile.am
+++ b/plugins/ipod-sync/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-DDBUS_API_SUBJECT_TO_CHANGE
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index ed406d9bd2..558d514f86 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -35,6 +35,7 @@
 #include <camel/camel-mime-utils.h>
 #include <camel/camel-mime-message.h>
 #include <camel/camel-folder.h>
+#include <camel/camel-vee-folder.h>
 #include <camel/camel-multipart.h>
 #include <camel/camel-service.h>
 #include <camel/camel-store.h>
@@ -48,6 +49,7 @@
 #include <mail/em-format.h>
 #include <mail/em-format-html.h>
 #include <mail/em-utils.h>
+#include <mail/mail-folder-cache.h>
 #include <mail/mail-tools.h>
 #include <mail/mail-mt.h>
 #include <libedataserver/e-account-list.h>
@@ -2019,6 +2021,7 @@ static gboolean
 in_proper_folder (CamelFolder *folder)
 {
 	gboolean res = TRUE;
+	gint flags = 0;
 	gchar *uri;
 
 	if (!folder)
@@ -2026,10 +2029,27 @@ in_proper_folder (CamelFolder *folder)
 
 	uri = mail_tools_folder_to_url (folder);
 
-	res = !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) &&
-	      !em_utils_folder_is_sent (folder, uri) &&
-	      !em_utils_folder_is_outbox (folder, uri) &&
-	      !em_utils_folder_is_drafts (folder, uri);
+	if (mail_folder_cache_get_folder_info_flags (folder, &flags)) {
+		/* it should be neither trash nor junk folder, */
+		res = ((flags & CAMEL_FOLDER_TYPE_TRASH) !=  CAMEL_FOLDER_TYPE_TRASH &&
+		       (flags & CAMEL_FOLDER_TYPE_JUNK) != CAMEL_FOLDER_TYPE_JUNK &&
+			  /* it can be Inbox */
+			( (flags & CAMEL_FOLDER_TYPE_INBOX) == CAMEL_FOLDER_TYPE_INBOX ||
+			  /* or any other virtual folder */
+			  CAMEL_IS_VEE_FOLDER (folder) ||
+			  /* or anything else except of sent, outbox or drafts folder */
+			  (!em_utils_folder_is_sent (folder, uri) &&
+			   !em_utils_folder_is_outbox (folder, uri) &&
+			   !em_utils_folder_is_drafts (folder, uri))
+			));
+	} else {
+		/* cannot check for Inbox folder here */
+		res = (folder->folder_flags & (CAMEL_FOLDER_IS_TRASH | CAMEL_FOLDER_IS_JUNK)) == 0 && (
+		      (CAMEL_IS_VEE_FOLDER (folder)) || (
+		      !em_utils_folder_is_sent (folder, uri) &&
+		      !em_utils_folder_is_outbox (folder, uri) &&
+		      !em_utils_folder_is_drafts (folder, uri)));
+	}
 
 	g_free (uri);
 
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 62e8f72320..f1f121f6b5 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
+
 AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index 76b1e42da1..ae5f199c46 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -159,7 +159,7 @@ epm_invoke(EPlugin *ep, const gchar *name, gpointer data)
 
 	if (res) {
 		gpointer *p = mono_object_unbox(res);
-		d(printf("mono method returned '%p' %ld\n", *p, (long gint)*p));
+		d(printf("mono method returned '%p' %ld\n", *p, (glong)*p));
 		return *p;
 	} else
 		return NULL;
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 8720e252df..a92adfbe74 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,6 +1,15 @@
+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
+
 AM_CPPFLAGS =						\
 	-I$(EVOLUTION_SOURCE)				\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
 	$(EVOLUTION_CFLAGS)				\
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 43e093eff2..e1818d7bac 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -776,7 +776,7 @@ action_publish (EPlugin *ep, ECalMenuTargetSelect *t)
 		error_queue_add (g_strdup (_("Could not create publish thread.")), error);
 }
 
-static void
+static gpointer
 publish_uris_set_timeout (GSList *uris)
 {
 	GSList *l;
@@ -804,6 +804,8 @@ publish_uris_set_timeout (GSList *uris)
 	}
 	g_slist_foreach (uris, (GFunc) g_free, NULL);
 	g_slist_free (uris);
+
+	return NULL;
 }
 
 gint
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 262096ee87..2273e6ed80 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
+
 AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index e26b46879b..dd8f92fd1a 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/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
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 4fe13deadc..1dad34bb1c 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
 "POT-Creation-Date: 2009-06-04 04:29+0000\n"
-"PO-Revision-Date: 2009-06-11 01:29+0530\n"
+"PO-Revision-Date: 2009-06-24 19:41+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <discuss@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "বর্ষপঞ্জি অনুযায়ী প্রদর্শ�
 
 #: ../a11y/calendar/ea-cal-view-event.c:530
 msgid "Grab Focus"
-msgstr ""
+msgstr "ফোকাস আটক করা হবে"
 
 #: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
@@ -10706,7 +10706,7 @@ msgstr "এক্সপ্রেশন"
 
 #: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
-msgstr ""
+msgstr "অনুবৃত্তি"
 
 #: ../mail/em-filter-i18n.h:29
 #, fuzzy
@@ -11209,7 +11209,7 @@ msgstr "অনাকাঙ্ক্ষিত নয় হিসাবে চিহ
 
 #: ../mail/em-folder-view.c:1353
 msgid "Mark for Follo_w Up..."
-msgstr ""
+msgstr "অনুবৃত্তির জন্য চিহ্নিত করুন...(_w)"
 
 #: ../mail/em-folder-view.c:1355
 msgid "_Label"
@@ -12669,6 +12669,9 @@ msgid ""
 "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:160
 msgid "This option would help in improving the speed of fetching."
@@ -13342,6 +13345,8 @@ msgstr "এর জন্য কোনো প্রক্সি চিহ্ন�
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
+"উল্লেখ্য: লেবেলের নামের মধ্যে অন্তর্ভুক্ত আন্ডার-স্কোর চিহ্ন মেনুর মধ্যর স্মৃতিসহায়ক রূপে "
+"ব্যবহার করা হয়।"
 
 #: ../mail/mail-config.glade.h:112
 msgid ""
@@ -13642,7 +13647,7 @@ msgstr "বার্তার পূর্বরূপ প্রদর্শন�
 
 #: ../mail/mail-config.glade.h:189
 msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
+msgstr "প্রাপক/অনু-প্রা/অপ্র-অনু-প্রা ক্ষেত্রগুলি চিহ্নিত মাপ অবধি সংকুচন করা হবে (_S)"
 
 #: ../mail/mail-config.glade.h:190
 msgid "_Use Secure Connection:"
@@ -13706,7 +13711,7 @@ msgstr "সমাপ্ত (_m)"
 
 #: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "অনুবৃত্তির জন্য চিহ্নিত ফ্ল্যাগ"
 
 #: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
@@ -13733,6 +13738,8 @@ 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"
+"অনুগ্রহ করে, \"ফ্ল্যাগ\" মেনু থেকে, অনুবৃত্তির উদ্দেশ্যে একটি কর্ম নির্বাচন করুন।"
 
 #: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
@@ -14743,6 +14750,8 @@ msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"অনুসন্ধানের মান অনুযায়ী কোনো বার্তা চিহ্নিত করা হয়নি। অনুসন্ধান->মুছে ফেলুন শীর্ষক মেনু "
+"থেকে এই অনুসন্ধান মুছে ফেলুন অথবা এটি পরিবর্তন করুন।"
 
 #: ../mail/message-list.c:4301
 msgid "There are no messages in this folder."
@@ -14762,7 +14771,7 @@ msgstr "ফ্ল্যাগ করা"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr ""
+msgstr "অনুবৃত্তির ফ্ল্যাগ"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -14780,7 +14789,7 @@ msgstr "মাপ"
 
 #: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
-msgstr ""
+msgstr "বিষয় - ছাঁটাই করা"
 
 #: ../mail/message-tag-followup.c:55
 msgid "Call"
@@ -14792,7 +14801,7 @@ msgstr "অনুবর্তন করা হবে না"
 
 #: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
-msgstr ""
+msgstr "অনুবৃত্তি"
 
 #: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
@@ -15091,6 +15100,9 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
+"Evolution বন্ধ করা অবস্থায় Evolution ব্যাক-আপ আরম্ভ করা সম্ভব। অনুগ্রহ করে, এগিয়ে "
+"চলার পূর্বে, অসংক্ষিত তথ্য সম্বলিত সকল উইন্ডো বন্ধ করুন। ব্যাক-আপের পরে স্বয়ংক্রিয়ভাবে "
+"Evolution পুনরারম্ভ করার জন্য অনুগ্রহ করে টগল বাটন সক্রিয় করুন।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -15116,6 +15128,10 @@ msgid ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 msgstr ""
+"এর ফলে, Evolution-র বর্তমান সকল তথ্য ও বৈশিষ্ট্য মুছে ফেলা হবে ও ব্যাক-আপ থেকে তা "
+"পুনরুদ্ধার করা হবে। Evolution বন্ধ করা অবস্থায় Evolution-র পুনরুদ্ধার আরম্ভ করা সম্ভব। "
+"অনুগ্রহ করে, এগিয়ে চলার পূর্বে, অসংক্ষিত তথ্য সম্বলিত সকল উইন্ডো বন্ধ করুন। পুনরুদ্ধারের "
+"পরে স্বয়ংক্রিয়ভাবে Evolution পুনরারম্ভ করার জন্য অনুগ্রহ করে টগল বাটন সক্রিয় করুন।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16220,6 +16236,18 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
+"Exchange Connector-র সঠিক চালনার জন্য\n"
+"Exchange Server-র কিছু বৈশিষ্ট্যের ব্যবহার করা প্রয়োজন\n"
+"এবং সম্ভবত এইগুলি নিষ্ক্রিয় অথবা উপলব্ধ নয়। (এই অবস্থা \n"
+"ইচ্ছাকৃত নয়।) Evolution Exchange Connector-র ব্যবহার উপলব্ধ \n"
+"করার জন্য Exchange অ্যাডমিনিস্ট্রেটর দ্বারা\n"
+"এই বৈশিষ্ট্যগুলি সক্রিয় করা আবশ্যক।\n"
+"\n"
+"Exchange অ্যাডমিনিস্ট্রেটরের জন্য তথ্য\n"
+"সংগ্রহের জন্য নিম্নলিখিত লিংকের ঠিকানা দেখুন:\n"
+"\n"
+"{0}\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
@@ -16337,6 +16365,11 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"সম্ভবত আপনার ব্যবহৃত সার্ভারের ক্ষেত্রে ব্যবহারকারী \n"
+"অ্যাকাউন্টের অংশ হিসাবে Windows ডোমেইনের \n"
+"নাম উল্লেখ করা আবশ্যক (উদাহরণ, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"অথবা সম্ভবত আপনি পাসওয়ার্ড ভুল লিখেছেন।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
@@ -16535,6 +16568,7 @@ msgid "_Face"
 msgstr "_Face"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "Attach a small picture of your face to outgoing messages.\n"
 "\n"
@@ -16542,6 +16576,10 @@ msgid ""
 "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
 "sent messages."
 msgstr ""
+"বাহিরগামী বার্তার জন্য মুখের ছবির হেডার সংযুক্ত করা হবে। প্রথমবার, ব্যবহারকারীকে "
+"একটি ৪৮*৪৮ মাপের png ছবি কনফিগার করতে হবে। base64 সহ এনকোড করা এই ছবিটি ~/."
+"evolution/faces-র মধ্যে সংরক্ষিত হবে ও ভবিষ্যতে প্রেরিত বার্তাগুলির সাথে এটি যুক্ত "
+"করা হবে।"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -16628,6 +16666,16 @@ msgid ""
 "Click 'Forward' to install the shared folder\n"
 "\n"
 msgstr ""
+"ব্যবহারকারী '%s' আপনার সাথে একটি ফোল্ডার যৌথরূপে ব্যবহার করতে ইচ্ছুক\n"
+"\n"
+"'%s' থেকে প্রাপ্ত বার্তা\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"যৌথ ব্যবহারের ফোল্ডারটি ইনস্টল করার জন্য 'পরবর্তী' টিপুন\n"
+"\n"
 
 #: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
@@ -16805,7 +16853,7 @@ msgstr "যৌথরূপে ব্যবহৃত নয় (_N)"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
-msgstr ""
+msgstr "চিহ্নিত ব্যক্তিদের সাথে যৌথ ব্যবহার করা হবে...(_S)"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -17840,7 +17888,7 @@ 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."
@@ -17856,11 +17904,11 @@ 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."
-msgstr ""
+msgstr "আইকন ঝলকাবে কি না।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
@@ -17962,22 +18010,30 @@ msgid "Cannot open calendar. %s"
 msgstr "বর্ষপঞ্জি খোলা যাচ্ছে না। %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:350
+#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
+"নির্বাচিত উৎস্থলটি শুধুমাত্র পাঠযোগ্য ও এইখানে কোনো কর্ম নির্মাণ করা সম্ভব নয়। অনুগ্রহ "
+"করে একটি ভিন্ন উৎসস্থল নির্বাচন করুন।"
 
 #: ../plugins/mail-to-task/mail-to-task.c:353
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
+"নির্বাচিত উৎস্থলটি শুধুমাত্র পাঠযোগ্য ও এইখানে কোনো কর্ম নির্মাণ করা সম্ভব নয়। অনুগ্রহ "
+"করে একটি ভিন্ন উৎসস্থল নির্বাচন করুন।"
 
 #: ../plugins/mail-to-task/mail-to-task.c:356
+#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
+"নির্বাচিত উৎস্থলটি শুধুমাত্র পাঠযোগ্য ও এইখানে কোনো কর্ম নির্মাণ করা সম্ভব নয়। অনুগ্রহ "
+"করে একটি ভিন্ন উৎসস্থল নির্বাচন করুন।"
 
 #: ../plugins/mail-to-task/mail-to-task.c:455
 #, fuzzy, c-format
@@ -18539,7 +18595,7 @@ msgstr "Python EPlugin লোডারের পরীক্ষামূলক �
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using Python."
-msgstr ""
+msgstr "Python-র সাহায্যে নির্মিত প্লাগ-ইন লোড করার জন্য ব্যবহৃত একটি প্লাগ-ইন।"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
@@ -18734,7 +18790,7 @@ msgstr "শুধুমাত্র চিহ্নিত কর্মের ত
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
-msgstr ""
+msgstr "অ্যাকাউন্ট নির্মাণের প্রারম্ভিক ধাপগুলির জন্য সহায়তা উপলব্ধ করা হয়।"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Setup Assistant"
@@ -18809,6 +18865,8 @@ msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
+"Templates প্লাগ-ইন দ্বারা বার্তার প্রধান অংশে প্রতিস্থাপের জন্য অভিব্যক্তি/মান সম্বলিত "
+"জুটিগুলির তালিকা।"
 
 #: ../plugins/templates/templates.c:603
 msgid "No title"
@@ -18825,7 +18883,7 @@ 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 "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
@@ -18971,6 +19029,10 @@ msgid ""
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"মান true (সত্য) হলে, প্রক্সি সার্ভারের সাথে সংযোগের ক্ষেত্রে অনুমোদন আবশ্যক। \"/apps/"
+"evolution/shell/network_config/authentication_user\" নামক GConf-কি থেকে "
+"ব্যবহারকারীর নাম প্রাপ্ত করা হয়, ও gnome-keyring অথবা ~/.gnome2_private/"
+"Evolution পাসওয়ার্ড ফাইল থেকে পাসওয়ার্ড উদ্ধার করা হয়।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 #, fuzzy
@@ -19037,6 +19099,11 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"প্রক্সি কনফিগারেশনের মোড নির্বাচন করুন। সম্ভাব্য মানগুলি হল: \"use system settings"
+"\"-র (সিস্টেমের বৈশিষ্ট্য ব্যবহার) জন্য 0 (০), \"no proxy\"-র (প্রক্সিবিহীন) জন্য 1 "
+"(১), \"use manual proxy configuration\"-র (স্বনির্ধারিত প্রক্সি কনফিগারেশন) জন্য "
+"2 (২) ও \"use proxy configuration provided in the autoconfig url\"-র "
+"(autoconfig url-র মধ্যে উপলব্ধ প্রক্সি কনফিগারেশন ব্যবহার) জন্য 3 (৩)।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
@@ -19099,18 +19166,24 @@ 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:42
 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:43
 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:44
 msgid ""
@@ -19129,6 +19202,10 @@ msgid ""
 "(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:46
 msgid "Toolbar is visible"
@@ -20046,21 +20123,22 @@ msgstr "ই-মেইল সার্টিফিকেট অথোরিটি
 msgid "Signing"
 msgstr "স্বাক্ষর করা হচ্ছে"
 
+# from thefreedictionary.com: In regard to digital security, non-repudiation means that it can be verified that the sender and the recipient were, in fact, the parties who claimed to send or receive the message, respectively.
 #: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
-msgstr ""
+msgstr "সুনিশ্চিত পরিচিতি"
 
 #: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
-msgstr "Key Encipherment"
+msgstr "কি সাইফার করার প্রক্রিয়া"
 
 #: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
-msgstr "Data Encipherment"
+msgstr "তথ্য সাইফার করার প্রক্রিয়া"
 
 #: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
-msgstr "কী (Key) সংক্রান্ত চুক্তি"
+msgstr "কি (Key) সংক্রান্ত চুক্তি"
 
 #: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
@@ -20531,7 +20609,7 @@ 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"
@@ -20864,11 +20942,11 @@ 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..."
-msgstr ""
+msgstr "অনুবৃত্তি...(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -20984,7 +21062,7 @@ msgstr "রি-ডাইরেক্ট করুন (_d)"
 
 #: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
-msgstr ""
+msgstr "নির্বাচিত বার্তাটি অন্য কোনো ব্যক্তির দিকে প্রেরিত হবে (রি-ডিরেক্ট/বাউন্স)"
 
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
@@ -21461,7 +21539,7 @@ msgstr "কার্যসপ্তাহ ভিউ (_W)"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr ""
+msgstr "প্রসারিত প্রদর্শন ক্ষেত্রের মধ্যে প্রেরিত সামগ্রীর ফোল্ডার রূপে (_d)"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -21481,11 +21559,11 @@ msgstr "বিষয় অনুযায়ী (_b)"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr ""
+msgstr "অনুবৃত্তির ফ্ল্যাগ অনুযায়ী (_F)"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
-msgstr ""
+msgstr "প্রসারিত প্রদর্শনের জন্য (_W)"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -21816,7 +21894,7 @@ msgstr "GDK পূরণ করতে ব্যবহৃত রং"
 #: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
 #: ../widgets/text/e-text.c:3668
 msgid "Fill stipple"
-msgstr ""
+msgstr "ক্ষুদ্র বিন্দু সহযোগে ভরাট"
 
 #: ../widgets/misc/e-canvas-background.c:482
 #: ../widgets/misc/e-canvas-background.c:483
@@ -22064,7 +22142,7 @@ msgstr "অন-লাইন"
 
 #: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
-msgstr ""
+msgstr "বাটনের জন্য অন-লাইন অবস্থা ধার্য হয়েছে"
 
 # The equivalent for Sync escapes me now
 #: ../widgets/misc/e-pilot-settings.c:102
@@ -22325,7 +22403,7 @@ msgstr "নির্বাচিত কলাম"
 
 #: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
-msgstr ""
+msgstr "ফোকাস করা কলাম"
 
 #: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
@@ -22333,23 +22411,23 @@ msgstr "অনির্বাচিত কলাম"
 
 #: ../widgets/table/e-cell-text.c:1800
 msgid "Strikeout Column"
-msgstr ""
+msgstr "কলামে মধ্যরেখাঙ্কন করা হবে"
 
 #: ../widgets/table/e-cell-text.c:1807
 msgid "Underline Column"
-msgstr "কলামের নিম্নরেখাঙ্কন করা হবে"
+msgstr "কলামে নিম্নরেখাঙ্কন করা হবে"
 
 #: ../widgets/table/e-cell-text.c:1814
 msgid "Bold Column"
-msgstr ""
+msgstr "কলামকে উজ্জ্বল করা হবে"
 
 #: ../widgets/table/e-cell-text.c:1821
 msgid "Color Column"
-msgstr ""
+msgstr "কলাম রঙীন করা হবে"
 
 #: ../widgets/table/e-cell-text.c:1835
 msgid "BG Color Column"
-msgstr ""
+msgstr "কলামের পএভূমির রং"
 
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
@@ -22471,6 +22549,8 @@ msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
+"টেবিলের মধ্যে কলাম যোগ করার জন্য,\n"
+"প্রদর্শনের জন্য চিহ্নিত স্থানে তা টেনে আনুন।"
 
 #: ../widgets/table/e-table-group-container.c:343
 #, c-format
@@ -22492,7 +22572,7 @@ msgstr[1] "%s (%d-টি বস্তু)"
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
-msgstr ""
+msgstr "একটি সারি অন্তর এক রং ব্যবহার করা হবে"
 
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-container.c:934
@@ -22501,7 +22581,7 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
 msgid "Horizontal Draw Grid"
-msgstr ""
+msgstr "আনুভূমিক দিশায় আঁকা গ্রিড"
 
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-container.c:941
@@ -22510,7 +22590,7 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
 msgid "Vertical Draw Grid"
-msgstr ""
+msgstr "উলম্ব দিশায় আঁকা গ্রিড"
 
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-container.c:948
@@ -22519,7 +22599,7 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
 msgid "Draw focus"
-msgstr ""
+msgstr "ফোকাস আঁকা হবে"
 
 #: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-container.c:955
@@ -22545,7 +22625,7 @@ msgstr "নির্বাচনের মডেল"
 #: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3336
 #: ../widgets/table/e-tree.c:3337
 msgid "Length Threshold"
-msgstr ""
+msgstr "দৈঘ্যের প্রান্তিক মাপ"
 
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-container.c:976
@@ -22555,14 +22635,14 @@ msgstr ""
 #: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3368
 #: ../widgets/table/e-tree.c:3369
 msgid "Uniform row height"
-msgstr ""
+msgstr "সমান উচ্চতার সারি"
 
 #: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-container.c:983
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
-msgstr ""
+msgstr "আবদ্ধ"
 
 #: ../widgets/table/e-table-header-item.c:1451
 msgid "Customize Current View"
@@ -22686,7 +22766,7 @@ msgstr "গাড়"
 
 #: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
 msgid "Strikeout"
-msgstr ""
+msgstr "মধ্যরেখাঙ্কিত"
 
 #: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
 msgid "Anchor"
@@ -22706,11 +22786,11 @@ msgstr "উচ্চতা হ্রাস করা হবে"
 
 #: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
 msgid "Clip"
-msgstr ""
+msgstr "হ্রাস করা হবে"
 
 #: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
 msgid "Fill clip rectangle"
-msgstr ""
+msgstr "হ্রাস করা আয়তক্ষেত্র ভরাট করা হবে"
 
 #: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
 msgid "X Offset"
@@ -22730,11 +22810,11 @@ msgstr "হরফের উচ্চতা"
 
 #: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "Use ellipsis"
-msgstr ""
+msgstr "ইলিপসিস প্রয়োগ করা হবে"
 
 #: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Ellipsis"
-msgstr ""
+msgstr "ইলিপসিস"
 
 #: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
 msgid "Line wrap"
@@ -22742,7 +22822,7 @@ msgstr "লাইন গুটানো"
 
 #: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
 msgid "Break characters"
-msgstr ""
+msgstr "বিভাজনের অক্ষর"
 
 #: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Max lines"
@@ -24239,39 +24319,65 @@ msgstr "সম্পূর্ণ হেডার"
 msgid "Font Description"
 msgstr "ফন্টের বিবরণ"
 
-#~ msgid "Whether to use daylight savings time while displaying events."
-#~ msgstr "অনুষ্ঠান প্রদর্শনকালে দিবালোক সঞ্চয়কারী সময় প্রয়োগ করা হবে কি না।"
+msgid "Whether to use daylight savings time while displaying events."
+msgstr "অনুষ্ঠান প্রদর্শনকালে দিবালোক সঞ্চয়কারী সময় প্রয়োগ করা হবে কি না।"
+
+msgid "daylight savings time"
+msgstr "দিবালোক সঞ্চয়কারী সময়"
+
+msgid "Adjust for daylight sa_ving time"
+msgstr "দিবালোক সঞ্চয়কারী সময় অনুসারে পরিবর্তন করা হবে (_v)"
+
+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 "Inline (Outlook style)"
+msgstr "ইন-লাইন (Outlook-র বিন্যাস)"
 
-#~ msgid "daylight savings time"
-#~ msgstr "দিবালোক সঞ্চয়কারী সময়"
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+"বার্তার মধ্যে সংযুক্ত বস্তু সম্পর্কে তথ্যের সূত্র অনুসন্ধান করা হবে ও বস্তুটি অনুপস্থিত থাকলে "
+"সতর্কবার্তা প্রদর্শন করা হবে"
 
-#~ msgid "Adjust for daylight sa_ving time"
-#~ msgstr "দিবালোক সঞ্চয়কারী সময় অনুসারে পরিবর্তন করা হবে (_v)"
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Exchange অ্যাকাউন্ট সংক্রান্ত সুনির্দিষ্ট কর্ম ও বৈশিষ্ট্যের সংকলন পরিচালনার একটি প্লাগ-"
+"ইন।"
 
 #~ 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."
+#~ "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 "Used for marking all the messages under a folder as read"
 #~ msgstr ""
-#~ "টেক্সট টাইপ করার সময় ইন্টারেক্টিভ অনুসন্ধান আরম্ভ করার উদ্দেশ্যে সাইড-বার থেকে "
-#~ "অনুসন্ধানের বৈশিষ্ট্য সক্রিয় করুন। কোনো ফোল্ডার অনুসন্ধানের জন্য এটি ব্যবহারের "
-#~ "উদ্দেশ্যে সাইড-বারে ফোল্ডাটি নাম টাইপ করা হলে স্বয়ংক্রিয়ভাবে সংশ্লিষ্ট ফোল্ডারটি "
-#~ "নির্বাচিত হবে।"
+#~ "ফোল্ডারের মধ্যে উপস্থিত সকল বার্তাগুলির জন্য পঠিত বার্তা রূপে চিহ্নিত করা হবে"
 
-#~ msgid "Inline (Outlook style)"
-#~ msgstr "ইন-লাইন (Outlook-র বিন্যাস)"
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "তথ্য প্রোফাইল করার ইভেন্টগুলির লগ নির্মাণ করতে ব্যবহৃত হয়।"
 
 #~ msgid ""
-#~ "Looks for clues in a message for mention of attachments and warns if the "
-#~ "attachment is missing"
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
 #~ msgstr ""
-#~ "বার্তার মধ্যে সংযুক্ত বস্তু সম্পর্কে তথ্যের সূত্র অনুসন্ধান করা হবে ও বস্তুটি অনুপস্থিত "
-#~ "থাকলে সতর্কবার্তা প্রদর্শন করা হবে"
+#~ "SpamAssassin সহযোগে অবাঞ্ছিত বার্তাগুলি ফিল্টার করুন। এই প্লাগ-ইন ব্যবহারের জন্য "
+#~ "SpamAssassin ইনস্টল থাকা আবশ্যক।"
 
-#~ msgid ""
-#~ "A plugin that manages a collection of Exchange account specific "
-#~ "operations and features."
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 #~ msgstr ""
-#~ "Exchange অ্যাকাউন্ট সংক্রান্ত সুনির্দিষ্ট কর্ম ও বৈশিষ্ট্যের সংকলন পরিচালনার একটি "
-#~ "প্লাগ-ইন।"
+#~ "TNEF সংযুক্ত বস্তুগুলি ডিকোড করার উদ্দেশ্যে yTNEF প্রয়োগকারী একটি সহজ প্লাগ-ইন।"
diff --git a/po/de.po b/po/de.po
index 9e71df0901..4c3e04f216 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,15 +17,16 @@
 # Christian Kintner <mail@christian-kintner.de>, 2006, 2007.
 # Andre Klapper <ak-47@gmx.net>, 2007, 2008, 2009.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-#: ../shell/main.c:603
+#
+#: ../shell/main.c:605
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-01 18:27+0200\n"
-"PO-Revision-Date: 2009-05-01 18:19+0200\n"
+"POT-Creation-Date: 2009-06-28 13:58+0200\n"
+"PO-Revision-Date: 2009-06-28 14:33+0200\n"
 "Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\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"
@@ -71,32 +72,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has alarms."
 msgstr "Es enthält Alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:274
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:280
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:282
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:302
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:530
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -165,7 +166,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:771
+#: ../calendar/gui/calendar-component.c:772
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -176,8 +177,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:774
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/calendar-component.c:775
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -185,9 +186,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:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
+#: ../calendar/gui/calendar-component.c:777
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:784
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -195,10 +196,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:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
+#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:809
+#: ../calendar/gui/calendar-component.c:811
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -208,15 +209,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:800
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
+#: ../calendar/gui/calendar-component.c:801
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614
 #: ../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:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
@@ -393,10 +394,11 @@ msgid "Could not remove address book."
 msgstr "Adressbuch konnte nicht entfernt werden."
 
 #: ../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."
+"Currently you can only access the 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 ""
 "Momentan können Sie mit Evolution nur auf das GroupWise-Systemadressbuch "
 "zugreifen. Bitte verwenden Sie einmalig eine andere GroupWise-E-Mail-"
@@ -581,7 +583,7 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:592
+#: ../addressbook/conduit/address-conduit.c:591
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Adresse für Datenabgleich:"
 
@@ -617,7 +619,7 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 #: ../addressbook/gui/component/addressbook-view.c:1213
 #: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../plugins/exchange-operations/exchange-folder.c:583
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -660,9 +662,9 @@ msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 #: ../calendar/gui/calendar-component.c:192
 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:223
+#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192
+#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
 #: ../mail/message-list.c:1517
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
@@ -687,13 +689,13 @@ msgstr "Auf LDAP-Servern"
 #: ../addressbook/gui/component/addressbook-component.c:135
 #: ../addressbook/gui/component/addressbook-component.c:138
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 #: ../calendar/gui/calendar-component.c:232
 #: ../calendar/gui/calendar-component.c:238
 #: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:959
+#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960
 #: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Personal"
 msgstr "Persönlich"
@@ -807,12 +809,12 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:1022
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../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:95
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../plugins/itip-formatter/itip-formatter.c:2565
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
@@ -838,7 +840,7 @@ msgid "Details"
 msgstr "Details"
 
 #: ../addressbook/gui/component/addressbook-config.c:1033
-#: ../mail/em-folder-browser.c:1000
+#: ../mail/em-folder-browser.c:1024
 msgid "Searching"
 msgstr "Suchen"
 
@@ -852,12 +854,12 @@ msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110
 msgid "Migrating..."
 msgstr "Migrationsvorgang …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169
 #, c-format
 msgid "Migrating '%s':"
 msgstr "»%s« wird migriert:"
@@ -914,18 +916,18 @@ msgstr ""
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:455
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:457
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:463
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
@@ -938,19 +940,19 @@ msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/calendar-component.c:629
 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2131 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2116 ../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:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952
 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2128 ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-tree.c:2113 ../mail/em-folder-view.c:1341
 #: ../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
@@ -958,9 +960,9 @@ msgid "_Delete"
 msgstr "_Löschen"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/calendar-component.c:637
 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2137 ../ui/evolution-addressbook.xml.h:59
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Ei_genschaften"
@@ -986,7 +988,7 @@ msgstr "Geben Sie das Passwort für %s ein (Benutzer %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
+#: ../plugins/google-account-setup/google-source.c:417
 #: ../plugins/publish-calendar/publish-calendar.c:208
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1141,10 +1143,10 @@ msgid "Search _filter:"
 msgstr "Such_filter:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
 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\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden "
 "soll. Wird der Suchfilter nicht verändert, wird nach die Suche per Vorgabe "
@@ -1218,7 +1220,7 @@ msgstr "_Suchbereich:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 #: ../mail/mail-config.glade.h:185
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -1237,10 +1239,10 @@ msgstr "Karten"
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 #: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:411
-#: ../plugins/calendar-http/calendar-http.c:278
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-source.c:672
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "Minuten"
@@ -1342,9 +1344,9 @@ msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../calendar/gui/dialogs/event-page.c:792
+#: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1435,9 +1437,9 @@ msgstr "Postleit_zahl:"
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
+#: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "Name"
 
@@ -1457,50 +1459,50 @@ msgid "Editable"
 msgstr "Editierbar"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/widgets/eab-contact-display.c:613
 msgid "Skype"
 msgstr "Skype"
 
 #. red
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:958
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../mail/em-migrate.c:959
 msgid "Work"
 msgstr "Geschäftlich"
 
@@ -1512,7 +1514,7 @@ msgstr "Privat"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../calendar/gui/e-calendar-view.c:2296
 msgid "Other"
 msgstr "Weitere"
 
@@ -1689,7 +1691,7 @@ msgstr "Kontaktlisteneditor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:213
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:816
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Auswählen …"
@@ -1778,11 +1780,11 @@ msgstr "Kontakte zusammenführen"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c: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:414 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:872
+#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1848,7 +1850,7 @@ msgstr "Quelle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:567
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:554
@@ -1861,8 +1863,8 @@ msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
@@ -1916,11 +1918,11 @@ msgid "Cu_t"
 msgstr "_Ausschneiden"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../mail/em-folder-tree.c:1004 ../mail/em-folder-view.c:1326
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943
+#: ../mail/em-folder-tree.c:983 ../mail/em-folder-view.c:1326
 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopieren"
@@ -1943,7 +1945,7 @@ msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -1981,7 +1983,7 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Company"
 msgstr "Firma"
 
@@ -2030,22 +2032,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Nickname"
 msgstr "Spitzname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Note"
 msgstr "Notiz"
 
@@ -2074,14 +2076,14 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:579
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
 msgid "Role"
 msgstr "Position"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Spouse"
 msgstr "Ehepartner"
 
@@ -2114,11 +2116,10 @@ msgstr "Website"
 
 #: ../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-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
 #: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424
 #: ../widgets/table/e-table-click-to-add.c:522
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-container.c:997
 #: ../widgets/table/e-table-group-leaf.c:642
@@ -2130,10 +2131,9 @@ msgstr "Breite"
 
 #: ../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-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
 #: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432
 #: ../widgets/table/e-table-click-to-add.c:529
-#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-container.c:990
 #: ../widgets/table/e-table-group-leaf.c:635
@@ -2251,16 +2251,16 @@ msgstr "Gewählt"
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2756
+#: ../mail/em-folder-view.c:2698
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
@@ -2282,30 +2282,30 @@ msgid "map"
 msgstr "Karte"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:839
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2523
+#: ../calendar/gui/gnome-cal.c:2535
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -2317,53 +2317,53 @@ msgstr "Video-Chat"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Web Log"
 msgstr "Weblog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2588
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2587
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2589
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/e-calendar-view.c:2588
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:857
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:893
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:901
 msgid "Blog"
 msgstr "Blog"
 
@@ -2421,8 +2421,8 @@ msgstr "Protokoll nicht unterstützt"
 #: ../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:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -2662,22 +2662,22 @@ msgstr "Kontakt verschieben nach"
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#: ../addressbook/gui/widgets/eab-gui-util.c:903
 msgid "Multiple vCards"
 msgstr "Mehrere VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#: ../addressbook/gui/widgets/eab-gui-util.c:910
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard für %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#: ../addressbook/gui/widgets/eab-gui-util.c:922
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#: ../addressbook/gui/widgets/eab-gui-util.c:950
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
@@ -2686,26 +2686,6 @@ msgstr "Kontaktinformationen für %s"
 msgid "Querying Address Book..."
 msgstr "Adressbuch wird abgefragt …"
 
-#: ../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] "Es gibt einen weiteren Kontakt."
-msgstr[1] "Es gibt %d weitere Kontakte."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Gesamte VCard anzeigen"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Kompakt-VCard anzeigen"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "In Adressbuch speichern"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Kartenansicht"
@@ -2713,8 +2693,8 @@ msgstr "Kartenansicht"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importieren …"
 
@@ -2758,8 +2738,8 @@ msgstr "VCard (.vcf, .gcrd)"
 msgid "Evolution vCard Importer"
 msgstr "Evolution-VCard-Importeur"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:690
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Datei konnte nicht geöffnet werden"
@@ -3268,7 +3248,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:441
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -3294,27 +3274,27 @@ msgstr "{0}."
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtägige Ereignisse aufteilen:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
 #: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/memo/memo-conduit.c:809
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
 #: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/memo/memo-conduit.c:811
 #: ../calendar/conduits/todo/todo-conduit.c:1009
+#: ../calendar/conduits/todo/todo-conduit.c:1010
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server konnte nicht gestartet werden"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1622
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kalender-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:903
-#: ../calendar/conduits/memo/memo-conduit.c:906
+#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:907
 msgid "Could not read pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:950
-#: ../calendar/conduits/memo/memo-conduit.c:953
+#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:954
 msgid "Could not write pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
@@ -3322,24 +3302,24 @@ msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1092
-#: ../calendar/conduits/todo/todo-conduit.c:1095
+#: ../calendar/conduits/todo/todo-conduit.c:1093
+#: ../calendar/conduits/todo/todo-conduit.c:1096
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1137
-#: ../calendar/conduits/todo/todo-conduit.c:1140
+#: ../calendar/conduits/todo/todo-conduit.c:1138
+#: ../calendar/conduits/todo/todo-conduit.c:1141
 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:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2556
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1241
+#: ../calendar/gui/calendar-component.c:820
+#: ../calendar/gui/calendar-component.c:1242
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -3382,22 +3362,22 @@ msgid "Memo_s"
 msgstr "_Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1132
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566
+#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132
+#: ../calendar/gui/gnome-cal.c:1830 ../calendar/gui/memos-component.c:566
 #: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389
 #: ../calendar/gui/memos-control.c:405
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1436
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436
+#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/print.c:1991
 #: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880
 #: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
+#: ../calendar/importers/icalendar-importer.c:751
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/exchange-operations/exchange-folder.c:590
 #: ../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
@@ -3427,10 +3407,10 @@ msgstr[1] "Minuten"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:22
-#: ../plugins/caldav/caldav-source.c:412
-#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-source.c:673
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
@@ -3452,10 +3432,10 @@ msgstr "_Alle verwerfen"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 #: ../calendar/gui/e-itip-control.c:1165
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1024
 msgid "Location:"
 msgstr "Ort:"
 
@@ -3468,11 +3448,11 @@ msgid "_Dismiss"
 msgstr "_Verwerfen"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1029
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../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
@@ -3488,32 +3468,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1473
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1528
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1690
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3526,7 +3506,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3543,7 +3523,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -3879,12 +3859,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
@@ -4165,7 +4145,7 @@ msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
 #: ../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-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
@@ -4185,10 +4165,10 @@ msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
 #: ../calendar/gui/calendar-commands.c:326
-#: ../plugins/caldav/caldav-source.c:413
-#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-source.c:674
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -4213,95 +4193,95 @@ msgstr "Wetter"
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
-#: ../calendar/gui/calendar-component.c:626
+#: ../calendar/gui/calendar-component.c:627
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/calendar-component.c:628
 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2123
+#: ../mail/em-folder-tree.c:2108
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/calendar-component.c:633
 #: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477
 msgid "_Make available for offline use"
 msgstr "Für Offline-_Benutzung verfügbar machen"
 
-#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/calendar-component.c:634
 #: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478
 msgid "_Do not make available for offline use"
 msgstr "_Nicht im Offline-Modus verfügbar machen"
 
-#: ../calendar/gui/calendar-component.c:963
+#: ../calendar/gui/calendar-component.c:964
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1092
+#: ../calendar/gui/calendar-component.c:1093
 #, 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:1108
+#: ../calendar/gui/calendar-component.c:1109
 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:1221
+#: ../calendar/gui/calendar-component.c:1222
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../calendar/gui/calendar-component.c:1437
+#: ../calendar/gui/calendar-component.c:1438
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1438
+#: ../calendar/gui/calendar-component.c:1439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../calendar/gui/calendar-component.c:1439
+#: ../calendar/gui/calendar-component.c:1440
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1445
+#: ../calendar/gui/calendar-component.c:1446
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1446
+#: ../calendar/gui/calendar-component.c:1447
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1447
+#: ../calendar/gui/calendar-component.c:1448
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../calendar/gui/calendar-component.c:1453
+#: ../calendar/gui/calendar-component.c:1454
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1454
+#: ../calendar/gui/calendar-component.c:1455
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1455
+#: ../calendar/gui/calendar-component.c:1456
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1462
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../calendar/gui/calendar-component.c:1463
+#: ../calendar/gui/calendar-component.c:1464
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -4343,12 +4323,11 @@ msgid "Category"
 msgstr "Kategorie"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Einstufung"
 
-#: ../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:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Confidential"
@@ -4389,15 +4368,15 @@ msgstr "Ort"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../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:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565
 #: ../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/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
 #: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Öffentlich"
 
@@ -4582,14 +4561,14 @@ msgid "A_dd"
 msgstr "_Hinzufügen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarme"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:545
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
@@ -4600,18 +4579,18 @@ msgstr "Datei(en) beilegen"
 #. an empty string is the same as 'None'
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2951
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/event-page.c:2968
 #: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-day-view-time-item.c:789
 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434
 #: ../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:395
 #: ../plugins/exchange-operations/exchange-delegates-user.c:181
-#: ../plugins/itip-formatter/itip-formatter.c:2179
+#: ../plugins/itip-formatter/itip-formatter.c:2212
 #: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510
 #: ../widgets/misc/e-dateedit.c:1726
 #: ../widgets/misc/e-signature-combo-box.c:74
@@ -4675,25 +4654,21 @@ msgstr "<b>Zeit</b>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<b>Arbeitswoche</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "An die Sommer_zeit anpassen"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
 msgstr "Tag _endet:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "Anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1107
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -4703,13 +4678,13 @@ msgstr ""
 "Stunden\n"
 "Tage"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1103
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -4727,176 +4702,180 @@ msgstr ""
 "Samstag\n"
 "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../mail/mail-config.glade.h:117
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "S_un"
 msgstr "_So"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: ../calendar/gui/dialogs/recurrence-page.c:1108
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Se_cond zone:"
 msgstr "Z_weite Zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Kalender für Alarmbenachrichtigung auswählen"
 
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Show a _reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Wochenn_ummern in Tages- und Arbeitswochenansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.c:1106
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.c:1104
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "Use s_ystem time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 #: ../calendar/gui/dialogs/recurrence-page.c:1105
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten rückfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 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:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Wed"
 msgstr "M_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "before every anniversary/birthday"
 msgstr "vor jedem Jahrestag/Geburtstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
@@ -5006,232 +4985,236 @@ 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:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:2664 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-msgid "attachment"
-msgstr "Anlage"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+#, fuzzy
+msgid "Could not save attachments"
+msgstr "Ordner zum Speichern aller Anlagen auswählen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:468
+#: ../calendar/gui/dialogs/comp-editor.c:484
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:557
+#: ../calendar/gui/dialogs/comp-editor.c:573
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:564
+#: ../calendar/gui/dialogs/comp-editor.c:580
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:566
+#: ../calendar/gui/dialogs/comp-editor.c:582
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:588
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:574
+#: ../calendar/gui/dialogs/comp-editor.c:590
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:579
+#: ../calendar/gui/dialogs/comp-editor.c:595
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:595
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:737
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:959
 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:950
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:973
 msgid "Cut selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:987
 msgid "Paste text from the clipboard"
 msgstr "Den in der Zwischenablage befindlichen Text einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:992
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 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:999
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1022
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 #: ../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:1027
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 #: ../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:1034
+#: ../calendar/gui/dialogs/comp-editor.c:1050
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1057
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/em-folder-tree.c:2115
+#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2100
 #: ../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:1058
-#: ../composer/e-composer-actions.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1094
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "_Zuletzt geöffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1586
-#: ../composer/e-composer-actions.c:640
+#: ../calendar/gui/dialogs/comp-editor.c:1603
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1845
-#: ../calendar/gui/dialogs/comp-editor.c:1893
-#: ../calendar/gui/dialogs/comp-editor.c:2695
+#: ../calendar/gui/dialogs/comp-editor.c:1866
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2765
 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:2724
+#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "Anlage"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2794
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -5337,8 +5320,8 @@ msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
 #: ../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
+#: ../plugins/groupwise-features/send-options.c:213
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Versandoptionen"
 
@@ -5375,69 +5358,69 @@ msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 msgid "Appoint_ment"
 msgstr "_Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2729
+#: ../calendar/gui/dialogs/event-page.c:749
+#: ../calendar/gui/dialogs/event-page.c:2743
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:799
+#: ../calendar/gui/dialogs/event-page.c:812
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:859
 msgid "_Delegatees"
 msgstr "_Delegaten"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:861
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1032
+#: ../calendar/gui/dialogs/event-page.c:1046
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1035
+#: ../calendar/gui/dialogs/event-page.c:1049
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1204
+#: ../calendar/gui/dialogs/event-page.c:1218
 #: ../calendar/gui/dialogs/memo-page.c:640
 #: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1214
+#: ../calendar/gui/dialogs/event-page.c:1228
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1237
+#: ../calendar/gui/dialogs/event-page.c:1251
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1244
+#: ../calendar/gui/dialogs/event-page.c:1258
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/event-page.c:1421
 #: ../calendar/gui/dialogs/memo-page.c:681
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1413
+#: ../calendar/gui/dialogs/event-page.c:1427
 #: ../calendar/gui/dialogs/memo-page.c:687
 #: ../calendar/gui/dialogs/task-page.c:880
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/event-page.c:1892
 #: ../calendar/gui/dialogs/task-page.c:1202
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
@@ -5445,45 +5428,45 @@ msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/event-page.c:1879
+#: ../calendar/gui/dialogs/event-page.c:1893
 #: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Hinzufügen"
 
-#: ../calendar/gui/dialogs/event-page.c:2605
+#: ../calendar/gui/dialogs/event-page.c:2619
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2663
 #: ../calendar/gui/dialogs/memo-page.c:896
 #: ../calendar/gui/dialogs/task-page.c:1810
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2948
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2954
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2967
 msgid "Customize"
 msgstr "Anpassen"
 
@@ -5526,7 +5509,7 @@ msgstr "_Beschreibung:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:372
 #: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:240
 msgid "_Location:"
 msgstr "O_rt:"
 
@@ -5537,7 +5520,7 @@ msgstr "_Zeit:"
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
@@ -5552,7 +5535,7 @@ msgid ""
 "until"
 msgstr "bis"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492
 msgid "Memo"
 msgstr "Notiz"
 
@@ -5563,7 +5546,7 @@ msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
 #: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
 #: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "An"
@@ -5864,7 +5847,7 @@ msgstr ""
 "Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern."
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
@@ -6008,7 +5991,7 @@ msgid "I_mport to Tasks"
 msgstr "In Aufgaben i_mportieren"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -6028,7 +6011,6 @@ msgstr "Anfangsdatum:"
 #: ../calendar/gui/e-cal-component-preview.c:287
 #: ../calendar/gui/e-itip-control.c:1211
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -6052,7 +6034,7 @@ msgstr "Fällig am:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1179
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Status:"
 msgstr "Status:"
 
@@ -6060,8 +6042,8 @@ msgstr "Status:"
 #: ../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:662 ../calendar/gui/print.c:2558
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -6070,10 +6052,10 @@ msgstr "In Bearbeitung"
 #: ../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:663 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939
 #: ../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
+#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -6081,8 +6063,8 @@ msgstr "Abgeschlossen"
 #: ../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:661 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
@@ -6092,19 +6074,19 @@ msgid "Priority:"
 msgstr "Priorität:"
 
 #: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Hoch"
 
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Niedrig"
@@ -6133,13 +6115,13 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:638
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:639
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -6154,7 +6136,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../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
@@ -6162,7 +6144,7 @@ msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
@@ -6171,13 +6153,13 @@ msgstr "Nein"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../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:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2237
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
@@ -6191,162 +6173,162 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:370
+#: ../calendar/gui/e-calendar-view.c:2436
 #, c-format
 msgid "Organizer: %s <%s>"
 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:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2440
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "Anfang:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "Due: "
 msgstr "Fälligkeit:"
 
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:898
+#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1794
 msgid "New _Task"
-msgstr "Neue _Aufgabe"
+msgstr "_Neue Aufgabe"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938
 msgid "P_rint..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942
 #: ../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:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_Aufgabe zuweisen"
+msgstr "Aufgabe _zuweisen"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark as Incomplete"
-msgstr "Als abgeschlossen _markieren"
+msgstr "Als _offen markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Mark Selected Tasks as Incomplete"
-msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
+msgstr "Gewählte Aufgaben als _offen markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1615
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1852
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -6381,135 +6363,135 @@ 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:12
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/e-meeting-list-view.c:604
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../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:1482
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1482
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1793
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1804
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1807
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1813
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1824
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1825
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1826
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1828
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1831
+#: ../calendar/gui/e-calendar-view.c:1829
 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1834
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1836
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
-#: ../calendar/gui/e-calendar-view.c:2292
+#: ../calendar/gui/e-calendar-view.c:2291
 #: ../calendar/gui/e-itip-control.c:1184
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../plugins/itip-formatter/itip-formatter.c:2225
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:2293
+#: ../calendar/gui/e-calendar-view.c:2292
 #: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../plugins/itip-formatter/itip-formatter.c:2231
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-calendar-view.c:2293
+#: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../plugins/itip-formatter/itip-formatter.c:2234
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2295
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2488
+#: ../calendar/gui/e-calendar-view.c:2487
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -6537,12 +6519,12 @@ 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:750
+#: ../calendar/gui/e-day-view-time-item.c:751
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:772
 msgid "Show the second time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
@@ -6552,25 +6534,25 @@ msgstr "Zweite Zeitzone 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:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681
 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:805 ../calendar/gui/e-week-view.c:543
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:546
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/print.c:831
 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:2321
+#: ../calendar/gui/e-day-view.c:2320
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -6688,7 +6670,7 @@ msgstr ""
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
 #: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../plugins/itip-formatter/itip-formatter.c:2228
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -6914,7 +6896,7 @@ msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../plugins/itip-formatter/itip-formatter.c:1387
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
@@ -6934,7 +6916,7 @@ msgstr "Eine Aktion wählen:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2316
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-list-view.c:592
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -6944,7 +6926,7 @@ msgid "Update"
 msgstr "Aktualisieren"
 
 #: ../calendar/gui/e-itip-control.c:2380
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept"
 msgstr "Annehmen"
 
@@ -6953,7 +6935,7 @@ msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
 #: ../calendar/gui/e-itip-control.c:2382
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../plugins/groupwise-features/process-meeting.c:55
 msgid "Decline"
 msgstr "Ablehnen"
 
@@ -7017,66 +6999,66 @@ msgstr "Optionale Teilnehmer"
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../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:739 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:164
 #: ../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/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Raum"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:178
 #: ../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:742 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
 #: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:547
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
@@ -7087,7 +7069,7 @@ msgstr "In Bearbeitung"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2126
+#: ../calendar/gui/e-meeting-time-sel.c:2125
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -7096,7 +7078,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:2157
+#: ../calendar/gui/e-meeting-time-sel.c:2156
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -7106,67 +7088,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:398
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "A_ttendees..."
 msgstr "_Teilnehmer …"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:435
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:452
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:477
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:492
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:510
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:525
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_End time:"
 msgstr "_Endzeit:"
 
@@ -7194,11 +7176,11 @@ msgstr "Sprache"
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:953
 msgid "_Delete Selected Memos"
 msgstr "Gewählte Notizen _löschen"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
@@ -7248,43 +7230,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:1659
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2660
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2661
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2666
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2903
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2918
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2927
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3039
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4007
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -7680,78 +7662,77 @@ msgstr "30."
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2488
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2490
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2515
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2538
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2587
+#: ../calendar/gui/print.c:2592
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2607
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2619
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2632
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2643
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -7870,37 +7851,37 @@ msgstr "ist kleiner als"
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-Dateien (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
@@ -9465,201 +9446,187 @@ msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
-#: ../composer/e-composer-actions.c:415
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../composer/e-composer-actions.c:420 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:427 ../mail/em-folder-view.c:1338
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338
 #: ../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-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../composer/e-composer-actions.c:434 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:448
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:450
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "Versandoptionen einfügen"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:492
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:526
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:528
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:542
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:552
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Von-Wähler anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:574
-msgid "_Post-To Field"
-msgstr "V_eröffentlichen-in-Feld"
-
-#: ../composer/e-composer-actions.c:576
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
-
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:590
-msgid "_Subject Field"
-msgstr "_Betreff-Feld"
-
-#: ../composer/e-composer-actions.c:592
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Betrefffeld anzeigen/verbergen"
-
-#: ../composer/e-composer-actions.c:598
-msgid "_To Field"
-msgstr "A_n-Feld"
-
-#: ../composer/e-composer-actions.c:600
-msgid "Toggles whether the To field is displayed"
-msgstr "An-Feld anzeigen/verbergen"
-
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:114
+#, fuzzy
+msgid "Show"
+msgstr "An_zeigen: "
+
+#: ../composer/e-composer-header.c:117
+#, fuzzy
+msgid "Hide"
+msgstr "_Verbergen"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -9667,35 +9634,43 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:927
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:936
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -9715,14 +9690,19 @@ msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-msg-composer.c:833
+#: ../composer/e-composer-private.c:203
+#, fuzzy
+msgid "Save draft"
+msgstr "Entwurf speichern"
+
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:840
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9730,19 +9710,11 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2487
+#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#. translators, this count will always be >1
-#: ../composer/e-msg-composer.c:1735 ../widgets/misc/e-attachment.c:936
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Beigelegte Nachricht"
-msgstr[1] "%d beigelegte Nachrichten"
-
-#: ../composer/e-msg-composer.c:3709
+#: ../composer/e-msg-composer.c:3329
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9917,7 +9889,7 @@ msgstr "Entwurf _speichern"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-E-Mail und -Kalender"
 
-#: ../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:948
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -9950,7 +9922,7 @@ msgid "Evolution Query"
 msgstr "Evolution-Abfrage"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
@@ -10074,55 +10046,55 @@ msgstr "Datei überschreiben?"
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "_Wichtig"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "_Geschäftlich"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_Persönlich"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "Zu er_ledigen"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:321
 msgid "Label _Name:"
 msgstr "_Beschriftungsname:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:363
 msgid "Label name cannot be empty."
 msgstr "Beschriftungsname darf nicht leer sein."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:368
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10130,128 +10102,128 @@ msgstr ""
 "Beschriftung mit der gleichen Markierung existiert bereits. Bitte geben Sie "
 "der Beschriftung einen anderen Namen."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-Fehler: %s"
 
-#: ../e-util/gconf-bridge.c:1232
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Vor 1 Sekunde"
 msgstr[1] "Vor %d Sekunden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "In 1 Sekunde"
 msgstr[1] "In %d Sekunden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Vor 1 Minute"
 msgstr[1] "Vor %d Minuten"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "In 1 Minute"
 msgstr[1] "In %d Minuten"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Vor 1 Stunde"
 msgstr[1] "Vor %d Stunden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "In 1 Stunde"
 msgstr[1] "In %d Stunden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor 1 Tag"
 msgstr[1] "Vor %d Tagen"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "In 1 Tag"
 msgstr[1] "In %d Tagen"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Vor 1 Woche"
 msgstr[1] "Vor %d Wochen"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "In 1 Woche"
 msgstr[1] "In %d Wochen"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Vor 1 Monat"
 msgstr[1] "Vor %d Monaten"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "In 1 Monat"
 msgstr[1] "In %d Monaten"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Vor 1 Jahr"
 msgstr[1] "Vor %d Jahren"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "In 1 Jahr"
 msgstr[1] "In %d Jahren"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<Klicken Sie hier, um ein Datum zu wählen>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "jetzt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d.%m.%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/filter-datespec.c:448
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
@@ -10493,8 +10465,8 @@ msgstr "Verwaltung der Netzwerkeinstellungen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:599 ../mail/mail-component.c:600
-#: ../mail/mail-component.c:769
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:790
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-Mail"
@@ -10519,12 +10491,12 @@ msgid "_Mail"
 msgstr "_E-Mail"
 
 #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
 #: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
@@ -10534,52 +10506,100 @@ msgstr "_Antwort an Absender"
 msgid "%d attached messages"
 msgstr "Beigelegte Nachricht"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:2188
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:601
 #, fuzzy
 msgid "Icon View"
 msgstr "Monatsansicht"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:602
 #, fuzzy
 msgid "List View"
 msgstr "_Listenansicht"
 
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Passt auf: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#, fuzzy
+msgid "Close the find bar"
+msgstr "Dieses Fenster schließen"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "_Suchen:"
+
+#: ../mail/e-mail-search-bar.c:540
+#, fuzzy
+msgid "Clear the search"
+msgstr "Immer suchen"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Rückwärts suchen"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_Weitersuchen"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+#, fuzzy
+msgid "Mat_ch case"
+msgstr "_Groß-/Kleinschreibung berücksichtigen"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:287
+#: ../mail/em-account-editor.c:308
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:291
+#: ../mail/em-account-editor.c:312
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:295
+#: ../mail/em-account-editor.c:316
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: ../mail/em-account-editor.c:386
+#: ../mail/em-account-editor.c:407
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s-Lizenzvereinbarung"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:414
 #, c-format
 msgid ""
 "\n"
@@ -10592,72 +10612,73 @@ msgstr ""
 " Lizenzvereinbarung für %s.\n"
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: ../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:610 ../mail/em-account-editor.c:655
+#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:780
 msgid "Never"
 msgstr "Nie"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:781
 msgid "Always"
 msgstr "Immer"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:782
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Identität"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2177
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2185
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
+#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Vorgaben"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133
 #: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Sicherheit"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3099 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3099 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
@@ -10691,31 +10712,31 @@ msgstr "Signaturskript hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: ../mail/em-composer-utils.c:1152 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1114 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1604
+#: ../mail/em-composer-utils.c:1566
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/em-composer-utils.c:1610
+#: ../mail/em-composer-utils.c:1572
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
 "gefunden wurde."
 
-#: ../mail/em-composer-utils.c:2060
+#: ../mail/em-composer-utils.c:2040
 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:2107
+#: ../mail/em-composer-utils.c:2087
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10723,7 +10744,7 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2250
+#: ../mail/em-composer-utils.c:2230
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
@@ -10744,18 +10765,10 @@ msgstr "Farbe zuweisen"
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Signalton"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Abgeschlossen am"
@@ -10773,7 +10786,7 @@ msgid "Date sent"
 msgstr "Verschickt-Datum"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:770
 #: ../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
@@ -10829,7 +10842,7 @@ msgstr "Folgenachricht"
 msgid "Forward to"
 msgstr "Weiterleiten"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:957
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Wichtig"
 
@@ -10988,8 +11001,8 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
@@ -11009,51 +11022,51 @@ msgstr "Dann"
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1201
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1254
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
@@ -11083,11 +11096,11 @@ msgid "Quota usage"
 msgstr "Speicherverbrauch:"
 
 #. 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:166
-#: ../mail/mail-component.c:587
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:522
+#: ../mail/em-folder-tree.c:2599 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Eingang"
 
@@ -11109,35 +11122,35 @@ msgid "Folder _name:"
 msgstr "Ordner_name:"
 
 #. 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:196 ../mail/em-folder-tree-model.c:198
+#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029
 msgid "Search Folders"
 msgstr "Suchordner"
 
 # CHECK
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:518 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:169
+#: ../mail/em-folder-tree-model.c:527 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:585 ../mail/em-folder-tree-model.c:895
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
@@ -11156,121 +11169,121 @@ msgstr "Ladevorgang …"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:379
+#: ../mail/em-folder-tree.c:310
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:740
+#: ../mail/em-folder-tree.c:719
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:899
+#: ../mail/em-folder-tree.c:878
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:901
+#: ../mail/em-folder-tree.c:880
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:908 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:887 ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:910 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:889 ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:925
+#: ../mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-tree.c:1002 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:981 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:982 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ../mail/em-folder-tree.c:1005 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-tree.c:984 ../mail/em-folder-utils.c:362
 #: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/em-folder-tree.c:1007 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:986 ../mail/message-list.c:2108
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
-#: ../mail/em-folder-tree.c:1717 ../mail/mail-ops.c:1065
+#: ../mail/em-folder-tree.c:1696 ../mail/mail-ops.c:1065
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2101
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2121
+#: ../mail/em-folder-tree.c:2106
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2109
 msgid "_Move..."
 msgstr "_Verschieben …"
 
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2117 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../mail/em-folder-tree.c:2133
+#: ../mail/em-folder-tree.c:2118
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../mail/em-folder-tree.c:2139 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2124 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2227
 msgid "_Unread Search Folder"
 msgstr "_Ungelesen-Suchordner"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1187
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187
 #: ../mail/em-folder-view.c:1202
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1202
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/em-folder-utils.c:539
+#: ../mail/em-folder-utils.c:537
 #: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Ordner »%s« wird angelegt"
 
-#: ../mail/em-folder-utils.c:698
+#: ../mail/em-folder-utils.c:696
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:698
+#: ../mail/em-folder-utils.c:696
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Specify where to create the folder:"
@@ -11285,7 +11298,7 @@ msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
 #. 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:1336 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
@@ -11392,79 +11405,48 @@ msgstr "Filter über Ma_ilingliste"
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2256 ../mail/em-folder-view.c:2299
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
+#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278
+#: ../plugins/google-account-setup/google-source.c:223
+#: ../plugins/google-account-setup/google-source.c:508
+#: ../plugins/google-account-setup/google-source.c:719
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2517
+#: ../mail/em-folder-view.c:2496
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2536
-msgid "Retrieving Message..."
-msgstr "Nachricht wird abgerufen …"
-
-#: ../mail/em-folder-view.c:2755
-msgid "C_all To..."
-msgstr "_Anrufen …"
-
-#: ../mail/em-folder-view.c:2758
+#: ../mail/em-folder-view.c:2700
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2701
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2702
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:3253
+#: ../mail/em-folder-view.c:3195
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:3265
+#: ../mail/em-folder-view.c:3207
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../mail/em-folder-view.c:3270
+#: ../mail/em-folder-view.c:3212
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:447
-#, c-format
-msgid "Matches: %d"
-msgstr "Passt auf: %d"
-
-#: ../mail/em-format-html-display.c:591
-msgid "Fin_d:"
-msgstr "_Suchen:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:615
-msgid "_Previous"
-msgstr "_Rückwärts suchen"
-
-#: ../mail/em-format-html-display.c:620
-msgid "_Next"
-msgstr "_Weitersuchen"
-
-#: ../mail/em-format-html-display.c:625
-msgid "M_atch case"
-msgstr "_Groß-/Kleinschreibung berücksichtigen"
-
-#: ../mail/em-format-html-display.c:919 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:655
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:919
+#: ../mail/em-format-html-display.c:570
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11472,12 +11454,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:920 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:920
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11485,11 +11467,11 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:921 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:657
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:921
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11497,11 +11479,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: ../mail/em-format-html-display.c:922 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:922
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11509,11 +11491,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:923 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:659
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html-display.c:923
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11521,11 +11503,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
 
-#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:581
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11533,11 +11515,11 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher kann ihr Inhalt bei der "
 "Übertragung über das Internet möglicherweise ausgespäht werden."
 
-#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:931
+#: ../mail/em-format-html-display.c:582
 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 "
@@ -11547,11 +11529,11 @@ msgstr ""
 "jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:667
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:932
+#: ../mail/em-format-html-display.c:583
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11559,11 +11541,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:584 ../mail/em-format-html.c:668
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:584
 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 "
@@ -11573,58 +11555,58 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1034 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:685 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:700
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: ../mail/em-format-html-display.c:1369
+#: ../mail/em-format-html-display.c:992
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1000
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1003
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: ../mail/em-format-html-display.c:1460
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../mail/em-format-html-display.c:1083
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../mail/em-format-html-display.c:1461
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../mail/em-format-html-display.c:1084
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1085
 msgid "_Fit to Width"
 msgstr "In der Breite ein_passen"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1086
 msgid "Show _Original Size"
 msgstr "In _Originalgröße anzeigen"
 
-#: ../mail/em-format-html-display.c:2121 ../mail/em-format-html-display.c:2160
+#: ../mail/em-format-html-display.c:1587 ../mail/em-format-html-display.c:1626
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:1589
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:2180
+#: ../mail/em-format-html-display.c:1646
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
-#: ../mail/em-format-html-display.c:2257
+#: ../mail/em-format-html-display.c:1723
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11684,20 +11666,20 @@ msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
 #: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Kopie"
 
 #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Blindkopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -11719,80 +11701,80 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Diese Nachricht wurde von <b>%s</b> im Namen von <b>%s</b> gesendet"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Von"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324
 #: ../widgets/misc/e-dateedit.c:346
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Gesicht"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
 "Unbekannter Fehler"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
@@ -11827,10 +11809,6 @@ msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthält:"
 
 #: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:501
-#: ../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:1906
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Kopfzeile"
@@ -11848,13 +11826,13 @@ msgid "Tag"
 msgstr "Markierung"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -11862,40 +11840,40 @@ msgstr ""
 "%s-Plugin ist nicht verfügbar. Bitte prüfen Sie, ob das zugehörige "
 "Programmpaket installiert ist."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1096
 msgid "No Junk plugin available"
 msgstr "Kein Unerwünscht-Plugin verfügbar"
 
 #. green
-#: ../mail/em-migrate.c:960
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: ../mail/em-migrate.c:961
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Später"
 
-#: ../mail/em-migrate.c:1128
+#: ../mail/em-migrate.c:1129
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/em-migrate.c:1573
+#: ../mail/em-migrate.c:1574
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:1599
+#: ../mail/em-migrate.c:1600
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
 
-#: ../mail/em-migrate.c:1784
+#: ../mail/em-migrate.c:1785
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "»%s« konnte nicht auf vorhandene Postfächer überprüft werden: %s"
 
-#: ../mail/em-migrate.c:1789
+#: ../mail/em-migrate.c:1790
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11907,32 +11885,32 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../mail/em-migrate.c:1990
+#: ../mail/em-migrate.c:1991
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Alte POP-Keep-on-Server-Daten »%s« konnten nicht geöffnet werden: %s"
 
-#: ../mail/em-migrate.c:2004
+#: ../mail/em-migrate.c:2005
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP-Keep-on-Server-Datenverzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2033
+#: ../mail/em-migrate.c:2034
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP-Keep-on-Server-Daten »%s« konnten nicht kopiert werden: %s"
 
-#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
+#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -11944,12 +11922,12 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../mail/em-migrate.c:2956
+#: ../mail/em-migrate.c:2957
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2975
+#: ../mail/em-migrate.c:2976
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11957,56 +11935,56 @@ msgstr ""
 "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
 
-#: ../mail/em-popup.c:368
+#: ../mail/em-popup.c:364
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../mail/em-popup.c:393
+#: ../mail/em-popup.c:389
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: ../mail/em-popup.c:501
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
 #. make it first item
-#: ../mail/em-popup.c:551 ../mail/em-popup.c:751
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:747
 msgid "_Add to Address Book"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: ../mail/em-popup.c:730 ../widgets/misc/e-attachment-view.c:645
+#: ../mail/em-popup.c:726
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen …"
 
-#: ../mail/em-subscribe-editor.c:604
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstützt keine Abonnements oder sie sind nicht aktiviert."
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:641
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:857
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:893
+#: ../mail/em-subscribe-editor.c:895
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
@@ -12280,30 +12258,31 @@ msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+"Die Anzeige während dem Markieren mehrerer Nachrichten aktivieren/"
+"deaktivieren"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 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."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
-"können, indem Sie lediglich zu tippen beginnen. Benutzen Sie dies, damit Sie "
-"Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
-"sofort zu diesem Ordner."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12311,44 +12290,46 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
 "deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
+#, fuzzy
 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."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "Dateinamen in E-Mail-Kopfzeilen wie Outlook und GMail kodieren, damit "
 "letztere Dateinamen mit Umlauten, die von Evolution verschickt wurden, "
 "korrekt darstellen. Outlook und GMail ignorieren den Standard RFC 2231 und "
 "benutzen den inkorrecten Standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12356,7 +12337,7 @@ msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12365,7 +12346,7 @@ msgstr ""
 "darunter anzeigen."
 
 # CHECK - etwas holprig
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 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 "
@@ -12376,7 +12357,7 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12384,7 +12365,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster »E-Mails verschicken und abrufen« ist. Der "
 "Wert ändert sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12398,7 +12379,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser Schlüssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -12406,12 +12387,6 @@ msgstr ""
 "Legt fest, wie breit des Fenster »E-Mails verschicken und empfangen« ist. Der "
 "Wert ändert sich, wenn der Benutzer das Fenster horizontal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Die Anzeige während dem Markieren mehrerer Nachrichten aktivieren/"
-"deaktivieren"
-
 # FIXME
 #: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
@@ -12674,27 +12649,89 @@ msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
 #: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+#, fuzzy
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+"Beim Verschicken verschlüsselter E-Mails auch für sich sel_bst verschlüsseln"
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show photo of the sender"
 msgstr "Photo des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12702,61 +12739,61 @@ msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Photos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Spell checking color"
 msgstr "Farbe für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Spell checking languages"
 msgstr "Sprachen für Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Subscribe dialog default height"
 msgstr "Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Subscribe dialog default width"
 msgstr "Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Text message part limit"
 msgstr "Textnachrichtenteil-Begrenzung"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12764,7 +12801,7 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 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."
@@ -12772,7 +12809,7 @@ msgstr ""
 "Dies bestimmt die maximale Größe des Textteils, der von Evolution formatiert "
 "wird. Die Vorgabe sind 4MB/4096kb und ist in KB angegeben."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 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 "
@@ -12782,7 +12819,7 @@ msgstr ""
 "aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
 "so wird nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 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."
@@ -12793,7 +12830,7 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 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;"
@@ -12805,7 +12842,7 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 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 "
@@ -12815,11 +12852,11 @@ msgstr ""
 "fest, ob Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, "
 "dass E-Mails von Bekannten nicht als unerwünscht markiert werden."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12827,7 +12864,7 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12836,7 +12873,7 @@ msgstr ""
 "werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu "
 "gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 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 "
@@ -12846,119 +12883,79 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farbe für falsch geschriebene Wörter während der Eingabe"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use side-by-side or wide layout"
 msgstr "Breite oder nebeneinander ausgerichtete Ansicht benutzen?"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Ansicht/Von-Menüeintrag ist aktiv"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Ansicht/Von-Menüeintrag ist aktiv."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Legt fest, ob die Anforderung einer Lesebestätigung standardmäßig zu jeder "
 "Nachricht hinzugefügt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Legt fest, ob zu lange Ordnernamen in der Seitenleiste abgekürzt werden."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12966,15 +12963,15 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
@@ -13061,89 +13058,89 @@ msgstr "Mailingliste %s"
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../mail/mail-component.c:576
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../mail/mail-component.c:577
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:950
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:951
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:952
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:958
 msgid "New Mail Folder"
 msgstr "Neuer E-Mail-Ordner"
 
-#: ../mail/mail-component.c:938
+#: ../mail/mail-component.c:959
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../mail/mail-component.c:939
+#: ../mail/mail-component.c:960
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../mail/mail-component.c:1086
+#: ../mail/mail-component.c:1107
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Auffrischen der E-Mail-Einstellungen oder -Ordner gescheitert."
 
@@ -13722,8 +13719,8 @@ msgstr "_Benutzername:"
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:368
-#: ../plugins/google-account-setup/google-source.c:613
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:632
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
 msgid "User_name:"
@@ -13895,46 +13892,34 @@ msgid "All local folders"
 msgstr "Alle lokalen Ordner"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Groß-/Kleinschreibung berücksichtigen"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "S_uchen:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "In Nachricht suchen"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:275
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13943,19 +13928,19 @@ msgstr ""
 "Nachrichten.\n"
 "Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü »Markierung«."
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Fällig am:"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
@@ -13964,21 +13949,21 @@ msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Gewählte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13987,34 +13972,34 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:620
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../mail/mail-ops.c:725 ../mail/mail-ops.c:806
+#: ../mail/mail-ops.c:726 ../mail/mail-ops.c:807
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:763
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:767 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:878
+#: ../mail/mail-ops.c:879
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
@@ -14089,21 +14074,21 @@ msgstr "Lokale Ordner"
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2018
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:2094
+#: ../mail/mail-ops.c:2098
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14112,11 +14097,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2170
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2184 ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2188 ../mail/mail-ops.c:2196
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14125,27 +14110,27 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2207
+#: ../mail/mail-ops.c:2211
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2353
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: ../mail/mail-ops.c:2353
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2449
+#: ../mail/mail-ops.c:2453
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' wird für Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2535
+#: ../mail/mail-ops.c:2539
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
@@ -14169,7 +14154,7 @@ msgstr "Aktualisieren …"
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:813
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
@@ -14238,21 +14223,21 @@ msgstr "Ungültiger Ordner: »%s«"
 msgid "Setting up Search Folder: %s"
 msgstr "Suchordner wird eingerichtet: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Suchordner für »%s:%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner für »%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1068
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1157
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
@@ -14972,11 +14957,11 @@ 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:3985 ../mail/message-list.c:4459
+#: ../mail/message-list.c:3986 ../mail/message-list.c:4460
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4298
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14984,7 +14969,7 @@ msgstr ""
 "Auf Ihr Suchkriterium treffen keine Nachrichten zu. Leeren Sie die Suche mit "
 "Suchen->Verwerfen oder ändern Sie sie."
 
-#: ../mail/message-list.c:4300
+#: ../mail/message-list.c:4301
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -15046,11 +15031,11 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../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:76
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../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:77
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
@@ -15079,20 +15064,26 @@ msgid "Subject contains"
 msgstr "Betreff enthält"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "Betreff oder Absender"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "Betreff oder Empfänger enthält"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Betreff oder Absender"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Lokale Adressbücher"
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Lokale Adressbuchordner auflisten"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Stellt Kernfunktionalität für lokale Adressbücher zur Verfügung."
+msgid "Local Address Books"
+msgstr "Lokale Adressbücher"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -15121,12 +15112,8 @@ msgid "Attachment Reminder"
 msgstr "Anlagenerinnerung"
 
 #: ../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 "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Sucht nach Begriffen in einer Nachricht, die auf eine Dateianlage hinweisen "
-"und warnt, falls die Anlage fehlt"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -15150,16 +15137,13 @@ msgid "_Edit Message"
 msgstr "Nachricht _bearbeiten"
 
 #: ../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 ""
-"Zeigt Audio-Anlagen innerhalb der Nachricht und ermöglicht das direkte "
-"Abspielen in Evolution."
+#, fuzzy
+msgid "Audio Inline"
+msgstr "Audio-Einbettungs-Plugin"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Audio-Einbettungs-Plugin"
+msgid "Play audio attachments directly from Evolution."
+msgstr ""
 
 #: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
@@ -15203,119 +15187,120 @@ msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Evolution-Sicherungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
-#: ../plugins/backup-restore/backup.c:123
-#: ../plugins/backup-restore/backup.c:256
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:130
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:134
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:145
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:150
-#: ../plugins/backup-restore/backup.c:337
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "Dateien aus dem Sicherungsarchiv extrahieren"
 
-#: ../plugins/backup-restore/backup.c:272
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:276
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "Entfernen der temporären Sicherungsdateien"
 
-#: ../plugins/backup-restore/backup.c:283
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "Lokale Quellen sicherstellen"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:430
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:490
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:493
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:494
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:512
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhängig von den Daten in Ihrem Konto einige Zeit dauern."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr ""
-"Ein Plugin zum Sichern und Wiederherstellen von Evolution-Daten und "
-"Einstellungen"
-
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
 msgstr "Plugin zum Sichern und Wiederherstellen"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
@@ -15383,55 +15368,59 @@ msgstr "Einstellungen _zurücksetzen …"
 msgid "_Backup Settings..."
 msgstr "Einstellungen sic_hern …"
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:648
+#, fuzzy
+msgid "Create _address book entries when sending mails"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Beantwortung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:654
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch für automatische Kontakte auswählen"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:669
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmäßig mit der Pidgin-Kontaktliste "
 "abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:690
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch für die Pidgin-Kontaktliste auswählen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:701
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "Füllt das Adressbuch automatisch mit Namen und E-Mail-Adressen, sobald auf "
 "Nachrichten geantwortet wird und fügt auch Instant-Messaging-"
 "Kontaktinformationen aus Ihren Buddy-Listen hinzu."
 
-#: ../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:161
 #, c-format
@@ -15470,80 +15459,84 @@ msgstr ""
 "verschiedenen Zeichenkodierungen einheitlich zu erkennen."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter-Optionen"
+#, fuzzy
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter-Unerwünscht-Plugin"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter-Unerwünscht-Plugin"
+msgid "Bogofilter Options"
+msgstr "Bogofilter-Optionen"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Filter junk messages using Bogofilter."
 msgstr "Filtert unerwünschte Nachrichten unter Verwendung von Bogofilter."
 
 #: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:329
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:353
-#: ../plugins/google-account-setup/google-source.c:606
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:396
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/google-account-setup/google-source.c:649
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "Auf_frischen:"
 
-#: ../plugins/caldav/caldav-source.c:414
-#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-source.c:675
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "Wochen"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV-Kalenderquelle"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
+#, fuzzy
+msgid "CalDAV Support"
 msgstr "CalDAV-Quelle"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Lokale Kalender"
+msgid "Add local calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Stellt Kernfunktionalität für lokale Kalender zur Verfügung."
+msgid "Local Calendars"
+msgstr "Lokale Kalender"
 
-#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Sichere Verbindung"
 
-#: ../plugins/calendar-http/calendar-http.c:389
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "_Benutzername:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP-Kalender"
+msgid "Add web calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Stellt Kernfunktionalität für Webcal- und HTTP-Kalender zur Verfügung."
+#, fuzzy
+msgid "Web Calendars"
+msgstr "Kalender"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -15598,24 +15591,22 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Englisch (Fahrenheit, Inch, usw.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Stellt Kernfunktionalität für Wetterkalender zur Verfügung."
+msgid "Add weather calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Wetterkalender"
 
 #: ../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 ""
-"Ein Test-Plugin, welches ein Kontextmenü-Plugin demonstriert, mit dem Dinge "
-"in die Zwischenablage kopiert werden können."
+#, fuzzy
+msgid "Copy Tool"
+msgstr "Werkzeug zum Kopieren"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Werkzeug zum Kopieren"
+#, fuzzy
+msgid "Copy things to the clipboard."
+msgstr "Die gewählten Nachrichten in die Zwischenablage kopieren"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -15630,13 +15621,15 @@ msgstr ""
 "Verwaltung ist."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+#, fuzzy
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 "Überprüft beim Start, ob Evolution die Vorgabeanwendung zur E-Mail-"
 "Verwaltung ist."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+#, fuzzy
+msgid "Default Mail Client"
 msgstr "Vorgabeanwendung für E-Mail"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -15644,7 +15637,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:601
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15669,12 +15662,8 @@ msgid "Default Sources"
 msgstr "Vorgabequellen"
 
 #: ../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 "Mark your preferred address book and calendar as default."
 msgstr ""
-"Stellt Funktionalität zum Markieren von Kalendern und Adressbüchern als "
-"Vorgabe zur Verfügung."
 
 #: ../plugins/email-custom-header/email-custom-header.c:334
 msgid "Security:"
@@ -15726,7 +15715,8 @@ msgstr "Benutzerdefinierte E-Mail-Kopfzeile"
 
 #. 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."
+#, fuzzy
+msgid "Add custom headers to outgoing mail messages."
 msgstr "Fügt ausgehenden Nachrichten eine benutzerdefinierte Kopfzeile hinzu."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -15858,43 +15848,43 @@ msgstr "_OWA-URL:"
 msgid "A_uthenticate"
 msgstr "_Legitimation"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "_Namen des Postfachs angeben"
+#: ../plugins/exchange-operations/exchange-account-setup.c:778
+msgid "Mailbox name is _different than user name"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:791
 msgid "_Mailbox:"
 msgstr "_Postfach:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1006
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
+#: ../plugins/exchange-operations/exchange-account-setup.c:1020
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1135
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
-#: ../plugins/exchange-operations/exchange-contacts.c:219
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-contacts.c:220
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 #. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-account-setup.c:1142
 #: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
+#: ../plugins/exchange-operations/exchange-contacts.c:223
 msgid "Size:"
 msgstr "Größe:"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
+#: ../plugins/exchange-operations/exchange-contacts.c:171
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15971,7 +15961,7 @@ msgstr "Berechtigungen für %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:329
+#: ../plugins/exchange-operations/exchange-delegates-user.c:330
 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."
@@ -15982,26 +15972,26 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:334
+#: ../plugins/exchange-operations/exchange-delegates-user.c:335
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sie haben nun folgende Zugriffserlaubnis auf meine Ordner:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:352
+#: ../plugins/exchange-operations/exchange-delegates-user.c:355
 msgid "You are also permitted to see my private items."
 msgstr "Es ist Ihnen zudem erlaubt, meine privaten Elemente zu sehen."
 
 #. 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:359
+#: ../plugins/exchange-operations/exchange-delegates-user.c:362
 msgid "However you are not permitted to see my private items."
 msgstr ""
 "Es ist Ihnen allerdings nicht erlaubt, meine privaten Elemente zu sehen."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:391
+#: ../plugins/exchange-operations/exchange-delegates-user.c:394
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sie wurden als Delegat für %s eingetragen"
@@ -16096,6 +16086,7 @@ msgstr "_Berechtigungen zusammenfassen"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1915
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
@@ -16214,8 +16205,8 @@ msgstr "Benutzer hinzufügen:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:714
+#: ../plugins/groupwise-features/proxy.c:936
+#: ../plugins/groupwise-features/share-folder.c:718
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
@@ -16350,12 +16341,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Kalender eines anderen Benutzers abonnieren"
 
 #: ../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."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Ein Plugin, das eine Reihe von Exchange-spezifischen Abläufen und Funktionen "
-"bereitstellt."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16636,7 +16623,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Unbekannter Fehler beim Suchen von {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
@@ -16745,6 +16732,18 @@ msgstr "Vorgabe für Externen Editor"
 msgid "The default command that must be used as the editor."
 msgstr "Der Befehl, der als Editor verwendet werden muss."
 
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#, fuzzy
+msgid "External Editor"
+msgstr "Vorgabe für Externen Editor"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr ""
+"Ein Plugin zur Nutzung eines externen Editors als Nachrichten-Editor. Es "
+"können lediglich Nur-Text-Nachrichten verschickt werden."
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Temporäre Datei konnte nicht angelegt werden"
@@ -16812,10 +16811,13 @@ msgid "_Face"
 msgstr "_Gesicht"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 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."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
 "Eine Gesichtskopfzeile den ausgehenden E-Mails hinzufügen. Zunächst muss ein "
 "48*48-Pixel-PNG-Bild ausgewählt werden. Dieses wird base64-kodiert und unter "
@@ -16828,14 +16830,14 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Abbestellen des Ordners »%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 ""
-"Erlaubt das Abbestellen von Ordnern über das Kontextmenü der Seitenleiste."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Ordner abbestellen"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
@@ -16845,14 +16847,14 @@ msgstr "Ab_bestellen"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:416
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Geben Sie das Passwort für den Benutzer %s ein, um auf die Liste der "
 "abonnierten Kalender zuzugreifen."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16861,11 +16863,11 @@ msgstr ""
 "Daten konnten nicht vom Google-Server empfangen werden.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:694
 msgid "Cal_endar:"
 msgstr "_Kalender:"
 
-#: ../plugins/google-account-setup/google-source.c:709
+#: ../plugins/google-account-setup/google-source.c:729
 msgid "Retrieve _list"
 msgstr "_Liste abrufen"
 
@@ -16875,20 +16877,21 @@ 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."
-msgstr "Ein Plugin zum Einrichten von Google-Kalendern und -Kontakten."
+msgid "Add Google Calendars to Evolution."
+msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google-Quellen"
+#, fuzzy
+msgid "Google Calendars"
+msgstr "GNOME Calendar"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Checkliste"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Ein Plugin zum Einrichten von Groupwise-Kalendern und -Kontaktquellen."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
@@ -16990,7 +16993,8 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufügen"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
+#, fuzzy
+msgid "Fine-tune your GroupWise accounts."
 msgstr "Ein Plugin für die Funktionen von GroupWise-Konten."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
@@ -17005,12 +17009,76 @@ msgstr "Zurückziehen gescheitert"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Der Server gestattete nicht, die gewählte Nachricht zurückzuziehen."
 
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting ?"
+msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item ?"
+msgstr "Wollen Sie diese unfertigen Nachrichten wiederherstellen?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr ""
+"Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
+"werden?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+msgid "This is a recurring meeting"
+msgstr "Dies ist ein wiederkehrendes Ereignis"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+msgid "Would you like to accept it?"
+msgstr "Wollen Sie dies akzeptieren?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+msgid "Would you like to decline it?"
+msgstr "Wollen Sie dies ablehnen?"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Es existiert bereits ein Konto namens »{0}«. Bitte überprüfen Sie Ihre Ordner-"
+"Hierarchie."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Konto existiert bereits"
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Ungültiger Benutzer"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Anmeldung als »{0}« am Proxy war nicht möglich. Bitte überpüfen Sie Ihre E-"
+"Mail-Adresse und versuchen es erneut."
+
 #. 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.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
@@ -17033,53 +17101,26 @@ msgstr ""
 "Sie müssen einen gültigen Benutzernamen eingeben, um Zugriff auf den Proxy "
 "zu gewähren."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Es existiert bereits ein Konto namens »{0}«. Bitte überprüfen Sie Ihre Ordner-"
-"Hierarchie."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "Konto existiert bereits"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Anmeldung als »{0}« am Proxy war nicht möglich. Bitte überpüfen Sie Ihre E-"
-"Mail-Adresse und versuchen es erneut."
-
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "This is a recurring meeting"
-msgstr "Dies ist ein wiederkehrendes Ereignis"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:5
-msgid "Would you like to accept it?"
-msgstr "Wollen Sie dies akzeptieren?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:7
-msgid "Would you like to decline it?"
-msgstr "Wollen Sie dies ablehnen?"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:8
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr ""
 "Sie können diesen Ordner nicht mit dem angegebenen Benutzer »{0}« teilen"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:9
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 "Sie müssen einen Benutzernamen festlegen, der der Liste hinzugefügt werden "
 "soll"
 
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Accept Tentatively"
 msgstr "Vorläufig annehmen"
 
+#: ../plugins/groupwise-features/process-meeting.c:322
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "Besprechung dele_gieren …"
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Benutzer:</b>"
@@ -17176,10 +17217,10 @@ msgstr "<b>Kontoname</b>"
 msgid "Proxy Login"
 msgstr "Vertretungsanmeldung"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:489
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
@@ -17187,26 +17228,26 @@ msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 #. 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:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "_Vertretungsanmeldung …"
 
 #. 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:690
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto online ist."
 
 #. 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:696
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto aktiviert ist."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/send-options.c:215
 msgid "Advanced send options"
 msgstr "Erweiterte Versandoptionen"
 
 #: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:749
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Users"
 msgstr "Benutzer"
 
@@ -17222,15 +17263,15 @@ msgstr "Neue Ordner_freigabe …"
 msgid "Sharing"
 msgstr "Freigeben"
 
-#: ../plugins/groupwise-features/share-folder.c:532
+#: ../plugins/groupwise-features/share-folder.c:536
 msgid "Custom Notification"
 msgstr "Eigene Benachrichtigung"
 
-#: ../plugins/groupwise-features/share-folder.c:754
+#: ../plugins/groupwise-features/share-folder.c:758
 msgid "Add   "
 msgstr "Hinzufügen   "
 
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder.c:764
 msgid "Modify"
 msgstr "Ändern"
 
@@ -17288,12 +17329,12 @@ msgid "Track Message Status..."
 msgstr "Nachrichtenstatus verfolgen …"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Ein Plugin zum Einrichten von Hula-Kalenderquellen."
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula-Kontoeinrichtung"
+msgid "Hula Support"
+msgstr ""
 
 #: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
@@ -17346,8 +17387,8 @@ msgstr ""
 "Benutzen Sie dies, wenn Sie keine Mailinglisten-basierten Filter haben"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Ein Plugin für die Funktionen von IMAP-Konten."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
@@ -17357,7 +17398,7 @@ msgstr "IMAP-Funktionen"
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Hardware-Abstraktionsschicht ist nicht geladen"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -17366,11 +17407,11 @@ msgstr ""
 "aktivieren Sie diesen Dienst und starten Sie dieses Programm erneut, oder "
 "wenden Sie sich an Ihren Systemadministrator."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
 msgid "Search for an iPod failed"
 msgstr "Die Suche nach einem iPod ist gescheitert"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
 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."
@@ -17384,149 +17425,152 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar-Format (.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 ""
-"Die ausgewählten Aufgaben, Notizen, Kalender oder Adressbücher mit dem Apple "
-"iPod abgleichen"
+msgid "Synchronize to iPod"
+msgstr "Datenabgleich mit iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
+#, fuzzy
+msgid "Synchronize your data with your Apple iPod."
 msgstr "Datenabgleich mit iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod-Datenabgleich"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:484
+#: ../plugins/itip-formatter/itip-formatter.c:609
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Der Kalender »%s« konnte nicht geladen werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:629
 #, c-format
 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:662
+#: ../plugins/itip-formatter/itip-formatter.c:665
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:755
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:762
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:766
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:770
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:841
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "Kalender wird geöffnet"
+
+#: ../plugins/itip-formatter/itip-formatter.c:844
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1026
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1113
 #, 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:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1125
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1129
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1134
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1139
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1233
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Delegaten %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1242
 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:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1350
 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:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 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:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1427
 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:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 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:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1499
+#: ../plugins/itip-formatter/itip-formatter.c:1510
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1500
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17534,15 +17578,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1551
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17550,11 +17594,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1591
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1592
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17562,31 +17606,31 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 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:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2581
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2591
+#: ../plugins/itip-formatter/itip-formatter.c:2624
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
@@ -17973,110 +18017,108 @@ 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:821
+#: ../plugins/itip-formatter/itip-view.c:824
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:864
 msgid "_Accept"
 msgstr "An_nehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:836
 msgid "_Accept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update"
 msgstr "A_ktualisieren"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1034
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "End time:"
 msgstr "Endzeit:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1104
 msgid "Send _reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1134
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1143
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1152
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1161
 msgid "_Inherit reminder"
 msgstr "Erinnerung übernehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "Auf_gaben:"
-
-#: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "Notizen:"
+#: ../plugins/itip-formatter/itip-view.c:1917
+#, fuzzy
+msgid "_Memos:"
+msgstr "_Notizen"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Text- und Kalenderteile in Nachrichten anzeigen."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -18107,13 +18149,13 @@ msgid "Proxy _Logout"
 msgstr "Vertretungsa_bmeldung"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Erlaubt das Deaktivieren von Konten."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Konto deaktivieren"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Signalton ausgeben oder Klangdatei abspielen."
@@ -18272,18 +18314,14 @@ msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
 #: ../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 ""
-"Erzeugt eine D-BUS-Nachricht oder benachrichtigt den Benutzer mit einem "
-"Symbol im Benachrichtigungsfeld und einer Nachricht, wenn eine neue "
-"Nachricht eingetroffen ist."
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Notifies you when new mail messages arrive."
+msgstr "Beim Eintreffen neuer E-Mails Klang abspielen"
+
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #, c-format
 msgid "Cannot open calendar. %s"
@@ -18326,10 +18364,9 @@ msgid "Cannot get source list. %s"
 msgstr "Quelle »{2}« konnte nicht geöffnet werden."
 
 #: ../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 "Ein Plugin zur Erstellung von Aufgaben aus den Inhalten einer E-Mail."
+#, fuzzy
+msgid "Convert a mail message to a task."
+msgstr "Die gewählte Nachricht in eine neue Aufgabe umwandeln"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
@@ -18356,7 +18393,8 @@ msgid "Convert to an _Event"
 msgstr "In eine Bes_prechung umwandeln"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail to task"
+#, fuzzy
+msgid "Mail-to-Task"
 msgstr "E-Mail zu Aufgabe"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -18400,8 +18438,8 @@ msgid "Mailing _List"
 msgstr "Mailing_liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#, fuzzy
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "Bereitstellung von Aktionen für gebräuchliche Mailinglistenbefehle "
 "(abonnieren, abbestellen, …)."
@@ -18578,20 +18616,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "Nachrichten als gelesen _markieren"
 
 #: ../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 "Markieren aller Nachrichten unterhalb eines Ordners als gelesen"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Ein Plugin zur Einbindung von Mono-Plugins."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono-Loader"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr ""
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Ein Plugin zur Verwaltung der Plugin-Aktivierungszustände."
+#, fuzzy
+msgid "Manage your Evolution plugins."
+msgstr "Die Evolution-Einstellungen festlegen"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -18628,28 +18668,20 @@ msgstr "Überblick"
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../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"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Ein Test-Plugin zur Demonstration eines Formatierungs-Plugins, das eine "
-"Wahlmöglichkeit zur Deaktivierung von HTML-Nachrichten bietet.\n"
-"\n"
-"Dieses Plugin dient nur zu Demonstrationszwecken und wird nicht "
-"unterstützt.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Einfacher Textmodus"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#, fuzzy
+msgid "Prefer Plain Text"
 msgstr "Einfachen Text bevorzugen"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
@@ -18671,8 +18703,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution-Profiler"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Schreibt ein Protokoll über Datenereignisse."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -18706,17 +18738,18 @@ msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Erlaubt die Veröffentlichung von Kalendern im Internet"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Kalenderveröffentlichung"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Orte"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Erlaubt die Veröffentlichung von Kalendern im Internet"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
@@ -18814,27 +18847,39 @@ msgstr ""
 msgid "Service _type:"
 msgstr "Dienst-A_rt:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "Time _duration:"
+msgstr "Zeit_zone:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Datei:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "Verö_ffentlichen als:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "An Passwort _erinnern"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -18842,17 +18887,17 @@ msgstr ""
 "iCal\n"
 "Verfügbarkeit"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:57
+#: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Neuer Ort"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
@@ -18880,69 +18925,63 @@ msgstr "Lädt andere Plugins, die in Python geschrieben wurden."
 msgid "Python Loader"
 msgstr "Python-Loader"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:111
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (eingebaut)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:145
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:153
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:192
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Fehler nach Fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin-Kindprozess antwortet nicht. Wird abgewürgt …"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:240
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Warten auf SpamAssassin-Kindprozess abgebrochen. Wird beendet …"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:258
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Weiterleitung an SpamAssassin gescheitert, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:521
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:512
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin ist nicht verfügbar."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:913
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dies erhöht die Zuverlässigkeit des Filters, verlangsamt ihn jedoch"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:919
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:916
 msgid "I_nclude remote tests"
 msgstr "Zusätzliche _Ferntests durchführen"
 
 #: ../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 ""
-"Filtert unerwünschte Nachrichten unter Verwendung von SpamAssassin. Dieses "
-"Plugin erfordert, dass SpamAssassin installiert ist."
+#, fuzzy
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Filtert unerwünschte Nachrichten unter Verwendung von Bogofilter."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin-Optionen"
+#, fuzzy
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin-Unerwünscht-Plugin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin-Unerwünscht-Plugin"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin-Optionen"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
@@ -19025,7 +19064,8 @@ msgid "Save Selected"
 msgstr "Auswahl speichern"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
+#, fuzzy
+msgid "Save a calendar or task list to disk."
 msgstr ""
 "Den gewählten Kalender oder die gewählte Aufgabenliste auf einem Datenträger "
 "speichern."
@@ -19052,12 +19092,14 @@ msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Einzelne Quelle wählen"
+#, fuzzy
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Auswahl einer einzelnen Kalender- oder Aufgabenquelle für die Ansicht."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Auswahl einer einzelnen Kalender- oder Aufgabenquelle für die Ansicht."
+#, fuzzy
+msgid "Select One Source"
+msgstr "Einzelne Quelle wählen"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -19127,10 +19169,9 @@ msgid "Please wait"
 msgstr "Bitte warten"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"Bereitstellung einer Option zum Zurückfallen auf betreffsbezogenes Threading "
-"der Nachrichten."
+#, fuzzy
+msgid "Sort mail message threads by subject."
+msgstr "Betreffsbezogenes Threading der Nachrichten"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19159,7 +19200,7 @@ msgstr "Kein Titel"
 
 #: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
-msgstr "Als _Entwurf speichern"
+msgstr "Als V_orlage speichern"
 
 #: ../plugins/templates/templates.c:713
 msgid "Save as Template"
@@ -19170,16 +19211,53 @@ msgid "Drafts based template plugin"
 msgstr "Vorlagen-Plugin basierend auf Entwürfen"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Ein Plugin, welches ytnef benutzt, um tnef-Anlagen zu dekodieren."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
+#, fuzzy
+msgid "TNEF Decoder"
 msgstr "TNEF-Anlagen-Dekodierer"
 
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "Mehrere VCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:155
+#: ../plugins/vcard-inline/vcard-inline.c:239
+msgid "Show Full vCard"
+msgstr "Gesamte VCard anzeigen"
+
+#: ../plugins/vcard-inline/vcard-inline.c:158
+msgid "Show Compact vCard"
+msgstr "Kompakt-VCard anzeigen"
+
+#: ../plugins/vcard-inline/vcard-inline.c:218
+#, fuzzy
+msgid "There is one other contact."
+msgstr "Es gibt einen weiteren Kontakt."
+
+#: ../plugins/vcard-inline/vcard-inline.c:227
+#, fuzzy, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Es gibt einen weiteren Kontakt."
+msgstr[1] "Es gibt %d weitere Kontakte."
+
+#: ../plugins/vcard-inline/vcard-inline.c:248
+#, fuzzy
+msgid "Save in Address Book"
+msgstr "In Adressbuch speichern"
+
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "Ein Plugin zum Einrichten von WebDAV-Kontakten."
+#, fuzzy
+msgid "Add WebDAV contacts to Evolution."
+msgstr "WebDAV-Kontakte"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
@@ -19359,7 +19437,7 @@ msgstr "Seitenleiste anzeigen"
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -19586,29 +19664,29 @@ msgstr "Evolution-Einstellungen"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
+#: ../shell/e-shell-window-commands.c:78
+#, fuzzy, c-format
+msgid "Error executing %s. (%s)"
 msgstr "Fehler beim Ausführen von %s."
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
 #. 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:942
+#: ../shell/e-shell-window-commands.c:939
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl@linuxfaqs.de>\n"
@@ -19620,19 +19698,19 @@ msgstr ""
 "Christian Kintner <mail@christian-kintner.de>\n"
 "Andre Klapper <ak-47@gmx.net>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:950
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-commands.c:1171
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:1184 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-commands.c:1197
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -19686,9 +19764,9 @@ msgstr "Registrierung bei OAF konnte nicht stattfinden"
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: ../shell/e-user-creatable-items-handler.c:677
-#: ../shell/e-user-creatable-items-handler.c:687
-#: ../shell/e-user-creatable-items-handler.c:692
+#: ../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 "Neu"
 
@@ -19746,7 +19824,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19785,7 +19863,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19793,43 +19871,43 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:483
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:487
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:490
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:494
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:497
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:499
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:501
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:588
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:616
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20746,7 +20824,7 @@ msgstr "Weiter"
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
-#: ../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:70
 #: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Vorherige"
@@ -21063,7 +21141,7 @@ msgstr "Nachrichtenliste nach Threads sortieren"
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../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:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Nachricht"
@@ -21318,199 +21396,183 @@ msgid "Paste messages from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Nachrichten einfügen"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Neue Nachrich_t an Ordner verfassen"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Eine _Antwort veröffentlichen"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Eine Nachricht an einen öffentlichen Ordner verfassen"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "Die gewählten Nachrichten als Textdatei speichern"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "Suchordner über Mailing_liste …"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Suchordner über _Empfänger …"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "Suchordner über _Betreff …"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "Suchordner über _Absender …"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Den _gesamten Text markieren"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Den gesamten Text in einer Nachricht markieren"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Zitiert"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "Nachricht _speichern …"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
@@ -21873,11 +21935,11 @@ msgid "With _Status"
 msgstr "Mit _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777
 msgid "UTC"
 msgstr "UTC"
 
@@ -21907,19 +21969,19 @@ msgstr ""
 "und wählen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ansichten für %s definieren"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -21929,7 +21991,6 @@ msgid "Define Views for \"%s\""
 msgstr "Ansichten für »%s« definieren"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1920
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
@@ -21991,11 +22052,11 @@ msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Fabrik"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Neue Ansicht definieren"
 
@@ -22011,73 +22072,65 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
+#: ../widgets/misc/e-attachment.c:940
+#, fuzzy
+msgid "Attached message"
+msgstr "Beigelegte Nachricht"
+
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258
-#: ../widgets/misc/e-attachment-store.c:627
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
 #, fuzzy
 msgid "attachment.dat"
 msgstr "Anlage"
 
-#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1857
+#: ../widgets/misc/e-attachment.c:1871
 #, fuzzy, c-format
 msgid "Could not load '%s'"
 msgstr "Adressbuch konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1860
+#: ../widgets/misc/e-attachment.c:1874
 #, fuzzy, c-format
 msgid "Could not load the attachment"
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../widgets/misc/e-attachment.c:2135
+#: ../widgets/misc/e-attachment.c:2138
 #, fuzzy, c-format
 msgid "Could not open '%s'"
 msgstr "Quelle konnte nicht geöffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2138
+#: ../widgets/misc/e-attachment.c:2141
 #, fuzzy, c-format
 msgid "Could not open the attachment"
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../widgets/misc/e-attachment.c:2576
+#: ../widgets/misc/e-attachment.c:2583
 #, fuzzy
 msgid "Attachment contents not loaded"
 msgstr "Anlagenerinnerung"
 
-#: ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:2660
 #, fuzzy, c-format
 msgid "Could not save '%s'"
 msgstr "»%s« konnte nicht ausgeführt werden: %s\n"
 
-#: ../widgets/misc/e-attachment.c:2656
+#: ../widgets/misc/e-attachment.c:2663
 #, fuzzy, c-format
 msgid "Could not save the attachment"
 msgstr "Ordner zum Speichern aller Anlagen auswählen"
 
-#: ../widgets/misc/e-attachment.glade.h:1
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Dateiname:"
-
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-Typ:"
-
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Automatische Anzeige der Anlage vorschlagen"
-
 #: ../widgets/misc/e-attachment-dialog.c:328
 #, fuzzy
 msgid "_Filename:"
@@ -22093,6 +22146,23 @@ msgstr "MIME-Typ"
 msgid "Could not set as background"
 msgstr "Zum _Hintergrund machen"
 
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#, fuzzy
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Verknüpfung konnte nicht geöffnet werden."
+msgstr[1] "Verknüpfung konnte nicht geöffnet werden."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#, fuzzy
+msgid "_Send To..."
+msgstr "Schicken an:"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
+
 #: ../widgets/misc/e-attachment-icon-view.c:473
 #: ../widgets/misc/e-attachment-tree-view.c:517
 #, fuzzy
@@ -22105,41 +22175,46 @@ msgstr "Ladevorgang …"
 msgid "Saving"
 msgstr "Schattierung"
 
-#: ../widgets/misc/e-attachment-paned.c:80
+#: ../widgets/misc/e-attachment-paned.c:81
 msgid "Hide _Attachment Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
 msgid "Show _Attachment Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-store.c:541
 #, fuzzy
 msgid "Add Attachment"
 msgstr "Anlage"
 
-#: ../widgets/misc/e-attachment-store.c:536
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../widgets/misc/e-attachment-store.c:598
+#: ../widgets/misc/e-attachment-store.c:607
 #, fuzzy
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Anlagen speichern"
 msgstr[1] "Anlagen speichern"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:326
 #, fuzzy
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../widgets/misc/e-attachment-view.c:648
+#: ../widgets/misc/e-attachment-view.c:643
+#, fuzzy, c-format
+msgid "Open with \"%s\""
+msgstr "%s wird geöffnet …"
+
+#: ../widgets/misc/e-attachment-view.c:646
 #, fuzzy, c-format
 msgid "Open this attachment in %s"
 msgstr "Anlage speichern als"
@@ -22194,21 +22269,21 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1416
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Mindestbreite"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:1004
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Mindestbreite"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Abstand"
 
@@ -22355,7 +22430,7 @@ msgstr "Ungültige Zeitangabe"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:742
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -22372,34 +22447,30 @@ msgstr "_Suchen"
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "Suche _speichern …"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten …"
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche …"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Derzeitige Nachricht"
-
 #: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Bild wählen"
@@ -22449,52 +22520,50 @@ msgstr "Rückfluss-Modell"
 msgid "Column width"
 msgstr "Spaltenbreite"
 
-#: ../widgets/misc/e-search-bar.c:336 ../widgets/misc/e-search-bar.c:469
-#: ../widgets/misc/e-search-bar.c:471
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:477
 msgid "Search"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-search-bar.c:336 ../widgets/misc/e-search-bar.c:469
-#: ../widgets/misc/e-search-bar.c:471
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:477
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../widgets/misc/e-search-bar.c:602
+#: ../widgets/misc/e-search-bar.c:608
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-search-bar.c:608
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:615
 msgid "_Clear"
 msgstr "_Verwerfen"
 
-#: ../widgets/misc/e-search-bar.c:864
+#: ../widgets/misc/e-search-bar.c:870
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: ../widgets/misc/e-search-bar.c:871 ../widgets/text/e-text.c:3567
+#: ../widgets/misc/e-search-bar.c:877 ../widgets/text/e-text.c:3567
 #: ../widgets/text/e-text.c:3568
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1002
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "An_zeigen: "
 
-#. 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:1019
+#: ../widgets/misc/e-search-bar.c:1032
 msgid "Sear_ch: "
 msgstr "S_uchen: "
 
 #. 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:1031
+#: ../widgets/misc/e-search-bar.c:1048
 msgid " i_n "
 msgstr " _in "
 
@@ -22544,19 +22613,19 @@ msgstr "<b>Statusverfolgung</b>"
 msgid "A_uto-delete sent item"
 msgstr "Gesendetes Element a_utomatisch löschen"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "Ein gesendetes _Element erstellen, um Informationen zu verfolgen"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "_Zugestellt und geöffnet"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Allge_meine Optionen"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -22564,7 +22633,7 @@ msgstr ""
 "Nichts\n"
 "Empfangsbestätigung"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -22580,15 +22649,15 @@ msgstr ""
 "Streng geheim\n"
 "Nur für Sie"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "Rüc_kmeldung gewünscht"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusverfolgung"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -22600,30 +22669,35 @@ msgstr ""
 "Normal\n"
 "Niedrig"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Wenn a_ngenommen:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Wenn a_bgeschlossen:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Wenn abge_lehnt:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "B_innen"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "D_anach:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Alle Informationen"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#, fuzzy
+msgid "_Classification:"
+msgstr "E_instufung"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -22666,23 +22740,7 @@ msgstr "%s (zu %d%% abgeschlossen)"
 msgid "Click here to go to URL"
 msgstr "Klicken Sie hier, um zur Adresse zu gehen"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Hauptkategorienliste bearbeiten …"
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Objekt(e) gehören in folgende _Kategorien:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Ver_fügbare Kategorien:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "Kategorien"
-
-#: ../widgets/table/e-cell-combo.c:175
+#: ../widgets/table/e-cell-combo.c:173
 msgid "popup list"
 msgstr "Popup-Liste"
 
@@ -22742,12 +22800,12 @@ msgstr "Nicht sortiert"
 msgid "No grouping"
 msgstr "Nicht gruppieren"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:644
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Felder anzeigen"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:665
 msgid "Available Fields"
 msgstr "Verfügbare Felder"
 
@@ -22829,21 +22887,7 @@ msgstr "Diese Felder der Reihe nach an_zeigen:"
 msgid "_Sort..."
 msgstr "_Sortieren …"
 
-#: ../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:1885
-msgid "DnD code"
-msgstr "Ziehen und Ablegen-Code"
-
-#: ../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:1899
-msgid "Full Header"
-msgstr "Alle Kopfzeilen"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Spalte hinzufügen …"
 
@@ -23008,21 +23052,6 @@ msgstr "_Sortieren nach"
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../widgets/table/e-table-header-item.c:1892
-msgid "Font Description"
-msgstr "Schriftbeschreibung"
-
-#: ../widgets/table/e-table-header-item.c:1913
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Sortierinfos"
-
-#: ../widgets/table/e-table-header-item.c:1927
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Baum"
-
 #: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Tabellenkopf"
@@ -23035,6 +23064,10 @@ msgstr "Tabellenvorlage"
 msgid "Cursor row"
 msgstr "Cursor-Zeile"
 
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Sortierinfos"
+
 #: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3375
 #: ../widgets/table/e-tree.c:3376
 msgid "Always search"
@@ -23044,6 +23077,11 @@ msgstr "Immer suchen"
 msgid "Use click to add"
 msgstr "Klick zum Hinzufügen verwenden"
 
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Baum"
+
 #: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
 msgid "ETree table adapter"
 msgstr "ETree-Tabellenadapter"
@@ -23171,6 +23209,289 @@ msgstr "EM-Kontext"
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "An die Sommer_zeit anpassen"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "V_eröffentlichen-in-Feld"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
+
+#~ msgid "_Subject Field"
+#~ msgstr "_Betreff-Feld"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Betrefffeld anzeigen/verbergen"
+
+#~ msgid "_To Field"
+#~ msgstr "A_n-Feld"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "An-Feld anzeigen/verbergen"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "Nachricht wird abgerufen …"
+
+#~ msgid "C_all To..."
+#~ msgstr "_Anrufen …"
+
+#~ 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 ""
+#~ "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
+#~ "können, indem Sie lediglich zu tippen beginnen. Benutzen Sie dies, damit "
+#~ "Sie Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt "
+#~ "dann sofort zu diesem Ordner."
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Ansicht/Von-Menüeintrag ist aktiv"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Ansicht/Von-Menüeintrag ist aktiv."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
+
+#~ msgid "Case _sensitive"
+#~ msgstr "_Groß-/Kleinschreibung berücksichtigen"
+
+#~ msgid "F_ind:"
+#~ msgstr "S_uchen:"
+
+#~ msgid "Find in Message"
+#~ msgstr "In Nachricht suchen"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Stellt Kernfunktionalität für lokale Adressbücher zur Verfügung."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Sucht nach Begriffen in einer Nachricht, die auf eine Dateianlage "
+#~ "hinweisen und warnt, falls die Anlage fehlt"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Zeigt Audio-Anlagen innerhalb der Nachricht und ermöglicht das direkte "
+#~ "Abspielen in Evolution."
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Ein Plugin zum Sichern und Wiederherstellen von Evolution-Daten und "
+#~ "Einstellungen"
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV-Kalenderquelle"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Stellt Kernfunktionalität für lokale Kalender zur Verfügung."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP-Kalender"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr ""
+#~ "Stellt Kernfunktionalität für Webcal- und HTTP-Kalender zur Verfügung."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Stellt Kernfunktionalität für Wetterkalender zur Verfügung."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Ein Test-Plugin, welches ein Kontextmenü-Plugin demonstriert, mit dem "
+#~ "Dinge in die Zwischenablage kopiert werden können."
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Stellt Funktionalität zum Markieren von Kalendern und Adressbüchern als "
+#~ "Vorgabe zur Verfügung."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "_Namen des Postfachs angeben"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "Ein Plugin, das eine Reihe von Exchange-spezifischen Abläufen und "
+#~ "Funktionen bereitstellt."
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Erlaubt das Abbestellen von Ordnern über das Kontextmenü der Seitenleiste."
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Ein Plugin zum Einrichten von Google-Kalendern und -Kontakten."
+
+#~ msgid "Google sources"
+#~ msgstr "Google-Quellen"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr ""
+#~ "Ein Plugin zum Einrichten von Groupwise-Kalendern und -Kontaktquellen."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Ein Plugin zum Einrichten von Hula-Kalenderquellen."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Hula-Kontoeinrichtung"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Ein Plugin für die Funktionen von IMAP-Konten."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "Die ausgewählten Aufgaben, Notizen, Kalender oder Adressbücher mit dem "
+#~ "Apple iPod abgleichen"
+
+#~ msgid "_Tasks :"
+#~ msgstr "Auf_gaben:"
+
+#~ msgid "Memos :"
+#~ msgstr "Notizen:"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Erlaubt das Deaktivieren von Konten."
+
+#~ 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 ""
+#~ "Erzeugt eine D-BUS-Nachricht oder benachrichtigt den Benutzer mit einem "
+#~ "Symbol im Benachrichtigungsfeld und einer Nachricht, wenn eine neue "
+#~ "Nachricht eingetroffen ist."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Ein Plugin zur Erstellung von Aufgaben aus den Inhalten einer E-Mail."
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Markieren aller Nachrichten unterhalb eines Ordners als gelesen"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Ein Plugin zur Einbindung von Mono-Plugins."
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Ein Plugin zur Verwaltung der Plugin-Aktivierungszustände."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Ein Test-Plugin zur Demonstration eines Formatierungs-Plugins, das eine "
+#~ "Wahlmöglichkeit zur Deaktivierung von HTML-Nachrichten bietet.\n"
+#~ "\n"
+#~ "Dieses Plugin dient nur zu Demonstrationszwecken und wird nicht "
+#~ "unterstützt.\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Schreibt ein Protokoll über Datenereignisse."
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (eingebaut)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "Filtert unerwünschte Nachrichten unter Verwendung von SpamAssassin. "
+#~ "Dieses Plugin erfordert, dass SpamAssassin installiert ist."
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr ""
+#~ "Bereitstellung einer Option zum Zurückfallen auf betreffsbezogenes "
+#~ "Threading der Nachrichten."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Ein Plugin, welches ytnef benutzt, um tnef-Anlagen zu dekodieren."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "Ein Plugin zum Einrichten von WebDAV-Kontakten."
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Neue Nachrich_t an Ordner verfassen"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Eine _Antwort veröffentlichen"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Eine Nachricht an einen öffentlichen Ordner verfassen"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr ""
+#~ "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
+
+#~ msgid "File name:"
+#~ msgstr "Dateiname:"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME-Typ:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Automatische Anzeige der Anlage vorschlagen"
+
+#~ msgid "Current Message"
+#~ msgstr "Derzeitige Nachricht"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Hauptkategorienliste bearbeiten …"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Objekt(e) gehören in folgende _Kategorien:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "Ver_fügbare Kategorien:"
+
+#~ msgid "categories"
+#~ msgstr "Kategorien"
+
+#~ msgid "DnD code"
+#~ msgstr "Ziehen und Ablegen-Code"
+
+#~ msgid "Full Header"
+#~ msgstr "Alle Kopfzeilen"
+
+#~ msgid "Font Description"
+#~ msgstr "Schriftbeschreibung"
+
 #~ msgid "Toggle Attachment Bar"
 #~ msgstr "Anlagenleiste ein-/ausblenden"
 
@@ -24217,9 +24538,6 @@ msgstr "Handle-Popup"
 #~ msgid "year(s)"
 #~ msgstr "Jahr(e)"
 
-#~ msgid "Select folder to save selected attachments..."
-#~ msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
-
 #~ msgid "_Save Selected"
 #~ msgstr "Auswahl _speichern"
 
@@ -24315,13 +24633,6 @@ msgstr "Handle-Popup"
 #~ msgid "None Selected"
 #~ msgstr "Keiner gewählt"
 
-#~ msgid ""
-#~ "A plugin for using an external editor as the composer. You can send only "
-#~ "plain-text messages."
-#~ msgstr ""
-#~ "Ein Plugin zur Nutzung eines externen Editors als Nachrichten-Editor. Es "
-#~ "können lediglich Nur-Text-Nachrichten verschickt werden."
-
 #~ msgid "Compose messages using an external editor"
 #~ msgstr "E-Mails mit einem externen Editor verfassen"
 
diff --git a/po/es.po b/po/es.po
index d512d53332..487baaec03 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-06-03 14:16+0000\n"
-"PO-Revision-Date: 2009-06-03 20:13+0200\n"
+"POT-Creation-Date: 2009-06-19 16:29+0000\n"
+"PO-Revision-Date: 2009-06-28 18:56+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -573,7 +573,7 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:592
+#: ../addressbook/conduit/address-conduit.c:591
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
 
@@ -804,7 +804,7 @@ msgstr ""
 #: ../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:95
-#: ../plugins/itip-formatter/itip-formatter.c:2545
+#: ../plugins/itip-formatter/itip-formatter.c:2565
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
@@ -932,7 +932,7 @@ msgstr "Guardar como vCard…"
 #: ../addressbook/gui/component/addressbook-view.c:951
 #: ../calendar/gui/calendar-component.c:629
 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2105 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
@@ -942,7 +942,7 @@ msgstr "_Renombrar…"
 #: ../calendar/gui/e-calendar-table.c:1614
 #: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952
 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2102 ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-tree.c:2103 ../mail/em-folder-view.c:1341
 #: ../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
@@ -952,7 +952,7 @@ msgstr "_Borrar"
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:637
 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2111 ../ui/evolution-addressbook.xml.h:59
+#: ../mail/em-folder-tree.c:2112 ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
@@ -978,7 +978,7 @@ msgstr "Introduzca la contraseña para %s (usuario %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
+#: ../plugins/google-account-setup/google-source.c:417
 #: ../plugins/publish-calendar/publish-calendar.c:208
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1239,9 +1239,9 @@ msgstr "tarjetas"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-http/calendar-http.c:278
+#: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-source.c:672
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minutos"
@@ -1925,7 +1925,7 @@ msgstr "Cor_tar"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/e-calendar-table.c:1600
 #: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943
-#: ../mail/em-folder-tree.c:972 ../mail/em-folder-view.c:1326
+#: ../mail/em-folder-tree.c:973 ../mail/em-folder-view.c:1326
 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
@@ -2309,7 +2309,7 @@ msgstr "Charla por vídeo"
 #: ../addressbook/gui/widgets/eab-contact-display.c:629
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2523
+#: ../calendar/gui/gnome-cal.c:2535
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3240,28 +3240,28 @@ msgstr "{0}."
 msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de días múltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
 #: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/memo/memo-conduit.c:809
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
 #: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/memo/memo-conduit.c:811
 #: ../calendar/conduits/todo/todo-conduit.c:1009
+#: ../calendar/conduits/todo/todo-conduit.c:1010
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1622
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "No es posible leer información de la aplicación de calendario del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:903
-#: ../calendar/conduits/memo/memo-conduit.c:906
+#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:907
 msgid "Could not read pilot's Memo application block"
 msgstr "No es posible leer los datos de la aplicación Memo del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:950
-#: ../calendar/conduits/memo/memo-conduit.c:953
+#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:954
 msgid "Could not write pilot's Memo application block"
 msgstr "No es posible escribir los datos de la aplicación Memo del Pilot"
 
@@ -3269,18 +3269,18 @@ msgstr "No es posible escribir los datos de la aplicación Memo del Pilot"
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1092
-#: ../calendar/conduits/todo/todo-conduit.c:1095
+#: ../calendar/conduits/todo/todo-conduit.c:1093
+#: ../calendar/conduits/todo/todo-conduit.c:1096
 msgid "Could not read pilot's ToDo application block"
 msgstr "No es posible leer los datos de la aplicación ToDo del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1137
-#: ../calendar/conduits/todo/todo-conduit.c:1140
+#: ../calendar/conduits/todo/todo-conduit.c:1138
+#: ../calendar/conduits/todo/todo-conduit.c:1141
 msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2536
+#: ../plugins/itip-formatter/itip-formatter.c:2556
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -3328,7 +3328,7 @@ msgstr "_Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566
+#: ../calendar/gui/gnome-cal.c:1830 ../calendar/gui/memos-component.c:566
 #: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389
 #: ../calendar/gui/memos-control.c:405
 msgid "Memos"
@@ -3336,7 +3336,7 @@ msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991
+#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/print.c:1991
 #: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880
 #: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
 #: ../calendar/importers/icalendar-importer.c:76
@@ -3373,9 +3373,9 @@ msgstr[1] "minutos"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:22
 #: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-source.c:673
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
@@ -4144,9 +4144,9 @@ msgstr "Purgar acontecimientos anteriores a"
 
 #: ../calendar/gui/calendar-commands.c:326
 #: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-source.c:674
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -4177,7 +4177,7 @@ msgstr "Calendario _nuevo"
 
 #: ../calendar/gui/calendar-component.c:628
 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2098
 msgid "_Copy..."
 msgstr "_Copiar…"
 
@@ -4560,13 +4560,13 @@ msgstr "Adjuntar archivo(s)"
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-day-view-time-item.c:789
 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:704 ../mail/em-account-editor.c:1433
+#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434
 #: ../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:395
 #: ../plugins/exchange-operations/exchange-delegates-user.c:181
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../plugins/itip-formatter/itip-formatter.c:2212
 #: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510
 #: ../widgets/misc/e-dateedit.c:1726
 #: ../widgets/misc/e-signature-combo-box.c:74
@@ -5082,7 +5082,7 @@ msgstr "_Insertar"
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2089
+#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2090
 #: ../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
@@ -5524,7 +5524,7 @@ msgstr "No es posible abrir las notas en «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
 #: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:925
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Para"
@@ -6139,8 +6139,8 @@ msgstr "No"
 #: ../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:985
 #: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:448
-#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2237
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
@@ -6435,7 +6435,7 @@ msgstr "Borrar tod_as las repeticiones"
 #: ../calendar/gui/e-itip-control.c:1184
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2205
+#: ../plugins/itip-formatter/itip-formatter.c:2225
 msgid "Accepted"
 msgstr "Aceptado"
 
@@ -6443,7 +6443,7 @@ msgstr "Aceptado"
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2211
+#: ../plugins/itip-formatter/itip-formatter.c:2231
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -6457,7 +6457,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-calendar-view.c:2294
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2214
+#: ../plugins/itip-formatter/itip-formatter.c:2234
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -6649,7 +6649,7 @@ msgstr ""
 "abajo."
 
 #: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../plugins/itip-formatter/itip-formatter.c:2228
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -6872,7 +6872,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1387
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
@@ -7210,39 +7210,39 @@ msgstr "Seleccione la zona horaria"
 msgid "%d %B"
 msgstr "%e de %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2660
 msgid "_Custom View"
 msgstr "Vista _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2661
 msgid "_Save Custom View"
 msgstr "_Guardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2666
 msgid "_Define Views..."
 msgstr "_Definir vistas…"
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2903
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2918
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2927
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3039
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4007
 msgid "Purging"
 msgstr "Compactando"
 
@@ -7699,27 +7699,27 @@ msgstr "Participantes: "
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2594
+#: ../calendar/gui/print.c:2592
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2609
+#: ../calendar/gui/print.c:2607
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2621
+#: ../calendar/gui/print.c:2619
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2634
+#: ../calendar/gui/print.c:2632
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/print.c:2643
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -7839,7 +7839,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -9479,7 +9479,7 @@ msgstr "Guardar como _borrador"
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "_Enviar"
 
@@ -9591,6 +9591,17 @@ msgstr "Conmutador que indica si se muestra el campo «Responder-a»"
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
+# #En conflicto con _Mensaje
+#: ../composer/e-composer-header.c:117
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../composer/e-composer-header.c:120
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "Ocultar"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
@@ -9663,14 +9674,10 @@ msgstr "Elija las carpetas en las que publicar el mensaje."
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 
-#: ../composer/e-composer-private.c:169
+#: ../composer/e-composer-private.c:203
 msgid "Save draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-composer-private.c:186
-msgid "Add attachment"
-msgstr "Añadir adjunto"
-
 #: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -10079,120 +10086,120 @@ msgstr "Error de GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "En adelante todos los errores sólo se mostrarán en el terminal."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "dentro de un segundo"
 msgstr[1] "dentro de %d segundos"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "dentro de un minuto"
 msgstr[1] "dentro de %d minutos"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %d horas"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "dentro de una hora"
 msgstr[1] "dentro de %d horas"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace un día"
 msgstr[1] "hace %d días"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "dentro de un día"
 msgstr[1] "dentro de %d días"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace una semana"
 msgstr[1] "hace %d semanas"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "dentro de una semana"
 msgstr[1] "dentro de %d semanas"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace un mes"
 msgstr[1] "hace %d meses"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "dentro de un mes"
 msgstr[1] "dentro de %d meses"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace un año"
 msgstr[1] "hace %d años"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de un años"
 msgstr[1] "dentro de %d años"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<pulse aquí para seleccionar una fecha>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%e/%b/%Y"
 
 # Aquí time se refiere a fecha
-#: ../filter/filter-datespec.c:442
+#: ../filter/filter-datespec.c:448
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
@@ -10481,19 +10488,19 @@ msgid "%d attached messages"
 msgstr "%d mensajes adjuntos"
 
 #: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "Icon View"
 msgstr "Vista de icono"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:602
 msgid "List View"
 msgstr "Vista de lista"
 
@@ -10544,30 +10551,30 @@ msgstr "Se llegó al principio de la página, continuando desde el final"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:307
+#: ../mail/em-account-editor.c:308
 msgid "No encryption"
 msgstr "Sin cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:311
+#: ../mail/em-account-editor.c:312
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:315
+#: ../mail/em-account-editor.c:316
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:406
+#: ../mail/em-account-editor.c:407
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:413
+#: ../mail/em-account-editor.c:414
 #, c-format
 msgid ""
 "\n"
@@ -10580,25 +10587,25 @@ msgstr ""
 "para %s mostrado abajo\n"
 "y marque la casilla para aceptarlo.\n"
 
-#: ../mail/em-account-editor.c:485 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-account-editor.c:609 ../mail/em-account-editor.c:654
-#: ../mail/em-account-editor.c:721 ../widgets/misc/e-signature-combo-box.c:102
+#: ../mail/em-account-editor.c:610 ../mail/em-account-editor.c:655
+#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: ../mail/em-account-editor.c:779
+#: ../mail/em-account-editor.c:780
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:780
+#: ../mail/em-account-editor.c:781
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:781
+#: ../mail/em-account-editor.c:782
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
@@ -10642,11 +10649,11 @@ msgstr "Opciones de recepción"
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -10680,7 +10687,7 @@ msgstr "Añadir un script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
@@ -10966,7 +10973,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
 #: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -11061,8 +11068,8 @@ msgid "Quota usage"
 msgstr "Uso de cuota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:520
-#: ../mail/em-folder-tree.c:2586 ../mail/mail-component.c:168
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:522
+#: ../mail/em-folder-tree.c:2587 ../mail/mail-component.c:168
 #: ../mail/mail-component.c:589
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:597
@@ -11101,20 +11108,20 @@ msgstr "NO COINCIDENTE"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/em-folder-tree-model.c:517 ../mail/mail-component.c:172
+#: ../mail/em-folder-tree-model.c:518 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../mail/em-folder-tree-model.c:523 ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:171
+#: ../mail/em-folder-tree-model.c:527 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Correo enviado"
 
-#: ../mail/em-folder-tree-model.c:560 ../mail/em-folder-tree-model.c:870
+#: ../mail/em-folder-tree-model.c:585 ../mail/em-folder-tree-model.c:895
 msgid "Loading..."
 msgstr "Cargando…"
 
@@ -11139,82 +11146,82 @@ msgctxt "folder-display"
 msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:708
+#: ../mail/em-folder-tree.c:709
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:867
+#: ../mail/em-folder-tree.c:868
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:869
+#: ../mail/em-folder-tree.c:870
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:877 ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:879 ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:894
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100
+#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:973 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-utils.c:362
 #: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/em-folder-tree.c:975 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:976 ../mail/message-list.c:2108
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../mail/em-folder-tree.c:1685 ../mail/mail-ops.c:1065
+#: ../mail/em-folder-tree.c:1686 ../mail/mail-ops.c:1065
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2091
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2096
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2098
+#: ../mail/em-folder-tree.c:2099
 msgid "_Move..."
 msgstr "_Mover…"
 
-#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Actuali_zar"
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2108
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../mail/em-folder-tree.c:2113 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2114 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../mail/em-folder-tree.c:2216
+#: ../mail/em-folder-tree.c:2217
 msgid "_Unread Search Folder"
 msgstr "Carpeta de búsqueda de _no leídos"
 
@@ -11369,9 +11376,9 @@ msgstr "Filtro según la lista de _correo"
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
 #: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
+#: ../plugins/google-account-setup/google-source.c:223
+#: ../plugins/google-account-setup/google-source.c:508
+#: ../plugins/google-account-setup/google-source.c:719
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -11627,19 +11634,19 @@ msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
 #: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
 #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
+#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
+#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr "Transporte"
@@ -11662,13 +11669,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:924
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder a"
@@ -13654,7 +13661,7 @@ msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
 #: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:632
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
 msgid "User_name:"
@@ -14021,7 +14028,7 @@ msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2098
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14030,11 +14037,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2170
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2188 ../mail/mail-ops.c:2196
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14043,27 +14050,27 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2211
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2451
+#: ../mail/mail-ops.c:2453
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
-#: ../mail/mail-ops.c:2537
+#: ../mail/mail-ops.c:2539
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -14240,16 +14247,16 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"¿Seguro que quiere eliminar todos los mensajes borrados en todas las "
-"carpetas?"
+"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"todas las carpetas?"
 
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"¿Seguro que quiere eliminar permanentemente todos los mensajes en la carpeta "
-"«{0}»?"
+"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"la carpeta «{0}»?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14967,7 +14974,6 @@ msgid "Subject contains"
 msgstr "El asunto contiene"
 
 #: ../mail/searchtypes.xml.h:6
-#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
@@ -15376,29 +15382,29 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-source.c:606
+#: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/google-account-setup/google-source.c:649
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
 #: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-source.c:675
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "semanas"
@@ -15419,11 +15425,11 @@ msgstr "Añadir calendarios locales a Evolution."
 msgid "Local Calendars"
 msgstr "Calendarios locales"
 
-#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Securizar conexión"
 
-#: ../plugins/calendar-http/calendar-http.c:389
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "Nombre de _usuario:"
 
@@ -16505,7 +16511,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Error desconocido al buscar {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
@@ -16719,14 +16725,14 @@ msgstr "Des_uscribir"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:416
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduzca la contraseña para que el usuario %s acceda a la lista de "
 "calendarios suscritos."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16735,11 +16741,11 @@ msgstr ""
 "No se pueden leer los datos del servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:694
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:709
+#: ../plugins/google-account-setup/google-source.c:729
 msgid "Retrieve _list"
 msgstr "Obtener _lista"
 
@@ -16875,12 +16881,75 @@ msgstr "Falló al retractar el mensaje"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "El servidor no permitió que se retractase el mensaje seleccionado."
 
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "¿Quiere reenviar la reunión?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "¿Quiere reenviar la reunión repetitiva?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to retract the original item ?"
+msgstr "¿Quiere retractar el elemento original?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "El original se quitará del buzón de entrada del destinatario."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+msgid "This is a recurring meeting"
+msgstr "Esta es una cita repetitiva"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+"Esto creará un mensaje nuevo usando los detalles existentes de la reunión."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"Esto creará una nueva reunión con los detalles existentes de la reunión. Se "
+"debe introducir la regla de repetición."
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+msgid "Would you like to accept it?"
+msgstr "¿Quiere aceptarlo?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+msgid "Would you like to decline it?"
+msgstr "¿Quiere rechazarlo?"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "La cuenta &quot;{0}&quot; ya existe. Compruebe su árbol de carpetas."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "La cuenta ya existe"
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Usuario no válido"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"El inicio de sesion como &quot;{0}&quot; en el proxy ha fallado. Compruebe "
+"su dirección de correo-e e inténtelo de nuevo."
+
 #. 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.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
@@ -16903,22 +16972,6 @@ msgstr ""
 "Tiene que especificar un nombre de usuario válido para concederle permisos "
 "en el proxy."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "La cuenta &quot;{0}&quot; ya existe. Compruebe su árbol de carpetas."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "La cuenta ya existe"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"El inicio de sesion como &quot;{0}&quot; en el proxy ha fallado. Compruebe "
-"su dirección de correo-e e inténtelo de nuevo."
-
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr ""
@@ -17215,7 +17268,7 @@ msgstr "Características IMAP"
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "La capa de abstracción de hardware (HAL) no está cargada"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -17224,11 +17277,11 @@ msgstr ""
 "el servicio y vuelva a este programa o contacte con el administrador de su "
 "sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
 msgid "Search for an iPod failed"
 msgstr "Falló la búsqueda de un iPod"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
 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."
@@ -17253,134 +17306,134 @@ msgstr "Sincronizar sus datos con su iPod de Apple."
 msgid "iPod Synchronization"
 msgstr "Sincronización con iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:484
+#: ../plugins/itip-formatter/itip-formatter.c:609
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No es posible cargar el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:629
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:665
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:755
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:762
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:766
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:770
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:841
 msgid "Opening the calendar. Please wait.."
 msgstr "Abriendo el calendario. Espere..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:844
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1026
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1113
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1125
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1129
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1134
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1139
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1233
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1242
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1350
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1427
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1499
+#: ../plugins/itip-formatter/itip-formatter.c:1510
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1500
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17388,15 +17441,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1551
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1550
-#: ../plugins/itip-formatter/itip-formatter.c:1578
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17404,11 +17457,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1591
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1590
+#: ../plugins/itip-formatter/itip-formatter.c:1592
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17416,31 +17469,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2561
+#: ../plugins/itip-formatter/itip-formatter.c:2581
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2571
-#: ../plugins/itip-formatter/itip-formatter.c:2604
+#: ../plugins/itip-formatter/itip-formatter.c:2591
+#: ../plugins/itip-formatter/itip-formatter.c:2624
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2586
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -21838,49 +21891,49 @@ msgid "Attached message"
 msgstr "Mensaje adjunto"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
 #: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1867
+#: ../widgets/misc/e-attachment.c:1871
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1870
+#: ../widgets/misc/e-attachment.c:1874
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2147
+#: ../widgets/misc/e-attachment.c:2138
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2150
+#: ../widgets/misc/e-attachment.c:2141
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2588
+#: ../widgets/misc/e-attachment.c:2583
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2665
+#: ../widgets/misc/e-attachment.c:2660
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2668
+#: ../widgets/misc/e-attachment.c:2663
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
@@ -21925,12 +21978,12 @@ msgstr "Cargando"
 msgid "Saving"
 msgstr "Guardando"
 
-#: ../widgets/misc/e-attachment-paned.c:80
+#: ../widgets/misc/e-attachment-paned.c:81
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
@@ -21956,12 +22009,12 @@ msgstr "Guardar _todo"
 msgid "A_dd Attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:649
+#: ../widgets/misc/e-attachment-view.c:646
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
@@ -22193,27 +22246,27 @@ msgstr "_Búsquedas"
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Guardar búsqueda…"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Editar búsquedas guardadas…"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "Búsqueda _avanzada…"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -22955,6 +23008,9 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Add attachment"
+#~ msgstr "Añadir adjunto"
+
 # #En conflicto con _Mensaje
 #~ msgid "Show CC"
 #~ msgstr "Mostrar Cc"
@@ -23051,15 +23107,6 @@ msgstr "Tirador emergente"
 #~ "Un complemento para configurar fuentes de calendarios y contactos para "
 #~ "GroupWise."
 
-#~ msgid "This is a recurring meeting"
-#~ msgstr "Esta es una cita repetitiva"
-
-#~ msgid "Would you like to accept it?"
-#~ msgstr "¿Quiere aceptarlo?"
-
-#~ msgid "Would you like to decline it?"
-#~ msgstr "¿Quiere rechazarlo?"
-
 #~ msgid "A plugin to setup hula calendar sources."
 #~ msgstr "Un complemento para configurar fuentes de calendarios hula."
 
diff --git a/po/et.po b/po/et.po
index b7b54a9b9a..e1ea0a7cbe 100644
--- a/po/et.po
+++ b/po/et.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-03-09 04:41+0000\n"
-"PO-Revision-Date: 2009-05-09 10:11+0300\n"
+"POT-Creation-Date: 2009-06-24 14:19+0000\n"
+"PO-Revision-Date: 2009-06-25 17:49+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -244,12 +244,6 @@ msgstr "Aktiveeri vaikimisi"
 msgid "Popup Menu"
 msgstr "Hüpikmenüü"
 
-msgid "Toggle Attachment Bar"
-msgstr "Manuseriba sisse- ja väljalülitamine"
-
-msgid "activate"
-msgstr "aktiveerimine"
-
 #. For Translators: {0} is the name of the address book source
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
@@ -292,10 +286,15 @@ msgstr "LDAP-serveri skeemiinfot pole võimalik hankida."
 msgid "Could not remove address book."
 msgstr "Aadressiraamatut pole võimalik eemaldada."
 
+#, 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."
 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."
+"Currently you can only access the 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 ""
 "Käesolevaga on sul Evolutioniga võimalik ligi pääseda ainult GroupWise "
 "süsteemsetele aadressiraamatutele (GroupWise System Address Book). GroupWise "
@@ -440,7 +439,7 @@ msgid "Could not load address book"
 msgstr "Aadressiraamatut pole võimalik laadida"
 
 msgid "Could not read pilot's Address application block"
-msgstr "Pilot'i aadressirakenduse blokki pole võimalik lugeda"
+msgstr "Piloti aadressirakenduse blokki pole võimalik lugeda"
 
 msgid "Autocompletion"
 msgstr "Automaatlõpetus"
@@ -454,7 +453,6 @@ msgstr "Sertifikaadid"
 msgid "Configure autocomplete here"
 msgstr "Seadista automaatlõpetamist siit"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 msgid "Contacts"
 msgstr "Kontaktid"
@@ -483,18 +481,15 @@ msgstr "Evolutioni kaustaseadistuste juhtimine"
 msgid "Manage your S/MIME certificates here"
 msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
-#. 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
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
 
+#. Create the LDAP source group
+msgid "On LDAP Servers"
+msgstr "LDAP-serveris"
+
 #. 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
@@ -509,11 +504,6 @@ msgstr "Kohalikus arvutis"
 msgid "Personal"
 msgstr "Isiklik"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-msgid "On LDAP Servers"
-msgstr "LDAP-serveris"
-
 msgctxt "New"
 msgid "_Contact"
 msgstr "K_ontakt"
@@ -541,6 +531,28 @@ msgstr "Uue aadressiraamatu loomine"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Tõrge aadressiraamatu seadistuste või kataloogide uuendamisel."
 
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
+"kui LDAP-server toetab SSL-i."
+
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
+"kui LDAP-server toetab TLS-i."
+
+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 ""
+"See valik tähendab, et sinu server ei toeta SSL-i ega TLS-i. Seega pole sinu "
+"ühendus turvaline ja võib-olla ohustatud turvaaukudest."
+
 msgid "Base"
 msgstr "Baas"
 
@@ -550,6 +562,35 @@ msgstr "L_iik:"
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
+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 ""
+"See on LDAP-serveri port, kuhu Evolution üritab ühendust luua. Nimekiri "
+"standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
+"peaksid määrama."
+
+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 ""
+"Siin määrataks meetod, mille abil Evolution tõendab serverile kasutajat.  "
+"Väärtuse \"E-posti aadress\" korral peab valitud LDAP-server toetama "
+"anonüümset ligipääsu."
+
+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 ""
+"Otsingu ulatus määrab kui sügaval kataloogides peab otsingut läbi viima. "
+"\"Kogu alampuu\" kaasab otsingusse kõik kirjed, mis jäävad otsingupõhjast "
+"allapoole. \"Üks tase alla\" kaasab otsingusse kirjed, mis jäävad "
+"otsingupõhjast ühe taseme võrra allapoole."
+
 msgid "General"
 msgstr "Üldine"
 
@@ -721,18 +762,15 @@ msgstr "Otsitavad aadressiraamatud"
 msgid "1"
 msgstr "1"
 
-msgid "3268"
-msgstr "3268"
-
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
 
 msgid "5"
 msgstr "5"
 
-msgid "636"
-msgstr "636"
-
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
@@ -742,58 +780,38 @@ msgstr "<b>Allalaadimine</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-msgid "<b>Type:</b>"
-msgstr "<b>Liik:</b>"
-
-msgid "Add Address Book"
-msgstr "Lisa aadressiraamat"
-
-msgid "Always"
-msgstr "Alati"
-
-msgid "Anonymously"
-msgstr "Anonüümselt"
+#, fuzzy
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr "Eraldusnime (DN) kasutamine"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
 msgid "B_rowse this book until limit reached"
 msgstr ""
 
-msgid "Basic"
-msgstr "Peamine"
-
-msgid "Distinguished name"
-msgstr "Eraldusnimi"
-
-msgid "Email address"
-msgstr "E-posti aadress:"
-
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
-msgid "Find Possible Search Bases"
-msgstr "Leia võimalikud otsingupõhjad"
-
 msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
-msgid "Never"
-msgstr "Mitte kunagi"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-msgid "No encryption"
-msgstr "Krüptimine puudub"
-
-msgid "One"
+#, fuzzy
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
 msgstr "Üks tase alla (One)"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-msgid "SSL encryption"
-msgstr "SSL krüptimine"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
 
 msgid "Search Filter"
 msgstr "Otsingufilter"
@@ -804,51 +822,21 @@ msgstr "_Otsingupõhi:"
 msgid "Search _filter:"
 msgstr "Otsingu_filter:"
 
-msgid "Search filter"
-msgstr "Otsingufilter"
-
+#, fuzzy
+#| 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\"."
 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\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "Otsingufiltris määratakse otsitavate objektide liik. Kui seda ei ole "
 "muudetud, siis otsitakse vaikimisi objektiklassi liigiga \"person\" (isik)."
 
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
-"kui LDAP-server toetab SSL-i."
-
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
-"kui LDAP-server toetab TLS-i."
-
-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 ""
-"See valik tähendab, et sinu server ei toeta SSL-i ega TLS-i. Seega pole sinu "
-"ühendus turvaline ja võib-olla ohustatud turvaaukudest."
-
-msgid "Sub"
-msgstr "Kogu alampuu (Sub)"
-
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingupõhjad"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-msgid "TLS encryption"
-msgstr "TLS krüptimine"
-
 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 "
@@ -858,17 +846,6 @@ msgstr ""
 "siis alustatakse otsingut kataloogipuu kõige ülemisest kataloogist."
 
 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 ""
-"Otsingu ulatus määrab kui sügaval kataloogides peab otsingut läbi viima. "
-"\"Kogu alampuu\" kaasab otsingusse kõik kirjed, mis jäävad otsingupõhjast "
-"allapoole. \"Üks tase alla\" kaasab otsingusse kirjed, mis jäävad "
-"otsingupõhjast ühe taseme võrra allapoole."
-
-msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "See on LDAP-serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
@@ -881,42 +858,12 @@ msgstr ""
 "määramine aeglustab aadressiraamatu tööd."
 
 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 ""
-"Siin määrataks meetod, mille abil Evolution tõendab serverile kasutajat.  "
-"Väärtuse \"E-posti aadress\" korral peab valitud LDAP-server toetama "
-"anonüümset ligipääsu."
-
-msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 "See on serveri nimi kuvamiseks Evolutioni kaustaloendis. Seda kasutatakse "
 "ainult kuvamise eesmärgil."
 
-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 ""
-"See on LDAP-serveri port, kuhu Evolution üritab ühendust luua. Nimekiri "
-"standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
-"peaksid määrama."
-
-msgid "Using distinguished name (DN)"
-msgstr "Eraldusnime (DN) kasutamine"
-
-msgid "Using email address"
-msgstr "E-posti aadressi kasutamine"
-
-msgid "Whenever Possible"
-msgstr "Kui võimalik"
-
-msgid "_Add Address Book"
-msgstr "Lisa _aadressiraamat"
-
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
@@ -977,9 +924,6 @@ msgstr "<b>Võrguaadressid</b>"
 msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
-msgid "AIM"
-msgstr "AIM"
-
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
@@ -995,28 +939,18 @@ msgstr "T_äisnimi..."
 msgid "Image"
 msgstr "Pilt"
 
-msgid "MSN Messenger"
-msgstr "MSN Kiirsuhtlusklient"
-
 msgid "Mailing Address"
 msgstr "Postiaadress"
 
 msgid "Nic_kname:"
 msgstr "H_üüdnimi:"
 
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
 msgid "Telephone"
 msgstr "Telefon"
 
-#. red
-msgid "Work"
-msgstr "Töö"
-
 msgid "_Address:"
 msgstr "Aa_dress:"
 
@@ -1092,767 +1026,39 @@ msgstr "K_us:"
 msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
-msgid "Address"
-msgstr "Aadress"
+msgid "Name"
+msgstr "Nimi"
 
 msgid "Editable"
 msgstr "Redigeeritav"
 
-msgid "United States"
-msgstr "Ühendriigid"
-
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-msgid "Albania"
-msgstr "Albaania"
-
-msgid "Algeria"
-msgstr "Alžeeria"
-
-msgid "American Samoa"
-msgstr "Ameerika Samoa"
-
-msgid "Andorra"
-msgstr "Andorra"
-
-msgid "Angola"
-msgstr "Angoola"
-
-msgid "Anguilla"
-msgstr "Anguilla"
-
-msgid "Antarctica"
-msgstr "Antarktika"
-
-msgid "Antigua And Barbuda"
-msgstr "Antigua ja Barbuda"
-
-msgid "Argentina"
-msgstr "Argentiina"
-
-msgid "Armenia"
-msgstr "Armeenia"
-
-msgid "Aruba"
-msgstr "Aruba"
-
-msgid "Australia"
-msgstr "Austraalia"
-
-msgid "Austria"
-msgstr "Austria"
-
-msgid "Azerbaijan"
-msgstr "Aserbaidžaan"
-
-msgid "Bahamas"
-msgstr "Bahama"
-
-msgid "Bahrain"
-msgstr "Bahrein"
-
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-msgid "Barbados"
-msgstr "Barbados"
-
-msgid "Belarus"
-msgstr "Valgevene"
-
-msgid "Belgium"
-msgstr "Belgia"
-
-msgid "Belize"
-msgstr "Belize"
-
-msgid "Benin"
-msgstr "Benin"
-
-msgid "Bermuda"
-msgstr "Bermuda"
-
-msgid "Bhutan"
-msgstr "Bhutan"
-
-msgid "Bolivia"
-msgstr "Boliivia"
-
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia ja Hertsegoviina"
-
-msgid "Botswana"
-msgstr "Botswana"
-
-msgid "Bouvet Island"
-msgstr "Bouvet' saar"
-
-msgid "Brazil"
-msgstr "Brasiilia"
-
-msgid "British Indian Ocean Territory"
-msgstr "Briti India ookeani territoorium"
-
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-msgid "Bulgaria"
-msgstr "Bulgaaria"
-
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-msgid "Burundi"
-msgstr "Burundi"
-
-msgid "Cambodia"
-msgstr "Kambodža"
-
-msgid "Cameroon"
-msgstr "Kamerun"
-
-msgid "Canada"
-msgstr "Kanada"
-
-msgid "Cape Verde"
-msgstr "Roheneemesaared"
-
-msgid "Cayman Islands"
-msgstr "Kaimani saared"
-
-msgid "Central African Republic"
-msgstr "Kesk-Aafrika Vabariik"
-
-msgid "Chad"
-msgstr "Tšaad"
-
-msgid "Chile"
-msgstr "Tšiili"
-
-msgid "China"
-msgstr "Hiina"
-
-msgid "Christmas Island"
-msgstr "Jõulusaar"
-
-msgid "Cocos (Keeling) Islands"
-msgstr "Kookossaared (Keelingi saared)"
-
-msgid "Colombia"
-msgstr "Kolumbia"
-
-msgid "Comoros"
-msgstr "Komoorid"
-
-msgid "Congo"
-msgstr "Kongo"
-
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congo, Demokraatlik vabariik"
-
-msgid "Cook Islands"
-msgstr "Cooki saared"
-
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-msgid "Cote d'Ivoire"
-msgstr "Elevandiluurannik"
-
-msgid "Croatia"
-msgstr "Horvaatia"
-
-msgid "Cuba"
-msgstr "Kuuba"
-
-msgid "Cyprus"
-msgstr "Küpros"
-
-msgid "Czech Republic"
-msgstr "Tšehhi"
-
-msgid "Denmark"
-msgstr "Taani"
-
-msgid "Djibouti"
-msgstr "Djibouti"
-
-msgid "Dominica"
-msgstr "Dominica"
-
-msgid "Dominican Republic"
-msgstr "Dominikaani vabariik"
-
-msgid "Ecuador"
-msgstr "Ecuador"
-
-msgid "Egypt"
-msgstr "Egiptus"
-
-msgid "El Salvador"
-msgstr "El Salvador"
-
-msgid "Equatorial Guinea"
-msgstr "Ekvatoriaal-Guinea"
-
-msgid "Eritrea"
-msgstr "Eritrea"
-
-msgid "Estonia"
-msgstr "Eesti"
-
-msgid "Ethiopia"
-msgstr "Etioopia"
-
-msgid "Falkland Islands"
-msgstr "Falklandi saared"
-
-msgid "Faroe Islands"
-msgstr "Fääri saared"
-
-msgid "Fiji"
-msgstr "Fidži"
-
-msgid "Finland"
-msgstr "Soome"
-
-msgid "France"
-msgstr "Prantsusmaa"
-
-msgid "French Guiana"
-msgstr "Prantsuse Guajaana"
-
-msgid "French Polynesia"
-msgstr "Prantsuse Polüneesia"
-
-msgid "French Southern Territories"
-msgstr "Prantsuse Lõunaalad"
-
-msgid "Gabon"
-msgstr "Gabon"
-
-msgid "Gambia"
-msgstr "Gambia"
-
-msgid "Georgia"
-msgstr "Gruusia"
-
-msgid "Germany"
-msgstr "Saksamaa"
-
-msgid "Ghana"
-msgstr "Ghana"
-
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-msgid "Greece"
-msgstr "Kreeka"
-
-msgid "Greenland"
-msgstr "Gröönimaa"
-
-msgid "Grenada"
-msgstr "Grenada"
-
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-msgid "Guam"
-msgstr "Guam"
-
-msgid "Guatemala"
-msgstr "Guatemala"
-
-msgid "Guernsey"
-msgstr "Guernsey"
-
-msgid "Guinea"
-msgstr "Guinea"
-
-msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
-
-msgid "Guyana"
-msgstr "Guyana"
-
-msgid "Haiti"
-msgstr "Haiti"
-
-msgid "Heard And McDonald Islands"
-msgstr "Heardi ja McDonaldi saared"
-
-msgid "Holy See"
-msgstr "Vatikan"
-
-msgid "Honduras"
-msgstr "Honduras"
-
-msgid "Hong Kong"
-msgstr "Hong-Kong"
-
-msgid "Hungary"
-msgstr "Ungari"
-
-msgid "Iceland"
-msgstr "Island"
-
-msgid "India"
-msgstr "India"
-
-msgid "Indonesia"
-msgstr "Indoneesia"
-
-msgid "Iran"
-msgstr "Iraan"
-
-msgid "Iraq"
-msgstr "Iraak"
-
-msgid "Ireland"
-msgstr "Iirimaa"
-
-msgid "Isle of Man"
-msgstr "Mani saar"
-
-msgid "Israel"
-msgstr "Iisrael"
-
-msgid "Italy"
-msgstr "Itaalia"
-
-msgid "Jamaica"
-msgstr "Jamaica"
-
-msgid "Japan"
-msgstr "Jaapan"
-
-msgid "Jersey"
-msgstr "Jersey"
-
-msgid "Jordan"
-msgstr "Jordaania"
-
-msgid "Kazakhstan"
-msgstr "Kasahstan"
-
-msgid "Kenya"
-msgstr "Keenia"
-
-msgid "Kiribati"
-msgstr "Kiribati"
-
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Korea Demokraatlik Rahvavabariik"
-
-msgid "Korea, Republic Of"
-msgstr "Korea Vabariik"
-
-msgid "Kuwait"
-msgstr "Kuveit"
-
-msgid "Kyrgyzstan"
-msgstr "Kõrgõzstan"
-
-msgid "Laos"
-msgstr "Laos"
-
-msgid "Latvia"
-msgstr "Läti"
-
-msgid "Lebanon"
-msgstr "Liibanon"
-
-msgid "Lesotho"
-msgstr "Lesotho"
-
-msgid "Liberia"
-msgstr "Libeeria"
-
-msgid "Libya"
-msgstr "Liibüa"
-
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-msgid "Lithuania"
-msgstr "Leedu"
-
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-msgid "Macao"
-msgstr "Macao"
-
-msgid "Macedonia"
-msgstr "Makedoonia"
-
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-msgid "Malawi"
-msgstr "Malawi"
-
-msgid "Malaysia"
-msgstr "Malaisia"
-
-msgid "Maldives"
-msgstr "Malediivid"
-
-msgid "Mali"
-msgstr "Mali"
-
-msgid "Malta"
-msgstr "Malta"
-
-msgid "Marshall Islands"
-msgstr "Marshalli saared"
-
-msgid "Martinique"
-msgstr "Martinique"
-
-msgid "Mauritania"
-msgstr "Mauritaania"
-
-msgid "Mauritius"
-msgstr "Mauritius"
-
-msgid "Mayotte"
-msgstr "Mayotte"
-
-msgid "Mexico"
-msgstr "Mehhiko"
-
-msgid "Micronesia"
-msgstr "Mikroneesia"
-
-msgid "Moldova, Republic Of"
-msgstr "Moldova Vabariik"
-
-msgid "Monaco"
-msgstr "Monaco"
-
-msgid "Mongolia"
-msgstr "Mongoolia"
-
-msgid "Montserrat"
-msgstr "Montserrat"
-
-msgid "Morocco"
-msgstr "Maroko"
-
-msgid "Mozambique"
-msgstr "Mosambiik"
-
-msgid "Myanmar"
-msgstr "Birma"
-
-msgid "Namibia"
-msgstr "Namiibia"
-
-msgid "Nauru"
-msgstr "Nauru"
-
-msgid "Nepal"
-msgstr "Nepal"
-
-msgid "Netherlands"
-msgstr "Holland"
-
-msgid "Netherlands Antilles"
-msgstr "Hollandi Antillid"
-
-msgid "New Caledonia"
-msgstr "Uus-Kaledoonia"
-
-msgid "New Zealand"
-msgstr "Uus-Meremaa"
-
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-msgid "Niger"
-msgstr "Niger"
-
-msgid "Nigeria"
-msgstr "Nigeeria"
-
-msgid "Niue"
-msgstr "Niue"
-
-msgid "Norfolk Island"
-msgstr "Norfolk"
-
-msgid "Northern Mariana Islands"
-msgstr "Põhja-Mariaanid"
-
-msgid "Norway"
-msgstr "Norra"
-
-msgid "Oman"
-msgstr "Omaan"
-
-msgid "Pakistan"
-msgstr "Pakistan"
-
-msgid "Palau"
-msgstr "Palau"
-
-msgid "Palestinian Territory"
-msgstr "Palestiina territoorium"
-
-msgid "Panama"
-msgstr "Panama"
-
-msgid "Papua New Guinea"
-msgstr "Paapua Uus-Guinea"
-
-msgid "Paraguay"
-msgstr "Paraguay"
-
-msgid "Peru"
-msgstr "Peruu"
-
-msgid "Philippines"
-msgstr "Filipiinid"
-
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-msgid "Poland"
-msgstr "Poola"
-
-msgid "Portugal"
-msgstr "Portugal"
-
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
-msgid "Qatar"
-msgstr "Katar"
-
-msgid "Reunion"
-msgstr "Réunioni departemang"
-
-msgid "Romania"
-msgstr "Rumeenia"
-
-msgid "Russian Federation"
-msgstr "Venemaa"
-
-msgid "Rwanda"
-msgstr "Ruanda"
-
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts ja Nevis"
-
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent ja Grenadiinid"
-
-msgid "Samoa"
-msgstr "Samoa"
-
-msgid "San Marino"
-msgstr "San Marino"
-
-msgid "Sao Tome And Principe"
-msgstr "São Tomé ja Príncipe"
-
-msgid "Saudi Arabia"
-msgstr "Saudi Araabia"
-
-msgid "Senegal"
-msgstr "Senegal"
-
-msgid "Serbia And Montenegro"
-msgstr "Serbia ja Montenegro"
-
-msgid "Seychelles"
-msgstr "Seišellid"
-
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-msgid "Singapore"
-msgstr "Singapur"
-
-msgid "Slovakia"
-msgstr "Slovakkia"
-
-msgid "Slovenia"
-msgstr "Sloveenia"
-
-msgid "Solomon Islands"
-msgstr "Saalomoni Saared"
-
-msgid "Somalia"
-msgstr "Somaalia"
-
-msgid "South Africa"
-msgstr "Lõuna-Aafrika Vabariik"
-
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Lõuna Georgia ja Lõuna Sandwichi saared"
-
-msgid "Spain"
-msgstr "Hispaania"
-
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-msgid "St. Helena"
-msgstr "Saint Helena"
-
-msgid "St. Pierre And Miquelon"
-msgstr "Saint-Pierre ja Miquelon"
-
-msgid "Sudan"
-msgstr "Sudaan"
-
-msgid "Suriname"
-msgstr "Suriname"
-
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Teravmäed"
-
-msgid "Swaziland"
-msgstr "Svaasimaa"
-
-msgid "Sweden"
-msgstr "Rootsi"
-
-msgid "Switzerland"
-msgstr "Šveits"
-
-msgid "Syria"
-msgstr "Süüria"
-
-msgid "Taiwan"
-msgstr "Taivan"
-
-msgid "Tajikistan"
-msgstr "Tadžikistan"
-
-msgid "Tanzania, United Republic Of"
-msgstr "Tansaania, Ühendatud Vabariik"
-
-msgid "Thailand"
-msgstr "Tai"
-
-msgid "Timor-Leste"
-msgstr "Timor-Leste"
-
-msgid "Togo"
-msgstr "Togo"
-
-msgid "Tokelau"
-msgstr "Tokelau"
-
-msgid "Tonga"
-msgstr "Tonga"
-
-msgid "Trinidad And Tobago"
-msgstr "Trinidad ja Tobago"
-
-msgid "Tunisia"
-msgstr "Tuneesia"
-
-msgid "Turkey"
-msgstr "Türgi"
-
-msgid "Turkmenistan"
-msgstr "Türkmenistan"
-
-msgid "Turks And Caicos Islands"
-msgstr "Turksi ja Caicose saared"
-
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-msgid "Uganda"
-msgstr "Uganda"
-
-msgid "Ukraine"
-msgstr "Ukraina"
-
-msgid "United Arab Emirates"
-msgstr "Araabia Ühendemiraadid"
-
-msgid "United Kingdom"
-msgstr "Ühendkuningriik"
-
-msgid "United States Minor Outlying Islands"
-msgstr "Ühendriikide hajasaared"
-
-msgid "Uruguay"
-msgstr "Uruguay"
-
-msgid "Uzbekistan"
-msgstr "Usbekistan"
-
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-msgid "Venezuela"
-msgstr "Venetsueela"
-
-msgid "Viet Nam"
-msgstr "Vietnam"
-
-msgid "Virgin Islands, British"
-msgstr "Neitsisaared, Briti"
-
-msgid "Virgin Islands, U.S."
-msgstr "Neitsisaared, U.S."
-
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis ja Futuna"
-
-msgid "Western Sahara"
-msgstr "Lääne-Sahara"
-
-msgid "Yemen"
-msgstr "Jeemen"
-
-msgid "Zambia"
-msgstr "Sambia"
-
-msgid "Zimbabwe"
-msgstr "Zimbabwe"
-
-msgid "Name"
-msgstr "Nimi"
-
-msgid "AOL Instant Messenger"
-msgstr "AOL kiirsuhtlusklient"
+msgid "AIM"
+msgstr "AIM"
 
 msgid "Jabber"
 msgstr "Jabber"
 
-msgid "Yahoo Messenger"
-msgstr "Yahoo Kiirsuhtlusklient"
+msgid "Yahoo"
+msgstr "Yahoo"
 
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Kiirsuhtlusklient"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+msgid "MSN"
+msgstr "MSN"
 
 msgid "ICQ"
 msgstr "ICQ"
 
+msgid "GroupWise"
+msgstr "GroupWise"
+
 msgid "Skype"
 msgstr "Skype"
 
-msgid "Service"
-msgstr "Teenus"
-
-msgid "Location"
-msgstr "Asukoht"
-
-msgid "Username"
-msgstr "Kasutajanimi"
+#. red
+msgid "Work"
+msgstr "Töö"
 
 msgid "Home"
 msgstr "Kodu"
@@ -1860,18 +1066,6 @@ msgstr "Kodu"
 msgid "Other"
 msgstr "Muu"
 
-msgid "Yahoo"
-msgstr "Yahoo"
-
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-msgid "MSN"
-msgstr "MSN"
-
-msgid "GroupWise"
-msgstr "GroupWise"
-
 msgid "Source Book"
 msgstr "Lähteraamat"
 
@@ -1967,57 +1161,28 @@ msgstr ""
 "Kas sa soovid kustutada\n"
 "need kontaktid?"
 
-msgid "Address _2:"
-msgstr "Aadress _2:"
-
-msgid "Ci_ty:"
-msgstr "Li_nn:"
-
-msgid "Countr_y:"
-msgstr "_Riik:"
-
-msgid "Full Address"
-msgstr "Täisaadress"
-
-msgid "_ZIP Code:"
-msgstr "_Postiindeks:"
-
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-msgid "Esq."
-msgstr "Esq."
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
 msgid "Full Name"
 msgstr "Täisnimi"
 
-msgid "I"
-msgstr "I"
-
-msgid "II"
-msgstr "II"
-
-msgid "III"
-msgstr "III"
-
-msgid "Jr."
-msgstr "Jr."
-
-msgid "Miss"
-msgstr "Preili"
-
-msgid "Mr."
-msgstr "Härra"
-
-msgid "Mrs."
-msgstr "Proua"
-
-msgid "Ms."
-msgstr "Pr."
-
-msgid "Sr."
-msgstr "Sr."
-
 msgid "_First:"
 msgstr "_Eesnimi:"
 
@@ -2030,18 +1195,6 @@ msgstr "L_iignimi:"
 msgid "_Suffix:"
 msgstr "_Järelliide:"
 
-msgid "Add IM Account"
-msgstr "Lisa KS konto:"
-
-msgid "_Account name:"
-msgstr "_Konto nimi:"
-
-msgid "_IM Service:"
-msgstr "_KS teenus:"
-
-msgid "_Location:"
-msgstr "Asuko_ht:"
-
 msgid "<b>Members</b>"
 msgstr "<b>Liikmed</b>"
 
@@ -2461,6 +1614,9 @@ msgstr "Telefon"
 msgid "Fax"
 msgstr "Faks"
 
+msgid "Address"
+msgstr "Aadress"
+
 msgid "Home Page"
 msgstr "Koduleht"
 
@@ -2727,21 +1883,6 @@ msgstr "Kontaktandmed - %s"
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Show Full vCard"
-msgstr "Kogu vKaardi kuvamine"
-
-msgid "Show Compact vCard"
-msgstr "Kompaktse vKaardi näitamine"
-
-msgid "Save in address book"
-msgstr "Salvesta aadressiraamatusse"
-
 msgid "Card View"
 msgstr "Kaardi vaade"
 
@@ -2749,10 +1890,10 @@ msgid "Importing..."
 msgstr "Importimine..."
 
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook'i CSV või Tab (.csv, .tab)"
+msgstr "Outlooki CSV või Tab (.csv, .tab)"
 
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook'i CSV ja Tab-i importija"
+msgstr "Outlooki CSV ja Tab-i importija"
 
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV või Tab (.csv, .tab)"
@@ -2778,133 +1919,6 @@ msgstr "vKaart (.vcf, .gcrd)"
 msgid "Evolution vCard Importer"
 msgstr "Evolutioni vKaardi importija"
 
-msgid "10 pt. Tahoma"
-msgstr "10-punktine Tahoma"
-
-msgid "8 pt. Tahoma"
-msgstr "8-punktine Tahoma"
-
-msgid "Blank forms at end:"
-msgstr "Tühjad väljad lõpus:"
-
-msgid "Body"
-msgstr "Sisu"
-
-msgid "Bottom:"
-msgstr "All:"
-
-msgid "Dimensions:"
-msgstr "Mõõtmed:"
-
-msgid "F_ont..."
-msgstr "_Kirjatüüp..."
-
-msgid "Fonts"
-msgstr "Kirjatüübid"
-
-msgid "Footer:"
-msgstr "Jalus:"
-
-msgid "Format"
-msgstr "Vorming"
-
-msgid "Header"
-msgstr "Päis"
-
-msgid "Header/Footer"
-msgstr "Päis/jalus"
-
-msgid "Headings"
-msgstr "Päised"
-
-msgid "Headings for each letter"
-msgstr "Päised iga kirja jaoks"
-
-msgid "Height:"
-msgstr "Kõrgus:"
-
-msgid "Immediately follow each other"
-msgstr "Vahetult üksteise järgi"
-
-msgid "Include:"
-msgstr "Lisa:"
-
-msgid "Landscape"
-msgstr "Rõhtpaigutus"
-
-msgid "Left:"
-msgstr "Vasakul:"
-
-msgid "Letter tabs on side"
-msgstr "Tähenupud küljel"
-
-msgid "Margins"
-msgstr "Veerised"
-
-msgid "Number of columns:"
-msgstr "Tulpade arv:"
-
-msgid "Options"
-msgstr "Valikud"
-
-msgid "Orientation"
-msgstr "Suund"
-
-msgid "Page"
-msgstr "Lehekülg"
-
-msgid "Page Setup:"
-msgstr "Lehekülje sätted:"
-
-msgid "Paper"
-msgstr "Paber"
-
-msgid "Paper source:"
-msgstr "Paberiallikas:"
-
-msgid "Portrait"
-msgstr "Püstpaigutus"
-
-msgid "Preview:"
-msgstr "Eelvaade:"
-
-msgid "Print using gray shading"
-msgstr "Trükkimisel kasuta halli varjutamist"
-
-msgid "Reverse on even pages"
-msgstr "Paarisarvulised leheküljed peeglisse"
-
-msgid "Right:"
-msgstr "Paremal:"
-
-msgid "Sections:"
-msgstr "Sektsioonid:"
-
-msgid "Shading"
-msgstr "Varjutamine"
-
-#. FIXME: Take care of i18n
-msgid "Size:"
-msgstr "Suurus:"
-
-msgid "Start on a new page"
-msgstr "Alusta uuelt leheküljelt"
-
-msgid "Style name:"
-msgstr "Stiili nimi:"
-
-msgid "Top:"
-msgstr "Ülevalt:"
-
-msgid "Type:"
-msgstr "Liik:"
-
-msgid "Width:"
-msgstr "Laius:"
-
-msgid "_Font..."
-msgstr "_Kirjatüüp..."
-
 msgid "Can not open file"
 msgstr "Faili pole võimalik avada"
 
@@ -3309,22 +2323,22 @@ msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
 msgid "Could not read pilot's Calendar application block"
-msgstr "Pilot'i kalendrirakenduse blokki pole võimalik lugeda"
+msgstr "Piloti kalendrirakenduse blokki pole võimalik lugeda"
 
 msgid "Could not read pilot's Memo application block"
-msgstr "Pilot'i märkmerakenduse blokki pole võimalik lugeda"
+msgstr "Piloti märkmerakenduse blokki pole võimalik lugeda"
 
 msgid "Could not write pilot's Memo application block"
-msgstr "Pilot'i märkmerakenduse blokki pole võimalik kirjutada"
+msgstr "Piloti märkmerakenduse blokki pole võimalik kirjutada"
 
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
 msgid "Could not read pilot's ToDo application block"
-msgstr "Pilot'i ülesanderakenduse blokki pole võimalik lugeda"
+msgstr "Piloti ülesanderakenduse blokki pole võimalik lugeda"
 
 msgid "Could not write pilot's ToDo application block"
-msgstr "Pilot'i ülesanderakenduse blokki pole võimalik kirjutada"
+msgstr "Piloti ülesanderakenduse blokki pole võimalik kirjutada"
 
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
@@ -3512,12 +2526,15 @@ msgstr "Tähtaja ületanud ülesannete värvus, \"#rrggbb\" vorgmingus."
 msgid "Calendars to run alarms for"
 msgstr "Kalendrid, mille jaoks alarme käivitada"
 
+msgid "Check this to use system timezone in Evolution."
+msgstr ""
+
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "Marcus Bains'i joone värvus ajaribal (vaikimisi tühi)."
+msgstr "Marcus Bainsi joone värvus ajaribal (vaikimisi tühi)."
 
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Marcus Bains'i joone värvus päeva vaatel."
+msgstr "Marcus Bainsi joone värvus päeva vaatel."
 
 msgid "Compress weekends in month view"
 msgstr "Kuuvaatel kuvatakse nädalalõpud kokkusurutud vormis"
@@ -3589,13 +2606,13 @@ msgid "List of server URLs for free/busy publishing."
 msgstr "Serveri url-ide loend vaba/hõivatud andmete avaldamiseks."
 
 msgid "Marcus Bains Line"
-msgstr "Marcus Bains'i joon"
+msgstr "Marcus Bainsi joon"
 
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains'i joone värv - päeva vaade"
+msgstr "Marcus Bainsi joone värv - päeva vaade"
 
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains'i joone värv - ajariba"
+msgstr "Marcus Bainsi joone värv - ajariba"
 
 msgid ""
 "Maximum number of recently used timezones to remember in a "
@@ -3674,6 +2691,9 @@ msgstr ""
 msgid "Save directory for alarm audio"
 msgstr "Alarmide audio salvestamise kataloog"
 
+msgid "Scroll Month View by a week"
+msgstr ""
+
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "RSVP välja kuvamine sündmuste/ülesannete/koosolekute redaktoris"
 
@@ -3774,6 +2794,11 @@ msgstr ""
 "Ühikud määramaks, millal ülesandeid peita, \"minutes\" (minutid), \"hours"
 "\" (tunnid) või \"days\" (päevad)."
 
+#, fuzzy
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "Kasutatakse süsteemi _vaikeväärtusi"
+
 msgid "Week start"
 msgstr "Nädala algus"
 
@@ -3801,12 +2826,14 @@ msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
+msgstr "Kas kalendris kuvatakse Marcus Bainsi joont (joon praeguse aja kohal)."
 
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
@@ -3838,9 +2865,6 @@ msgstr "Kas kuupäevasirvijas näidatakse nädalate numbreid."
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuupäevasirvijas näidatakse nädalate numbreid."
 
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Kas sündmuste kuvamisel arvestatakse talve- ja suveaja nihkega."
-
 msgid "Work days"
 msgstr "Tööpäevad"
 
@@ -3856,9 +2880,6 @@ msgstr "Tund, millal tööpäev algab"
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
-msgid "daylight savings time"
-msgstr "talve- ja suveaja nihe"
-
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
@@ -3912,25 +2933,17 @@ msgstr "Puhastada sündmustest, mis on vanemad kui"
 msgid "days"
 msgstr "päeva"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web 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
-#. ensure the group name is in current locale, not read from configuration
 msgid "On The Web"
 msgstr "Veebis"
 
+msgid "Weather"
+msgstr "Ilm"
+
 #. ensure the source name is in current locale, not read from configuration
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-msgid "Weather"
-msgstr "Ilm"
-
 msgid "_New Calendar"
 msgstr "_Uus kalender"
 
@@ -4038,6 +3051,9 @@ msgstr "Puuduvad"
 msgid "Exist"
 msgstr "On olemas"
 
+msgid "Location"
+msgstr "Asukoht"
+
 msgid "Organizer"
 msgstr "Korraldaja"
 
@@ -4083,6 +3099,18 @@ msgstr "Tundmatu viga"
 msgid "Edit Alarm"
 msgstr "Alarmi redigeerimine"
 
+msgid "Pop up an alert"
+msgstr "Hoiatuse kuvamine"
+
+msgid "Play a sound"
+msgstr "Heli mängimine"
+
+msgid "Run a program"
+msgstr "Programmi käivitamine"
+
+msgid "Send an email"
+msgstr "E-kirja saatmine"
+
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
@@ -4104,24 +3132,12 @@ msgstr "Kohandatud alarmheli"
 msgid "Mes_sage:"
 msgstr "_Sõnum:"
 
-msgid "Play a sound"
-msgstr "Heli mängimine"
-
-msgid "Pop up an alert"
-msgstr "Hoiatuse kuvamine"
-
-msgid "Run a program"
-msgstr "Programmi käivitamine"
-
 msgid "Select A File"
 msgstr "Faili valimine"
 
 msgid "Send To:"
 msgstr "Kellele saata:"
 
-msgid "Send an email"
-msgstr "E-kirja saatmine"
-
 msgid "_Arguments:"
 msgstr "_Argumendid:"
 
@@ -4134,30 +3150,49 @@ msgstr "_Alarmi korratakse täiendavalt"
 msgid "_Sound:"
 msgstr "_Heli:"
 
-msgid "after"
-msgstr "pärast"
-
-msgid "before"
+#, fuzzy
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
 msgstr "enne"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-msgid "day(s)"
-msgstr "päev(a)"
-
-msgid "end of appointment"
-msgstr "sündmuse lõppu"
-
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-msgid "hour(s)"
-msgstr "tund(i)"
+#, fuzzy
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minutit\n"
+"tundi\n"
+"päeva"
 
-msgid "minute(s)"
-msgstr "minut(it)"
+#, fuzzy
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minutit\n"
+"tundi\n"
+"päeva"
 
-msgid "start of appointment"
+#, fuzzy
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
 msgstr "sündmuse algust"
 
 msgid "Action/Trigger"
@@ -4223,9 +3258,6 @@ msgstr "<span weight=\"bold\">Aeg</span>"
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Töönädal</span>"
 
-msgid "Adjust for daylight sa_ving time"
-msgstr "Arvestatakse s_uve- ja talveaja erinevustega"
-
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
@@ -4274,15 +3306,20 @@ msgstr "_P"
 msgid "Saturday"
 msgstr "Laupäev"
 
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
 msgid "Se_cond zone:"
 msgstr "_Teine ajavöönd:"
 
 msgid "Select the calendars for alarm notification"
 msgstr "Alarmmärguannetega kalendrite valimine"
 
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletusi näidatakse"
 
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
 msgid "Show a _reminder"
 msgstr "_Meeldetuletusi näidatakse"
 
@@ -4317,6 +3354,11 @@ msgstr "Ajavorming:"
 msgid "Tuesday"
 msgstr "Teisipäev"
 
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Use s_ystem time zone"
+msgstr "Teise ajavööndi näitamine"
+
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
@@ -4374,12 +3416,17 @@ msgstr "_T"
 msgid "_Wed"
 msgstr "_K"
 
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
 msgid "before every anniversary/birthday"
 msgstr "enne aasta-/sünnipäeva"
 
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
+msgid "Type:"
+msgstr "Liik:"
+
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Kalendri sisu _kopeeritakse kohapeale, tarvitamiseks võrguvabas keskkonnas"
@@ -4476,25 +3523,10 @@ msgstr " (Tähtaeg "
 msgid "Due "
 msgstr "Tähtaeg "
 
-#, c-format
-msgid "Attached message - %s"
-msgstr "Manustatud sõnum - %s"
-
-#. translators, this count will always be >1
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Manustatud sõnum"
-msgstr[1] "%d manustatud sõnumit"
-
-msgid "_Move"
-msgstr "_Tõsta ümber"
-
-msgid "Cancel _Drag"
-msgstr "Tühista _lohistamine"
-
-msgid "attachment"
-msgstr "manus"
+#, fuzzy
+#| msgid "Save attachments"
+msgid "Could not save attachments"
+msgstr "Manuste salvestamine"
 
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
@@ -4633,34 +3665,13 @@ msgstr "_Hiljutised dokumendid"
 msgid "Attach"
 msgstr "Manusta"
 
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> fail manusena"
-msgstr[1] "<b>%d</b> faili manusena"
-
-msgid "Hide Attachment _Bar"
-msgstr "Peida manuseri_ba"
-
-msgid "Show Attachment _Bar"
-msgstr "Näita manuseri_ba"
-
-msgid "_Remove"
-msgstr "_Eemalda"
-
-msgid "_Add attachment..."
-msgstr "_Lisa manus..."
-
-msgid "Show Attachments"
-msgstr "Näita manuseid"
-
-msgid "Press space key to toggle attachment bar"
-msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
-
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Sellele kirjele tehtud muudatused tühistatakse uuenduste saabumise korral"
 
+msgid "attachment"
+msgstr "manus"
+
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -4799,6 +3810,9 @@ msgstr "Korraldaja peab olema määrtud."
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
+msgid "_Remove"
+msgstr "_Eemalda"
+
 msgid "_Add "
 msgstr "_Lisa "
 
@@ -4831,14 +3845,11 @@ msgstr[1] "%d minutit enne sündmust"
 msgid "Customize"
 msgstr "Kohandatud"
 
-msgid "1 day before appointment"
-msgstr "1 päev enne sündmust"
-
-msgid "1 hour before appointment"
-msgstr "1 tund enne sündmust"
-
-msgid "15 minutes before appointment"
-msgstr "15 minutit enne sündmust"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
 
 msgid "Attendee_s..."
 msgstr "_Osalejad..."
@@ -4858,31 +3869,24 @@ msgstr "_Alarm"
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
+msgid "_Location:"
+msgstr "Asuko_ht:"
+
 msgid "_Time:"
 msgstr "Ae_g:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-msgid "for"
-msgstr "kokku"
+msgid ""
+"a\n"
+"b"
+msgstr ""
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-msgid "until"
+#, fuzzy
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
 msgstr "kuni"
 
-msgid "<b>Att_endees</b>"
-msgstr "<b>_Osalejad</b>"
-
-msgid "C_hange Organizer"
-msgstr "_Muuda korraldajat"
-
-msgid "Co_ntacts..."
-msgstr "Ko_ntaktid..."
-
-msgid "Organizer:"
-msgstr "Korraldaja:"
-
 msgid "Memo"
 msgstr "Märge"
 
@@ -5045,33 +4049,30 @@ msgstr "<b>Eelvaade</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Kordumine</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 msgid "Every"
 msgstr "Vahemikuga"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 msgid "This appointment rec_urs"
 msgstr "See sündmus _kordub"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-msgid "forever"
-msgstr "igavesti"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-msgid "month(s)"
-msgstr "kuu(d)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-msgid "week(s)"
-msgstr "nädal(at)"
-
-msgid "year(s)"
-msgstr "aasta(t)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
 msgid "Send my alarms with this event"
 msgstr ""
@@ -5088,25 +4089,19 @@ msgstr "<span weight=\"bold\">Muu</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Olek</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-msgid "Completed"
-msgstr "Lõpetatud"
-
-msgid "High"
-msgstr "Kõrge"
-
-msgid "In Progress"
-msgstr "Töös"
-
-msgid "Low"
-msgstr "Madal"
-
-msgid "Normal"
-msgstr "Keskmine"
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
 
-msgid "Not Started"
-msgstr "Pole alanud"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
 msgid "P_ercent complete:"
 msgstr "Täitmis_protsent"
@@ -5114,9 +4109,6 @@ msgstr "Täitmis_protsent"
 msgid "Stat_us:"
 msgstr "_Olek:"
 
-msgid "Undefined"
-msgstr "Määramata"
-
 msgid "_Date completed:"
 msgstr "_Lõpetamise kuupäev:"
 
@@ -5228,6 +4220,27 @@ msgstr "%s kell %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
+#, fuzzy
+#| msgid "Import"
+msgid "I_mport"
+msgstr "Impordi"
+
+msgid "Select a Calendar"
+msgstr "Kalendri valimine"
+
+msgid "Select a Task List"
+msgstr "Ülesandeloendi valimine"
+
+#, fuzzy
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "Kalendrisse importimine"
+
+#, fuzzy
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "_Impordi ülesannetesse"
+
 #, c-format
 msgid "Click to open %s"
 msgstr "Klõpsa %s avamiseks"
@@ -5255,12 +4268,38 @@ msgstr "Tähtaeg:"
 msgid "Status:"
 msgstr "Olek:"
 
+msgid "In Progress"
+msgstr "Töös"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+msgid "Completed"
+msgstr "Lõpetatud"
+
+msgid "Not Started"
+msgstr "Pole alanud"
+
 msgid "Priority:"
 msgstr "Tähtsus:"
 
+msgid "High"
+msgstr "Kõrge"
+
+msgid "Normal"
+msgstr "Keskmine"
+
+msgid "Low"
+msgstr "Madal"
+
+msgid "Created"
+msgstr "Loodud"
+
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
 
+msgid "Last modified"
+msgstr "Viimati muudetud"
+
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
@@ -5295,29 +4334,6 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "Määratud"
 
-msgid "Save As..."
-msgstr "Salvestamine teise nimega..."
-
-msgid "Select folder to save selected attachments..."
-msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
-
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nimetu_pilt.%s"
-
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
-
-msgid "Set as _Background"
-msgstr "Säti _taustapildiks"
-
-msgid "_Save Selected"
-msgstr "_Salvesta valik"
-
-#, c-format
-msgid "Open in %s..."
-msgstr "Ava programmiga %s..."
-
 msgid "* No Summary *"
 msgstr "* Kokkuvõte puudub *"
 
@@ -5338,6 +4354,9 @@ msgstr "Algus: "
 msgid "Due: "
 msgstr "Tähtaeg: "
 
+msgid "Undefined"
+msgstr "Määramata"
+
 msgid "0%"
 msgstr "0%"
 
@@ -5386,6 +4405,9 @@ msgstr "Uus ü_lesanne"
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
 msgid "P_rint..."
 msgstr "_Prindi..."
 
@@ -5884,6 +4906,9 @@ msgstr "Kalendri laadimine"
 msgid "Loading calendar..."
 msgstr "Kalendri laadimine..."
 
+msgid "Organizer:"
+msgstr "Korraldaja:"
+
 msgid "Server Message:"
 msgstr "Serveri teade:"
 
@@ -6093,45 +5118,24 @@ msgstr "%s avamine"
 msgid "Purging"
 msgstr "Puhastamine"
 
-msgid "April"
-msgstr "Aprill"
-
-msgid "August"
-msgstr "August"
-
-msgid "December"
-msgstr "Detsember"
-
-msgid "February"
-msgstr "Veebruar"
-
-msgid "January"
-msgstr "Jaanuar"
-
-msgid "July"
-msgstr "Juuli"
-
-msgid "June"
-msgstr "Juuni"
-
-msgid "March"
-msgstr "Märts"
-
-msgid "May"
-msgstr "Mai"
-
-msgid "November"
-msgstr "November"
-
-msgid "October"
-msgstr "Oktoober"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
 
 msgid "Select Date"
 msgstr "Kuupäeva valimine"
 
-msgid "September"
-msgstr "September"
-
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
@@ -6425,7 +5429,6 @@ msgstr "30."
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
 msgid "Su"
 msgstr "P"
 
@@ -7769,12 +6772,6 @@ msgstr "Automaatsalvestuse faili pole võimalik avada"
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-msgid "Insert Attachment"
-msgstr "Manuse lisamine"
-
-msgid "A_ttach"
-msgstr "_Manusta"
-
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
@@ -7883,33 +6880,21 @@ msgstr "_Saatja väli"
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Saatja valija kuvamise sisse- või väljalülitamine"
 
-msgid "_Post-To Field"
-msgstr "Postita-ku_hu väli"
-
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Postita-kuhu välja kuvamise sisse- või väljalülitamine"
-
 msgid "_Reply-To Field"
 msgstr "Kellele-_vastata väli"
 
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Kellele-vastata välja kuvamise sisse- või väljalülitamine"
 
-msgid "_Subject Field"
-msgstr "_Teemaväli"
-
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Teemavälja kuvamise sisse- ja väljalülitamine"
-
-msgid "_To Field"
-msgstr "_Kellele väli"
-
-msgid "Toggles whether the To field is displayed"
-msgstr "Saaja välja kuvamise sisse- või väljalülitamine"
-
 msgid "Save Draft"
 msgstr "Mustandi salvestamine"
 
+msgid "Show"
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
@@ -7935,9 +6920,15 @@ msgstr "_Kellele:"
 msgid "_Cc:"
 msgstr "K_oopia:"
 
+msgid "CC"
+msgstr "Koopia"
+
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
+msgid "BCC"
+msgstr "Pimekoopia"
+
 msgid "_Post To:"
 msgstr "Ku_hu postitada:"
 
@@ -7959,8 +6950,10 @@ msgstr "Vali kaust, kuhu sõnum postitada."
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-msgid "Show _Attachment Bar"
-msgstr "Näita _manuseriba"
+#, fuzzy
+#| msgid "Save Draft"
+msgid "Save draft"
+msgstr "Mustandi salvestamine"
 
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7975,14 +6968,6 @@ msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "manus"
-msgstr[1] "manust"
-
-msgid "Hide _Attachment Bar"
-msgstr "Peida _manuseriba"
-
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
@@ -8084,7 +7069,7 @@ msgid ""
 msgstr ""
 "HTML-redaktori juhtimist pole võimalik aktiveerida.\n"
 "\n"
-"Palun veendu, et sul on paigaldatud korreksed gtkhtml'i ja libgtkhtml'i "
+"Palun veendu, et sul on paigaldatud korreksed gtkhtmli ja libgtkhtmli "
 "versioonid."
 
 msgid "Unable to activate the address selector control."
@@ -8231,7 +7216,7 @@ msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
 msgid "Could not open the link."
-msgstr "Linki pole võimalik avada"
+msgstr "Viita pole võimalik avada."
 
 msgid "Could not display help for Evolution."
 msgstr "Evolutioni abiteavet pole võimalik kuvada."
@@ -8274,7 +7259,7 @@ msgstr "Sama sisuga silt on serveris juba olemas. Palun muuda oma sildi nime."
 
 #, c-format
 msgid "GConf error: %s"
-msgstr "GConf'i viga: %s"
+msgstr "GConfi viga: %s"
 
 msgid "All further errors shown only on terminal."
 msgstr "Kõiki ülejäänud vigu näidatakse ainult terminalil."
@@ -8484,32 +7469,28 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse ajahetkega,\n"
 "mis on võrdne filtri käivitamise hetkega."
 
-msgid "a time relative to the current time"
-msgstr "ajaga, mis on suhteline käesoleva hetkega"
-
-msgid "ago"
-msgstr "tagasi"
-
-msgid "in the future"
-msgstr "tulevikus"
-
-msgid "months"
-msgstr "kuud"
-
-msgid "seconds"
-msgstr "sekundit"
-
-msgid "the current time"
-msgstr "praegune aeg"
-
-msgid "the time you specify"
-msgstr "sinu poolt määratud aeg"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
 
-msgid "weeks"
-msgstr "nädalat"
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
 
-msgid "years"
-msgstr "aastat"
+#, fuzzy
+#| msgid "a time relative to the current time"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
 msgid "Add Rule"
 msgstr "Reegli lisamine"
@@ -8573,6 +7554,81 @@ msgstr "Võrgueelistused"
 msgid "_Mail"
 msgstr "_Post"
 
+msgid "_Forward"
+msgstr "_Edasta"
+
+msgid "_Reply to Sender"
+msgstr "_Vasta saatjale"
+
+#. Translators: This is only for multiple messages.
+#, c-format
+msgid "%d attached messages"
+msgstr "%d sõnumit manuses"
+
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "manus"
+msgstr[1] "manust"
+
+msgid "Icon View"
+msgstr "Ikoonivaade"
+
+msgid "List View"
+msgstr "Loeteluvaade"
+
+#, c-format
+msgid "Matches: %d"
+msgstr "Sobivaid: %d"
+
+msgid "Close the find bar"
+msgstr "Otsinguriba sulgemine"
+
+msgid "Fin_d:"
+msgstr "_Otsing:"
+
+msgid "Clear the search"
+msgstr "Otsingu puhastamine"
+
+msgid "_Previous"
+msgstr "_Eelmine"
+
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+msgid "_Next"
+msgstr "_Järgmine"
+
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#, fuzzy
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "_Tõstutundlik"
+
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+msgid "No encryption"
+msgstr "Krüptimine puudub"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+msgid "TLS encryption"
+msgstr "TLS krüptimine"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+msgid "SSL encryption"
+msgstr "SSL krüptimine"
+
 #, c-format
 msgid "%s License Agreement"
 msgstr "Litsents %s"
@@ -8595,6 +7651,12 @@ msgstr "Kausta valimine"
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
+msgid "Never"
+msgstr "Mitte kunagi"
+
+msgid "Always"
+msgstr "Alati"
+
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
@@ -8620,6 +7682,7 @@ msgstr "Vaikimisi"
 msgid "Security"
 msgstr "Turvalisus"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
@@ -8694,15 +7757,9 @@ msgstr "Omista värvus"
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-msgid "BCC"
-msgstr "Pimekoopia"
-
 msgid "Beep"
 msgstr "Piiksu"
 
-msgid "CC"
-msgstr "Koopia"
-
 msgid "Completed On"
 msgstr "Lõpetatud"
 
@@ -8751,6 +7808,11 @@ msgstr "Avaldis"
 msgid "Follow Up"
 msgstr "Jälgimislipp"
 
+#, fuzzy
+#| msgid "Forward"
+msgid "Forward to"
+msgstr "Edasta"
+
 msgid "Important"
 msgstr "Tähtis"
 
@@ -8799,6 +7861,9 @@ msgstr "Sõnum on rämps"
 msgid "Message is not Junk"
 msgstr "Sõnum ei ole rämpspost"
 
+msgid "Message Location"
+msgstr "Sõnumi asukoht"
+
 msgid "Move to Folder"
 msgstr "Tõsta kausta"
 
@@ -9023,6 +8088,12 @@ msgstr "K_opeeri kausta"
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
+msgid "_Move"
+msgstr "_Tõsta ümber"
+
+msgid "Cancel _Drag"
+msgstr "Tühista _lohistamine"
+
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
@@ -9075,12 +8146,6 @@ msgstr "Tõrge sõnumi kustutamisel"
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sul pole selle sõnumi kustutamiseks piisavalt õiguseid."
 
-msgid "_Reply to Sender"
-msgstr "_Vasta saatjale"
-
-msgid "_Forward"
-msgstr "_Edasta"
-
 #. 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
 msgid "_Edit as New Message..."
 msgstr "Re_digeeri kui uut kirja..."
@@ -9170,12 +8235,6 @@ msgstr "UTF-8"
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-msgid "Retrieving Message..."
-msgstr "Sõnumi vastuvõtmine..."
-
-msgid "C_all To..."
-msgstr "_Helista..."
-
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsingukaust"
 
@@ -9196,24 +8255,6 @@ msgstr "Klõpsa, et helistada numbrile %s"
 msgid "Click to hide/unhide addresses"
 msgstr "Klõpsa aadresside peitmiseks/nähtavale toomiseks"
 
-#. message-search popup match count string
-#, c-format
-msgid "Matches: %d"
-msgstr "Sobivaid: %d"
-
-msgid "Fin_d:"
-msgstr "_Otsing:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-msgid "_Previous"
-msgstr "_Eelmine"
-
-msgid "_Next"
-msgstr "_Järgmine"
-
-msgid "M_atch case"
-msgstr "_Tõstutundlik"
-
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
@@ -9332,31 +8373,6 @@ msgstr "_Sobita laiusega"
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-msgid "Save attachment as"
-msgstr "Manuse salvestamine kui"
-
-msgid "Select folder to save all attachments"
-msgstr "Kõikide manuste salvestamiseks kataloogi valimine"
-
-msgid "_Save Selected..."
-msgstr "_Salvesta valitud..."
-
-#. Cant i put in the number of attachments here ?
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ma_nus"
-msgstr[1] "%d ma_nust"
-
-msgid "S_ave"
-msgstr "Salves_ta"
-
-msgid "S_ave All"
-msgstr "_Salvesta kõik"
-
-msgid "No Attachment"
-msgstr "Manus puudub"
-
 msgid "View _Unformatted"
 msgstr "Vaata _vormindamata"
 
@@ -9509,6 +8525,9 @@ msgstr "Päise nimi:"
 msgid "Header Value Contains:"
 msgstr "Päise väärtus sisaldab:"
 
+msgid "Header"
+msgstr "Päis"
+
 msgid "Contains Value"
 msgstr "Sisaldab väärtust"
 
@@ -9607,6 +8626,16 @@ msgstr ""
 "Eelmisest Evolutioni paigaldusest pole võimalik sätteid lugeda, `evolution/"
 "configxmldb' pole olemas või on see rikutud."
 
+msgid "Save As..."
+msgstr "Salvestamine teise nimega..."
+
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nimetu_pilt.%s"
+
+msgid "Set as _Background"
+msgstr "Säti _taustapildiks"
+
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
@@ -9617,6 +8646,10 @@ msgstr "Vasta _postiloendisse"
 msgid "_Add to Address Book"
 msgstr "_Lisa aadressiraamatusse"
 
+#, c-format
+msgid "Open in %s..."
+msgstr "Ava programmiga %s..."
+
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
@@ -9827,6 +8860,13 @@ msgstr ""
 msgid "Enable or disable magic space bar"
 msgstr "Võlutühiku lubamine või keelamine"
 
+#, fuzzy
+#| msgid "It disables/enables the prompt while marking multiple messages."
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+"Sellega lubatakse ja keelatakse mitme sõnumi märkimise korral kinnituse "
+"küsimine."
+
 msgid "Enable or disable type ahead search feature"
 msgstr "Ettevaatava otsinguvõimaluse lubamine"
 
@@ -9837,15 +8877,9 @@ msgid "Enable search folders on startup."
 msgstr "Käivitamisel otsingukaustade lubamine."
 
 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."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Külgribal ettevaatava otsinguvõimaluse lubamine, mille korral teksti "
-"otsimine toimub interaktiivselt. Seda kasutades on võimalik hõlpsasti leida "
-"näiteks kausta, sisestades kausta nime ja see kaust aktiveeritakse "
-"automaatselt."
 
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
@@ -9863,10 +8897,16 @@ msgstr "Kursorirežiimi lubamine/keelamine"
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Failinimed kodeeritakse nagu kodeerib Outlook / GMail"
 
+#, fuzzy
+#| 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."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "Failinimed kirja päises kodeeritakse nagu seda teeb Outlook või GMail, et "
 "need näitaksid Evolutionist saadetud kirjas failide nimesid õigesti. Need "
@@ -9933,11 +8973,6 @@ msgstr ""
 "\"Posti saatmise ja vastuvõtmise\" akna lähtelaius. Väärtust uuendatakse, "
 "kui kasutaja akna laiust muudab."
 
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Sellega lubatakse ja keelatakse mitme sõnumi märkimise korral kinnituse "
-"küsimine."
-
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -10132,6 +9167,26 @@ msgstr "Saatja e-post aadressi näitamine sõnumite loendi sõnumiveerus"
 msgid "Server synchronization interval"
 msgstr "Serveriga sünkroniseerimise intervall"
 
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#, fuzzy
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Krüptitud sõnumi saatmisel krüptitakse see ka _endale"
+
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
@@ -10148,6 +9203,36 @@ msgid "Show photo of the sender"
 msgstr "Saatja foto näitamine"
 
 msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Saatja aadressi näitamine sõnumite loendi sõnumiveerus."
@@ -10280,10 +9365,10 @@ msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
 msgid "Use SpamAssassin daemon and client"
-msgstr "SpamAssassin'i deemoni ja kliendi kasutamine"
+msgstr "SpamAssassini deemoni ja kliendi kasutamine"
 
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "SpamAssassin'i deemoni ja kliendi (spamc/spamd) kasutamine."
+msgstr "SpamAssassini deemoni ja kliendi (spamc/spamd) kasutamine."
 
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
@@ -10303,36 +9388,6 @@ msgstr "Külg-külje kõrval paigutuse või laia paigutuse kasutamine"
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-msgid "View/Bcc menu item is checked"
-msgstr "Vaade/Pimekoopia menüükirje on märgitud"
-
-msgid "View/Bcc menu item is checked."
-msgstr "Vaade/Pimekoopia menüükirje on märgitud."
-
-msgid "View/Cc menu item is checked"
-msgstr "Vaade/Koopia menüükirje on märgitud"
-
-msgid "View/Cc menu item is checked."
-msgstr "Vaade/Koopia menüükirje on märgitud."
-
-msgid "View/From menu item is checked"
-msgstr "Vaade/Kellelt menüükirje on märgitud"
-
-msgid "View/From menu item is checked."
-msgstr "Vaade/Kellelt menüükirje on märgitud."
-
-msgid "View/PostTo menu item is checked"
-msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
-
-msgid "View/PostTo menu item is checked."
-msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
-
-msgid "View/ReplyTo menu item is checked"
-msgstr "Vaade/Kellele-vastata menüükirje on märgitud"
-
-msgid "View/ReplyTo menu item is checked."
-msgstr "Vaade/Kellele-vastata menüükirje on märgitud."
-
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Kas lugemiskinnituse päring pannakse vaikimisi iga saadetava sõnumi külge "
@@ -10360,10 +9415,10 @@ msgid "Width of the message-list pane."
 msgstr "Sõnumiloendi paani laius."
 
 msgid "Importing Elm data"
-msgstr "Elm'i andmete importimine"
+msgstr "Elmi andmete importimine"
 
 msgid "Evolution Elm importer"
-msgstr "Evolutioni Elm'i importija"
+msgstr "Evolutioni Elmi importija"
 
 msgid "Import mail from Elm."
 msgstr "Postkasti importimine programmist Elm."
@@ -10498,7 +9553,7 @@ msgid "(Note: Requires restart of the application)"
 msgstr "(Märkus: rakendus tuleb taaskäivitada)"
 
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
+msgstr "<b>Käesolev Evolition ehitatud ilma SSL-i toeta</b>"
 
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Saatja foto</b>"
@@ -10611,6 +9666,19 @@ msgstr "Krüptitud sõnumi saatmisel krüptitakse alati ka _enda jaoks"
 msgid "Always request rea_d receipt"
 msgstr "_Lugemiskinnitust küsitakse alati"
 
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+
 msgid "Automatically insert _emoticon images"
 msgstr "Tuju_nägude pildid lisatakse automaatselt"
 
@@ -10683,9 +9751,6 @@ msgstr "Sõnumite tekstiosa ei vo_rmindata, kui selle suurus ületab"
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Minu _aadressiraamatus olevate saatjate sõnumeid ei märgita rämpsuks"
 
-msgid "Do not quote"
-msgstr ""
-
 msgid "Done"
 msgstr "Valmis"
 
@@ -10740,12 +9805,6 @@ msgstr "Päised"
 msgid "Highlight _quotations with"
 msgstr "_Tsitaate rõhutatakse"
 
-msgid "Inline"
-msgstr "Samal joonel"
-
-msgid "Inline (Outlook style)"
-msgstr "Algse sõnumiga samal joonel (Outlook'i moodi)"
-
 msgid "KB"
 msgstr "KB"
 
@@ -10826,9 +9885,6 @@ msgstr "Port:"
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ainult _pimekoopia adressaatidega sõnumi saatmisel küsitakse kinnitust"
 
-msgid "Quoted"
-msgstr "Tsitaadina"
-
 msgid "Re_member password"
 msgstr "_Parool jäetakse meelde"
 
@@ -10838,9 +9894,6 @@ msgstr "Kellele-_vastata:"
 msgid "Remember _password"
 msgstr "Parool jäetakse _meelde"
 
-msgid "S_OCKS Host:"
-msgstr "S_OCKS-i host:"
-
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Saatja f_otot otsitakse ainult kohalikust aadressiraamatust"
 
@@ -10853,9 +9906,6 @@ msgstr "_Lugemiskinnitus saadetakse:"
 msgid "S_tandard Font:"
 msgstr "Tavaline ki_rjatüüp:"
 
-msgid "Select Drafts Folder"
-msgstr "Mustandite kausta valimine"
-
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
@@ -10868,9 +9918,6 @@ msgstr "Vali HTML muutuva laiusega kirjatüüp"
 msgid "Select HTML variable width font for printing"
 msgstr "Vali printimise jaoks HTML muutuva laiusega kirjatüüp"
 
-msgid "Select Sent Folder"
-msgstr "Saadetud sõnumite kausta valimine"
-
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
@@ -10953,9 +10000,6 @@ msgstr "Allkirja _lisamine"
 msgid "_Always load images from the Internet"
 msgstr "_Internetis asuvad pildid laaditakse alati"
 
-msgid "_Automatic proxy configuration URL:"
-msgstr "Proksi _automaatseadistuse URL:"
-
 msgid "_Default junk plugin:"
 msgstr "Vaikimisi _rämpsuplugin:"
 
@@ -11039,6 +10083,9 @@ msgstr "värvusega"
 msgid "description"
 msgstr "kirjeldus"
 
+msgid "seconds"
+msgstr "sekundit"
+
 msgid "    "
 msgstr "    "
 
@@ -11060,18 +10107,9 @@ msgstr "Kõik kohalikud kaustad ja aktiivsed võrgukaustad"
 msgid "All local folders"
 msgstr "Kõik kohalikud kaustad"
 
-msgid "Case _sensitive"
-msgstr "_Tõstutundlik"
-
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-msgid "F_ind:"
-msgstr "Ot_sing:"
-
-msgid "Find in Message"
-msgstr "Otsing sõnumist"
-
 msgid "Flag to Follow Up"
 msgstr "Märgistamine järeltoiminguks"
 
@@ -11081,9 +10119,6 @@ msgstr "Kaustade tellimused"
 msgid "License Agreement"
 msgstr "Kasutustingimused"
 
-msgid "None Selected"
-msgstr "Ühtegi pole valitud"
-
 msgid "S_erver:"
 msgstr "_Server:"
 
@@ -11316,7 +10351,7 @@ msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
 
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Movemail'i proovimine mitte-mbox allikaga `%s'"
+msgstr "Movemaili proovimine mitte-mbox allikaga `%s'"
 
 #, c-format
 msgid "Forwarded message - %s"
@@ -11961,18 +10996,21 @@ msgstr "Saatja sisaldab"
 msgid "Subject contains"
 msgstr "Teema sisaldab"
 
+msgid "Subject or Addresses contains"
+msgstr "Teema või aadressid sisaldavad"
+
 msgid "Subject or Recipients contains"
 msgstr "Teema või vastuvõtja sisaldab"
 
 msgid "Subject or Sender contains"
 msgstr "Teema või saatja sisaldab"
 
+msgid "Add local address books to Evolution."
+msgstr "Kohalike aadressiraamatute lisamine Evolutioni."
+
 msgid "Local Address Books"
 msgstr "Kohalikud aadressiraamatud"
 
-msgid "Provides core functionality for local address books."
-msgstr "Kohalike aadressiraamatute põhitalitluse tagamine."
-
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -11993,12 +11031,8 @@ msgstr "Võtmesõnad"
 msgid "Attachment Reminder"
 msgstr "Manuste meeldetuletaja"
 
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Manuse olemasolule viitavate võtmesõnade otsimine sõnumist, et kahtluse "
-"korral hoiatada kasutajat manuseta sõnumi väljasaatmise eest"
 
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -12011,18 +11045,17 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Sõnumil puuduvad manused"
 
+msgid "_Add attachment..."
+msgstr "_Lisa manus..."
+
 msgid "_Edit Message"
 msgstr "_Redigeeri sõnumit"
 
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
+msgid "Audio Inline"
 msgstr ""
-"Vormindusplugin audiomanuste kuvamiseks sõnum osana ja nende esitamiseks "
-"ilma välist esitajat avamata."
 
-msgid "Audio inline plugin"
-msgstr "Audioesitamise plugin"
+msgid "Play audio attachments directly from Evolution."
+msgstr "Audiomanuste esitamine otse Evolutionis."
 
 msgid "Select name of the Evolution backup file"
 msgstr "Evolutioni varukoopiale faili nime valimine"
@@ -12134,13 +11167,12 @@ msgstr "Palun oota kuni Evolution Sinu andmeid taastab."
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Sõltuvalt andmete hulgast, võib see veidi aega võtta."
 
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr ""
-"Plugin Evolutioni andmete ja seadistuste varundamiseks ja taastamiseks."
-
 #. the path to the shared library
-msgid "Backup and restore plugin"
-msgstr "Varundamise ja taastamise plugin"
+msgid "Backup and Restore"
+msgstr "Varundamine ja taastamine"
+
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Sinu Evolutioni andmete ja seadistuste varundamine"
 
 msgid "Are you sure you want to close Evolution?"
 msgstr "Kas sa soovid Evolutioni sulgeda?"
@@ -12198,7 +11230,9 @@ msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
 #. Enable BBDB checkbox
-msgid "_Auto-create address book entries when replying to messages"
+#, fuzzy
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
 msgstr "Sõnumile vastamisel luuakse automaatselt aa_dressiraamatu kirje"
 
 msgid "Select Address book for Automatic Contacts"
@@ -12209,27 +11243,34 @@ msgstr "Kiirsuhtluse kontaktid"
 
 #. Enable Gaim Checkbox
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Kontaktandmete ja piltide sünkroniseerimine Pidgin'i sõbranimekirjaga"
+msgstr "Kontaktandmete ja piltide sünkroniseerimine Pidgini sõbranimekirjaga"
 
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Vali Pidgin'i sõbranimekirja jaoks aadressiraamat"
+msgstr "Vali Pidgini sõbranimekirja jaoks aadressiraamat"
 
 #. Synchronize now button.
 msgid "Synchronize with _buddy list now"
 msgstr "Sünkroniseeri sõ_branimekiri kohe"
 
+msgid "BBDB"
+msgstr "BBDB"
+
+#, fuzzy
+#| 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."
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "Plugin, mis automaatselt täiendab aadressiraamatut sinu poolt vastatud "
 "sõnumite adressaatide nime ja e-posti aadressiga. Samuti täiendatakse "
 "aadressiraamatut välksõnumirakenduse sõbranimekirja kontaktide andmetega."
 
-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.
 #, c-format
 msgid "Error occurred while spawning %s: %s."
@@ -12261,16 +11302,15 @@ msgstr ""
 "(rämps)postifiltrid saaksid universaalselt käitleda erinevates "
 "kooditabelites olevaid sõnumeid."
 
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter - rämpspostifilter"
+
 msgid "Bogofilter Options"
 msgstr "Bogofiltri valikud"
 
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter - rämpspostiplugin"
-
-msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "Rämpsposti filtreerimine Bogofiltri abil."
 
-#. we found the group, change the name based on the actual language
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -12284,29 +11324,32 @@ msgstr "Kasutatakse _SSL-i"
 msgid "Re_fresh:"
 msgstr "_Värskenda:"
 
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV-i kalendriallikad"
+msgid "weeks"
+msgstr "nädalat"
+
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
-msgid "CalDAV sources"
-msgstr "CalDAV-i allikad"
+msgid "CalDAV Support"
+msgstr "CalDAV-i tugi"
+
+msgid "Add local calendars to Evolution."
+msgstr "Kohalike kalendrite lisamine Evolutionile."
 
 msgid "Local Calendars"
 msgstr "Kohalikud kalendrid"
 
-msgid "Provides core functionality for local calendars."
-msgstr "Kohalike kalendrite põhitalitluse tagamine."
-
 msgid "_Secure connection"
 msgstr "_Turvaline ühendus"
 
 msgid "Userna_me:"
 msgstr "Kasutajani_mi:"
 
-msgid "HTTP Calendars"
-msgstr "HTTP-kalendrid"
+msgid "Add web calendars to Evolution."
+msgstr ""
 
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Webcal- ja http-kalendrite põhitalitluse tagamine."
+msgid "Web Calendars"
+msgstr "Veebikalendrid"
 
 msgid "Weather: Fog"
 msgstr "Ilm: udu"
@@ -12347,22 +11390,18 @@ msgstr "Meetermõõdustik (Celsius, cm, jms.)"
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Mittemeetriline (Fahrenheit, tollid, jms)"
 
-msgid "Provides core functionality for weather calendars."
-msgstr "Ilmakalendrite põhitalitluse tagamine."
+msgid "Add weather calendars to Evolution."
+msgstr ""
 
 msgid "Weather Calendars"
 msgstr "Ilmakalendrid"
 
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
-"demonstreeriseks."
-
-msgid "Copy tool"
+msgid "Copy Tool"
 msgstr "Kopeerimisvahend"
 
+msgid "Copy things to the clipboard."
+msgstr "Valitud sõnumite kopeerimine lõikelauale."
+
 msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroll, kas Evolution on vaikimisi postiprogramm"
 
@@ -12372,11 +11411,13 @@ msgstr ""
 "Evolutioni iga käivitamise ajal kontrollitakse, kas Evolution on vaikimisi "
 "postiprogramm või mitte."
 
-msgid "Checks whether Evolution is the default mail client on startup."
+#, fuzzy
+#| msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 "Käivitumisel kontrollimiseks, kas Evolution on vaikimisi e-postiklient."
 
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "Vaikimisi postiklient"
 
 msgid "Do you want to make Evolution your default e-mail client?"
@@ -12400,12 +11441,8 @@ msgstr "Märgitud _vaikimisi märkmeloendiks"
 msgid "Default Sources"
 msgstr "Vaikimisi allikad"
 
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+msgid "Mark your preferred address book and calendar as default."
 msgstr ""
-"Kalendri või aadressiraamatu vaikimisi kalendriks või aadressiraamatuks "
-"märkimise funktsionaalsuse tagamine."
 
 msgid "Security:"
 msgstr "Turvalisus:"
@@ -12441,7 +11478,7 @@ msgid "Email Custom Header"
 msgstr "E-posti kohandatud päised"
 
 #. 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
-msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
 msgstr "Kohandatud päise lisamine väljaminevatele sõnumitele."
 
 msgid "Custom Header"
@@ -12540,8 +11577,8 @@ msgstr "_OWA URL:"
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-msgid "S_pecify the mailbox name"
-msgstr "_Määra postkasti nimi"
+msgid "Mailbox name is _different than user name"
+msgstr ""
 
 msgid "_Mailbox:"
 msgstr "_Postkast:"
@@ -12560,6 +11597,10 @@ msgstr "%s KB"
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+msgid "Size:"
+msgstr "Suurus:"
+
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -12689,6 +11730,13 @@ msgstr "Ko_ntaktid:"
 msgid "Delegates"
 msgstr "Delegaadid"
 
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+
 msgid "Permissions for"
 msgstr "Õigused"
 
@@ -12897,12 +11945,8 @@ msgstr "Teiste kasutajate kontaktide tellimine"
 msgid "Subscribe to Other User's Calendar"
 msgstr "Teiste kasutajate kalendrite tellimine"
 
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Exchange'i kontole spetsiifiliste toimingute ja võimaluste käsitlemise "
-"plugin."
 
 msgid "Exchange Operations"
 msgstr "Exchange'i toimingud"
@@ -12950,7 +11994,7 @@ msgid "Could not determine folder permissions for delegates."
 msgstr "Kataloogi pääsuõiguseid delegaatidele pole võimalik tuvastada."
 
 msgid "Could not find Exchange Web Storage System."
-msgstr "Exchange Web Storage System'it pole võimalik leida."
+msgstr "Exchange Web Storage Systemit pole võimalik leida."
 
 msgid "Could not locate server {0}."
 msgstr "Serveri {0} asukohta pole võimalik tuvastada."
@@ -13181,23 +12225,30 @@ msgstr "Teiste kasutajate ülesannete tellimine"
 msgid "Check folder permissions"
 msgstr "Kausta pääsuõiguste kontrollimine"
 
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
 msgid "Default External Editor"
 msgstr "Vaikimisi väline redaktor"
 
 msgid "The default command that must be used as the editor."
 msgstr ""
 
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+msgid "External Editor"
+msgstr "Väline redaktor"
+
+#, fuzzy
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
 "Plugin välise redaktori kasutamiseks e-sõnumi koostamisel. Sellega on "
 "võimalik saata ainult lihttekstilisi sõnumeid."
 
-#. the path to the shared library
-msgid "External Editor"
-msgstr "Väline redaktor"
-
 msgid "Cannot create Temporary File"
 msgstr "Ajutist faili pole võimalik luua"
 
@@ -13211,6 +12262,14 @@ msgstr ""
 "Evolutionil pole võimalik sõnumi salvestamiseks ajutist faili luua. Proovi "
 "hiljem uuesti."
 
+msgid "External editor still running"
+msgstr "Väline redaktor pole veel lõpetanud"
+
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -13218,21 +12277,18 @@ msgstr ""
 "Sinu pluginaeelistustes määratud redaktorit pole võimalik käivitada. Proovi "
 "mõnda muud redaktorit."
 
-msgid "Compose in _External Editor"
-msgstr "Koostamine _välise redaktor abil"
-
-msgid "Compose messages using an external editor"
-msgstr "Sõnumite koostamine välise redaktor abil"
-
 msgid "Command to be executed to launch the editor: "
 msgstr "Redaktori käivitamiseks kasutatav käsk: "
 
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
-"Emacs'i jaoks kasuta \"xemacs\"\n"
-"VI jaoks kasuta \"gvim\""
+"Emacsi jaoks kasuta \"xemacs\"\n"
+"VI jaoks kasuta \"gvim -f\""
+
+msgid "Compose in External Editor"
+msgstr "Koostamine välise redaktor abil"
 
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Vali PNG-pilt mõõtmetega 48x48 ja suurusega mitte rohkem kui 700 baiti"
@@ -13243,10 +12299,17 @@ msgstr "PNG-failid"
 msgid "_Face"
 msgstr "_Näopilt"
 
+#, fuzzy
+#| 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."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
 "Näopildi lisamine väljuvate sõnumite päisesse. Esimesel korral peab kasutaja "
 "määrama 48*48 PNG-pildi, mis kodeeritakse BASE64-vormingusse ja "
@@ -13257,15 +12320,19 @@ msgstr ""
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Kausta \"%s\" tellimusest loobumine"
 
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-
 msgid "Unsubscribe Folders"
 msgstr "Kausta tellimuse lõpetamine"
 
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
+msgid "Google"
+msgstr "Google"
+
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
@@ -13285,23 +12352,20 @@ msgstr "Kalen_der:"
 msgid "Retrieve _list"
 msgstr ""
 
-msgid "Google"
-msgstr "Google"
-
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Plugin Google kalendri ja kontaktide seadistamiseks."
+msgid "Add Google Calendars to Evolution."
+msgstr "Google'i kalendrite lisamine Evolutionile."
 
-msgid "Google sources"
-msgstr "Google allikad"
+msgid "Google Calendars"
+msgstr "Google'i kalendrid"
 
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Plugin GroupWise kalendri- ja kontaktiallikate seadistamiseks."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Novell GroupWise'i kalendrite lisamine Evolutionile."
 
 msgid "GroupWise Account Setup"
 msgstr "GroupWise'i konto sätted"
@@ -13377,8 +12441,8 @@ msgstr "E-posti tagasivõtmine"
 msgid "Add Send Options to GroupWise messages"
 msgstr "Saatmisvalikute lisamine GroupWise'i sõnumitele"
 
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Plugin GroupWise kontode võimaluste jaoks."
+msgid "Fine-tune your GroupWise accounts."
+msgstr ""
 
 msgid "GroupWise Features"
 msgstr "GroupWise'i võimalused"
@@ -13389,30 +12453,52 @@ msgstr ""
 msgid "The server did not allow the selected message to be retracted."
 msgstr ""
 
-msgid "Invalid user"
-msgstr "Vigane kasutaja"
+#, fuzzy
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "Kas sa soovid kustutada seda koosolekut?"
 
-#. 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
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Kasutajale &quot;{0}&quot; pole võimalik proksi ligipääsu anda"
+#, fuzzy
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Kas sa soovid kustutada seda koosolekut?"
 
-msgid "Specify User"
-msgstr "Kasutaja määramine"
+#, fuzzy
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to retract the original item ?"
+msgstr "Kas sa soovid lõpetamata sõnumid taastada?"
 
-#. 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
-msgid "You have already given proxy permissions to this user."
-msgstr "Sa oled sellele kasutajale juba proksile ligipääsu andnud."
+msgid "The original will be removed from the recipient's mailbox."
+msgstr ""
 
-#. 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
-msgid "You have to specify a valid user name to give proxy rights."
+msgid "This is a recurring meeting"
+msgstr "See on korduv kohtumine"
+
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
 msgstr ""
 
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+msgid "Would you like to accept it?"
+msgstr "Kas nõustud sellega?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+msgid "Would you like to decline it?"
+msgstr "Kas lükkad selle tagasi?"
+
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr "Konto &quot;{0}&quot; on juba olemas. Palun kontrolli oma kaustapuud."
 
 msgid "Account Already Exists"
 msgstr "Konto on juba olemas"
 
+msgid "Invalid user"
+msgstr "Vigane kasutaja"
+
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
@@ -13420,16 +12506,20 @@ msgstr ""
 "Proksisse kasutajana &quot;{0}&quot; sisselogimine nurjus. Palun kontrolli "
 "oma e-posti aadressi ja proovi uuesti."
 
-msgid "This is a recurring meeting"
-msgstr "See on korduv kohtumine"
+#. 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
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Kasutajale &quot;{0}&quot; pole võimalik proksi ligipääsu anda"
 
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-msgid "Would you like to accept it?"
-msgstr "Kas nõustud sellega?"
+msgid "Specify User"
+msgstr "Kasutaja määramine"
 
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-msgid "Would you like to decline it?"
-msgstr "Kas lükkad selle tagasi?"
+#. 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
+msgid "You have already given proxy permissions to this user."
+msgstr "Sa oled sellele kasutajale juba proksile ligipääsu andnud."
+
+#. 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
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
 
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Sul pole võimalik kausta määratud kasutajale &quot;{0}&quot; jagada"
@@ -13440,6 +12530,11 @@ msgstr "Sa pead määrama nimekirja lisatava kasutaja nime"
 msgid "Accept Tentatively"
 msgstr "Nõustu katseliselt"
 
+#, fuzzy
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "_Delegeeri koosolek..."
+
 msgid "<b>Users:</b>"
 msgstr "<b>Kasutajad:</b>"
 
@@ -13598,11 +12693,11 @@ msgstr "Kohale toimetamata: "
 msgid "Track Message Status..."
 msgstr "Jälgi sõnumi olekut..."
 
-msgid "A plugin to setup hula calendar sources."
-msgstr "Plugin Hula kalendriallikate seadistamiseks."
+msgid "Add Hula support to Evolution."
+msgstr ""
 
-msgid "Hula Account Setup"
-msgstr "Hula konto sätted"
+msgid "Hula Support"
+msgstr ""
 
 msgid "Custom Headers"
 msgstr "Kohandatud päised"
@@ -13645,37 +12740,12 @@ msgstr ""
 "_Põhilised päised (kiireim variant)\n"
 "Kasuta seda juhul, kui sul pole postiloenditel põhinevaid filtreid"
 
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Plugin IMAP kontode võimaluste jaoks."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 msgid "IMAP Features"
 msgstr "IMAP-i võimalused"
 
-msgid "_Import to Calendar"
-msgstr "_Impordi kalendrisse"
-
-msgid "_Import to Tasks"
-msgstr "_Impordi ülesannetesse"
-
-msgid "Import ICS"
-msgstr "Impordi ICS-i"
-
-msgid "Select Task List"
-msgstr "Ülesandeloendi valimine"
-
-msgid "Select Calendar"
-msgstr "Kalendri valimine"
-
-msgid "_Import"
-msgstr "_Impordi"
-
-#. the path to the shared library
-msgid "Import to Calendar"
-msgstr "Kalendrisse importimine"
-
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS-manuste importimine kalendrisse."
-
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Hardware Abstraction Layer pole laaditud"
 
@@ -13687,29 +12757,28 @@ msgstr ""
 "programm uuesti või võta ühendust oma süsteemiülemaga."
 
 msgid "Search for an iPod failed"
-msgstr "Tõrge iPod'i leidmisel"
+msgstr "Tõrge iPodi leidmisel"
 
 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 ei leia sünkroniseerimiseks iPod'i. iPod pole kas ühendatud või "
+"Evolution ei leia sünkroniseerimiseks iPodi. iPod pole kas ühendatud või "
 "pole see sisse lülitatud."
 
 msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Valitud ülesande/märkme/kalendri/aadressiraamatu sünkroniseerimine Apple "
-"iPod'iga"
-
 msgid "Synchronize to iPod"
-msgstr "Sünkroniseeri iPod'iga"
+msgstr "Sünkroniseeri iPodiga"
+
+#, fuzzy
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "Sünkroniseeri iPodiga"
 
 msgid "iPod Synchronization"
-msgstr "iPod'iga sünkroniseerimine"
+msgstr "iPodiga sünkroniseerimine"
 
 #, c-format
 msgid "Failed to load the calendar '%s'"
@@ -13735,6 +12804,11 @@ msgstr "Seda ülesannet pole võimalik ühestki ülesannete loendist leida"
 msgid "Unable to find this memo in any memo list"
 msgstr "Seda märget pole võimalik ühestki märkmete loendist leida"
 
+#, fuzzy
+#| msgid "Opening calendar"
+msgid "Opening the calendar. Please wait.."
+msgstr "Kalendri avamine"
+
 msgid "Searching for an existing version of this appointment"
 msgstr "Selle sündumuse olemasoleva versiooni otsimine"
 
@@ -14210,13 +13284,12 @@ msgstr ""
 msgid "_Inherit reminder"
 msgstr ""
 
-msgid "_Tasks :"
-msgstr "_Ülesanded :"
+msgid "_Memos:"
+msgstr "_Märkmed:"
 
-msgid "Memos :"
-msgstr "Märkmed :"
-
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Teksti- ja kalendriosade kuvamine sõnumis."
 
 msgid "Itip Formatter"
@@ -14239,12 +13312,12 @@ msgstr "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 msgid "Proxy _Logout"
 msgstr "Proksi välja_logimine"
 
-msgid "Allows disabling of accounts."
-msgstr "Kontode keelamise võimaldamine."
-
 msgid "Disable Account"
 msgstr "Konto keelamine"
 
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 msgid "Beep or play sound file."
 msgstr "Helifaili esitamine või piiksumine."
 
@@ -14365,33 +13438,29 @@ msgstr "_Esita"
 msgid "Notify new messages for _Inbox only"
 msgstr "Uutest sõnumitest teatatakse ainult _Sisendkausta kohta"
 
-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 ""
-"Uue sõnumi saabumisel D-Bus sõnumi genereerimine või kasutaja teavitamine "
-"teavitusala ja -sõnumi abil."
-
 msgid "Mail Notification"
 msgstr "Sõnumiteavitus"
 
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-"Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
-"koosolekuid."
-
-msgid "Con_vert to Meeting"
-msgstr "Teise_nda koosolekuks"
-
-msgid "Mail to meeting"
-msgstr "Sõnumi teisendamine koosolekuks"
+#, fuzzy
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "Heli esitamine uute sõnumite saabumisel."
 
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalendrit pole võimalik avada. %s"
 
+#, fuzzy
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Valitud allikas on kirjutuskaitsega, selle alla pole võimalik ülesandeid "
+"luua. Palun vali mõni teine allikas."
+
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -14399,19 +13468,72 @@ msgstr ""
 "Valitud allikas on kirjutuskaitsega, selle alla pole võimalik ülesandeid "
 "luua. Palun vali mõni teine allikas."
 
+#, fuzzy
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
-"Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
-"ülesandeid."
+"Valitud allikas on kirjutuskaitsega, selle alla pole võimalik ülesandeid "
+"luua. Palun vali mõni teine allikas."
+
+#, fuzzy, c-format
+#| msgid "Could not update object"
+msgid "Could not create object. %s"
+msgstr "Objekti pole võimalik uuendada!"
+
+#, fuzzy, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "Allikat \"{2}\" pole võimalik avada."
+
+#, fuzzy
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
 
-msgid "Con_vert to Task"
+#, fuzzy
+#| msgid "Con_vert to Task"
+msgid "Convert to a Mem_o"
 msgstr "Te_isenda ülesandeks"
 
-msgid "Mail to task"
+#, fuzzy
+#| msgid "Con_vert to Meeting"
+msgid "Convert to a _Meeting"
+msgstr "Teise_nda koosolekuks"
+
+#, fuzzy
+#| msgid "Con_vert to Task"
+msgid "Convert to a _Task"
+msgstr "Te_isenda ülesandeks"
+
+#, fuzzy
+#| msgid "Con_vert to Meeting"
+msgid "Convert to an _Event"
+msgstr "Teise_nda koosolekuks"
+
+#, fuzzy
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
 msgstr "Sõnumi teisendamine ülesandeks"
 
+#, fuzzy
+#| msgid "Convert the selected message to a new task"
+msgid "Convert the selected message to a new event"
+msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
+
+#, fuzzy
+#| msgid "Convert the selected message to a new task"
+msgid "Convert the selected message to a new meeting"
+msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
+
+#, fuzzy
+#| msgid "Convert the selected message to a new task"
+msgid "Convert the selected message to a new memo"
+msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
+
 msgid "Convert the selected message to a new task"
 msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
 
@@ -14430,8 +13552,11 @@ msgstr "Postiloendi toimingud"
 msgid "Mailing _List"
 msgstr "_Postiloend"
 
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#, fuzzy
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "Üldiste postiloendikäskude (tellimine, tellimusest loobumine, ...) tagamine."
 
@@ -14559,17 +13684,17 @@ msgstr "Kõigi loetuksmärkimine"
 msgid "Mark Me_ssages as Read"
 msgstr "Märgi sõnumid _loetuks"
 
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Kasutatakse kõigi kaustas olevate sõnumite loetuks määramiseks"
-
-msgid "A plugin which implements mono plugins."
-msgstr "Plugin, mille abil teostatakse mono pluginaid."
+msgid "Mark all messages in a folder as read."
+msgstr "Kõigi kaustas olevate sõnumite märkimine loetuks."
 
 msgid "Mono Loader"
 msgstr "Mono laadur"
 
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Plugin määramaks millised pluginad on lubatud ja millised mitte."
+msgid "Support plugins written in Mono."
+msgstr "Monos kirjutatud pluginate tugi."
+
+msgid "Manage your Evolution plugins."
+msgstr "Sinu Evolutioni pluginate haldamine."
 
 #. Setup the ui
 msgid "Plugin Manager"
@@ -14596,24 +13721,16 @@ msgstr "Ülevaade"
 msgid "Plugin"
 msgstr "Plugin"
 
-msgid ""
-"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 ""
-"Testplugin, mis demonstreerib HTML-sõnumite keelamise võimalusega "
-"vorminduspluginat.\n"
-"\n"
-"See plugin on mõeldud koodinäiteks ja pole seetõttu toetatud.\n"
-
 #. but then we also need to create our own section frame
 msgid "Plain Text Mode"
 msgstr "Lihtteksti režiim"
 
-msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
 msgstr "Lihtteksti eelistamine"
 
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
 msgid "Show HTML if present"
 msgstr "Kui sõnum sisaldab HTML-i, siis näidatakse HTML-ina"
 
@@ -14629,14 +13746,14 @@ msgstr "_HTML-režiim"
 msgid "Evolution Profiler"
 msgstr "Evolutioni profileerija"
 
-msgid "Writes a log of profiling data events."
-msgstr "Profileerimisandmete kirjutamine logisse."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 msgid "Import Outlook messages from PST file"
-msgstr "Outlook'i kirjade importimine PST failist"
+msgstr "Outlooki kirjade importimine PST failist"
 
 msgid "Outlook PST import"
-msgstr "Outlook'i PST importija"
+msgstr "Outlooki PST importija"
 
 msgid "Outlook personal folders (.pst)"
 msgstr ""
@@ -14654,10 +13771,7 @@ msgid "_Journal entries"
 msgstr "_Päeviku sissekanded"
 
 msgid "Importing Outlook data"
-msgstr "Outlook'i andmete importimine"
-
-msgid "Allows calendars to be published to the web"
-msgstr "Plugin kalendrite avalikustamiseks veebis"
+msgstr "Outlooki andmete importimine"
 
 msgid "Calendar Publishing"
 msgstr "Kalendri avalikustamine"
@@ -14665,12 +13779,40 @@ msgstr "Kalendri avalikustamine"
 msgid "Locations"
 msgstr "Asukohad"
 
+msgid "Publish calendars to the web."
+msgstr "Kalendrite avalikustamine veebis."
+
 msgid "_Publish Calendar Information"
 msgstr "_Publitseeri kalendri andmed"
 
+#, c-format
+msgid "Could not open %s:"
+msgstr ""
+
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "%s avamine pole võimalik: Tundmatu viga"
+
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
 msgid "Are you sure you want to remove this location?"
 msgstr "Oled sa kindel, et soovid seda asukohta eemaldada?"
 
+#, fuzzy
+#| msgid "Could not create message."
+msgid "Could not create publish thread."
+msgstr "Sõnumit pole võimalik luua."
+
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Asukoht</span>"
 
@@ -14718,6 +13860,11 @@ msgstr ""
 msgid "Service _type:"
 msgstr "_Teenuse liik:"
 
+#, fuzzy
+#| msgid "Time _zone:"
+msgid "Time _duration:"
+msgstr "Aja_vöönd:"
+
 msgid "_File:"
 msgstr "_Fail:"
 
@@ -14734,12 +13881,22 @@ msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
 msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+msgid ""
 "iCal\n"
 "Free/Busy"
 msgstr ""
 "iCal\n"
 "Vaba/hõivatud"
 
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
+
 msgid "New Location"
 msgstr "Uus asukoht"
 
@@ -14764,12 +13921,9 @@ msgstr "Plugin, mis laadib teisi Pythonis kirjutatud pluginaid."
 msgid "Python Loader"
 msgstr "Pythoni laadur"
 
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (sisseehitatud)"
-
 #, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin'it ei leitud, kood: %d"
+msgstr "SpamAssassinit ei leitud, kood: %d"
 
 #, c-format
 msgid "Failed to create pipe: %s"
@@ -14781,7 +13935,7 @@ msgstr "Viga pärast fork'i: %s"
 
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin'i lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
+msgstr "SpamAssassini lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
 
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
@@ -14801,40 +13955,14 @@ msgstr "See teeb filtri usaldusväärsemaks, kuid samas ka aeglasemaks"
 msgid "I_nclude remote tests"
 msgstr "_Kaasatakse ka välised testid"
 
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Rämpsposti filtreerimine SpamAssassin'i abil. Selle plugina jaoks on "
-"oluline, et SpamAssassin oleks paigaldatud."
-
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin'i valikud"
-
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin rämpspostiplugin"
-
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Plugin kõigi sõnumi manuste või osade ühekorraga salvestamiseks."
-
-#. the path to the shared library
-msgid "Save attachments"
-msgstr "Manuste salvestamine"
-
-msgid "Save Attachments..."
-msgstr "Salvesta manused..."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Rämpsposti filtreerimine SpamAssassini abil."
 
-msgid "Save all attachments"
-msgstr "Kõikide manuste salvestamine"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin - rämpspostifilter"
 
-msgid "Select save base name"
-msgstr "Salvestamise alusnime valimine"
-
-msgid "MIME Type"
-msgstr "MIME tüüp"
-
-msgid "Save"
-msgstr "Salvesta"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassini valikud"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
@@ -14855,9 +13983,6 @@ msgstr "Kategooriate loend"
 msgid "Comment List"
 msgstr "Kommentaaride loend"
 
-msgid "Created"
-msgstr "Loodud"
-
 msgid "Contact List"
 msgstr "Kontaktide loend"
 
@@ -14900,8 +14025,8 @@ msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 msgid "Save Selected"
 msgstr "Valitu salvestamine"
 
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "Valitud kalendri või ülesannete salvestamine kettale."
+msgid "Save a calendar or task list to disk."
+msgstr "Kalendri või ülesannete salvestamine kettale."
 
 msgid "_Save to Disk"
 msgstr "_Salvesta kettale"
@@ -14920,12 +14045,16 @@ msgstr "RDF vorming (.rdf)"
 msgid "Select destination file"
 msgstr "Sihtfaili valimine"
 
-msgid "Select one source"
-msgstr "Ühe allika valimine"
-
-msgid "Selects a single calendar or task source for viewing."
+#, fuzzy
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
 msgstr "Ühe kalendri või ülesandeallika vaatamiseks valimine."
 
+#, fuzzy
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "Ühe allika valimine"
+
 msgid "Show _only this Calendar"
 msgstr "_Näita ainult seda kalendrit"
 
@@ -14975,10 +14104,8 @@ msgstr "Andmete importimine."
 msgid "Please wait"
 msgstr "Palun oota"
 
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"Lõimede koostamine teema järgi juhuks, kui sõnumeid pole võimalik muul "
-"viisil lõimedesse jaotada."
+msgid "Sort mail message threads by subject."
+msgstr "Jutulõngade koostamine teema järgi."
 
 msgid "Subject Threading"
 msgstr "Jutulõng teema järgi"
@@ -15007,17 +14134,41 @@ msgstr "Salvestamine mallina"
 msgid "Drafts based template plugin"
 msgstr "Mallipluginal põhinevad mustandid"
 
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Lihtne yTNEF'i kasutav plugin, TNEF-manuste lahtikodeerimiseks."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
+
+msgid "TNEF Decoder"
+msgstr "TNEF-lahtikodeerija"
+
+msgid "Inline vCards"
+msgstr "Sõnumisisesed vKaardid"
+
+msgid "Show vCards directly in mail messages."
+msgstr "vKaartide näitamine otse e-post sõnumites."
+
+msgid "Show Full vCard"
+msgstr "Kogu vKaardi kuvamine"
 
-msgid "TNEF Attachment decoder"
-msgstr "TNEF-manuse lahtikodeerija"
+msgid "Show Compact vCard"
+msgstr "Kompaktse vKaardi näitamine"
+
+msgid "There is one other contact."
+msgstr ""
 
-msgid "A plugin to setup WebDAV contacts."
-msgstr "Plugin WebDAV'i kontaktide seadistamiseks."
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Save in Address Book"
+msgstr "Salvesta aadressiraamatusse"
+
+msgid "Add WebDAV contacts to Evolution."
+msgstr "WebDAVi kontaktidd lisamine Evolutioni."
 
 msgid "WebDAV contacts"
-msgstr "WebDAV'i kontaktid"
+msgstr "WebDAVi kontaktid"
 
 msgid "WebDAV"
 msgstr "WebDAV"
@@ -15087,6 +14238,24 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
+#, fuzzy
+#| msgid "Insert Attachment"
+msgid "Initial attachment view"
+msgstr "Manuse lisamine"
+
+#, fuzzy
+#| msgid "Install the shared folder"
+msgid "Initial file chooser folder"
+msgstr "Jagatud kausta paigaldamine"
+
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
@@ -15290,6 +14459,9 @@ msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
+msgid "_Import"
+msgstr "_Impordi"
+
 msgid "Evolution Preferences"
 msgstr "Evolutioni eelistused"
 
@@ -15303,8 +14475,8 @@ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 
 #, c-format
-msgid "Error executing %s."
-msgstr "Viga %s käivitamisel."
+msgid "Error executing %s. (%s)"
+msgstr "Viga %s käivitamisel. (%s)"
 
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
@@ -15371,7 +14543,7 @@ msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
 msgid "Cannot register on OAF"
-msgstr "OAF'i pole võimalik registreerida"
+msgstr "OAF-i pole võimalik registreerida"
 
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
@@ -16620,18 +15792,6 @@ msgstr "_Eelmine lugemata sõnum"
 msgid "Paste messages from the clipboard"
 msgstr "Sõnumite asetamine lõikepuhvrist"
 
-msgid "Pos_t New Message to Folder"
-msgstr "Pos_tita uus sõnum kausta"
-
-msgid "Post a Repl_y"
-msgstr "Postita _vastus"
-
-msgid "Post a message to a Public folder"
-msgstr "Sõnumi postitamine avalikku kausta"
-
-msgid "Post a reply to a message in a Public folder"
-msgstr "Vastuse postitamine avalikku kausta"
-
 msgid "Pr_evious Important Message"
 msgstr "_Eelmine tähtis sõnum"
 
@@ -16908,7 +16068,7 @@ msgid "Send queued items and retrieve new items"
 msgstr "Järjekorras olevate sõnumite ärasaatmine ja uute vastuvõtmine"
 
 msgid "Set up Pilot configuration"
-msgstr "Pilot'i sätete määramine"
+msgstr "Piloti sätete määramine"
 
 msgid "Show Side _Bar"
 msgstr "Näita _külgpaani"
@@ -17133,28 +16293,112 @@ msgstr "Vaate liik"
 msgid "Type of view:"
 msgstr "Vaate liik:"
 
-msgid "Attachment Bar"
-msgstr "Manuseriba"
+msgid "Attached message"
+msgstr "Manustatud sõnum"
+
+#. Translators: Default attachment filename.
+msgid "attachment.dat"
+msgstr "manus.dat"
+
+msgid "A load operation is already in progress"
+msgstr "Laadimine on hetkel käimas"
+
+msgid "A save operation is already in progress"
+msgstr "Salvestamine on hetkel käimas"
+
+#, fuzzy, c-format
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "Aadressiraamatut pole võimalik laadida"
 
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Faili pole võimalik manusesse lisada: %s: %s"
+msgid "Could not load the attachment"
+msgstr "Manust pole võimalik laadida"
+
+#, fuzzy, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "Lähteallika avamine nurjus"
 
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
+msgid "Could not open the attachment"
+msgstr "Manust pole võimalik avada"
+
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "Attachment contents not loaded"
+msgstr "Manuste meeldetuletaja"
+
+#, fuzzy, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "'%s' käivitamine pole võimalik: %s\n"
+
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Manust pole võimalik salvestada"
 
 msgid "Attachment Properties"
 msgstr "Manuse omadused"
 
-msgid "File name:"
-msgstr "Faili nimi:"
+msgid "_Filename:"
+msgstr "_Failinimi:"
+
+msgid "MIME Type:"
+msgstr "MIME-tüüp:"
+
+msgid "Could not set as background"
+msgstr "Tausta pole võimalik määrata"
+
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Manust pole võimalik saata"
+msgstr[1] "Manuseid pole võimalik saata"
+
+#, fuzzy
+#| msgid "Send To:"
+msgid "_Send To..."
+msgstr "Kellele saata:"
+
+msgid "Send the selected attachments somewhere"
+msgstr ""
+
+msgid "Loading"
+msgstr "Laadimine"
 
-msgid "MIME type:"
-msgstr "MIME tüüp:"
+msgid "Saving"
+msgstr "Salvestamine"
+
+msgid "Hide _Attachment Bar"
+msgstr "Peida _manuseriba"
+
+msgid "Show _Attachment Bar"
+msgstr "Näita _manuseriba"
+
+msgid "Add Attachment"
+msgstr ""
+
+msgid "A_ttach"
+msgstr "_Manusta"
 
-msgid "Suggest automatic display of attachment"
-msgstr "Soovitan manust automaatselt kuvada"
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Manuse salvestamine"
+msgstr[1] "Manuste salvestamine"
+
+msgid "S_ave All"
+msgstr "_Salvesta kõik"
+
+msgid "A_dd Attachment..."
+msgstr "_Lisa manus..."
+
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Ava programmiga \"%s\"..."
+
+#, c-format
+msgid "Open this attachment in %s"
+msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 msgid "%B %Y"
@@ -17297,46 +16541,6 @@ msgstr "Vigane kuupäeva väärtus"
 msgid "Invalid Time Value"
 msgstr "Vigane aja väärtus"
 
-msgid "Expanded"
-msgstr "Laiendatud"
-
-msgid "Whether or not the expander is expanded"
-msgstr "Kas laiendaja on laiendatud või mitte"
-
-msgid "Text of the expander's label"
-msgstr "Laiendaja sildi tekst"
-
-msgid "Use underline"
-msgstr "Kasuta allakriipsutust"
-
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Määramise korral tähendab tekstis olev alakriips, et sellest järgnevale "
-"märgile vastav klahv on menemooniline kiirendusklahv"
-
-msgid "Space to put between the label and the child"
-msgstr ""
-
-msgid "Label widget"
-msgstr "Sildividin"
-
-msgid "A widget to display in place of the usual expander label"
-msgstr ""
-
-msgid "Expander Size"
-msgstr "Laiendaja suurus"
-
-msgid "Size of the expander arrow"
-msgstr "Laienduse noole suurus"
-
-msgid "Indicator Spacing"
-msgstr "Indikaatorivahe"
-
-msgid "Spacing around expander arrow"
-msgstr "Ruum laiendaja noole ümber"
-
 #. FIXME: get the toplevel window...
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
@@ -17369,9 +16573,6 @@ msgstr "Sellest kontost"
 msgid "Current Folder"
 msgstr "Sellest kaustast"
 
-msgid "Current Message"
-msgstr "Sellest sõnumist"
-
 msgid "Choose Image"
 msgstr "Vali pilt"
 
@@ -17435,8 +16636,6 @@ msgstr "Tekst"
 msgid "Sho_w: "
 msgstr "_Kategooria: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
 msgid "Sear_ch: "
 msgstr "Ot_sing: "
 
@@ -17544,6 +16743,9 @@ msgstr "_Pärast:"
 msgid "_All information"
 msgstr "_Kogu teave"
 
+msgid "_Classification:"
+msgstr "_Liigitus:"
+
 #. To translators: This means Delay the message delivery for some time
 msgid "_Delay message delivery"
 msgstr "_Viivita kohaletoimetamisega"
@@ -17577,18 +16779,6 @@ msgstr "%s (%d%% valmis)"
 msgid "Click here to go to URL"
 msgstr "URL-i avamiseks klõpsa siin"
 
-msgid "Edit Master Category List..."
-msgstr "Redigeeri peamist kategooriate nimekirja..."
-
-msgid "Item(s) belong to these _categories:"
-msgstr "See kontakt kuulub järgnevatesse _kategooriatesse:"
-
-msgid "_Available Categories:"
-msgstr "_Saadaolevad kategooriad:"
-
-msgid "categories"
-msgstr "kategooriad"
-
 msgid "popup list"
 msgstr "hüpikakende loend"
 
@@ -17697,12 +16887,6 @@ msgstr "_Näita neid välju järjestuses:"
 msgid "_Sort..."
 msgstr "_Sortimine..."
 
-msgid "DnD code"
-msgstr "DnD kood"
-
-msgid "Full Header"
-msgstr "Kogupäis"
-
 msgid "Add a column..."
 msgstr "Veeru lisamine..."
 
@@ -17798,15 +16982,6 @@ msgstr "_Sordi välja järgi"
 msgid "_Custom"
 msgstr "_Kohandatud"
 
-msgid "Font Description"
-msgstr "Kirjatüübi kirjeldus"
-
-msgid "Sort Info"
-msgstr "Sortimisandmed"
-
-msgid "Tree"
-msgstr "Puu"
-
 msgid "Table header"
 msgstr "Tabeli päis"
 
@@ -17816,12 +16991,18 @@ msgstr "Tabeli mudel"
 msgid "Cursor row"
 msgstr "Kursori rida"
 
+msgid "Sort Info"
+msgstr "Sortimisandmed"
+
 msgid "Always search"
 msgstr ""
 
 msgid "Use click to add"
 msgstr "Klõpsa lisamiseks"
 
+msgid "Tree"
+msgstr "Puu"
+
 msgid "ETree table adapter"
 msgstr ""
 
@@ -17831,6 +17012,12 @@ msgstr "Retrovälimus"
 msgid "Draw lines and +/- expanders."
 msgstr "Joonte ning +/- laiendajate joonistamine."
 
+msgid "Expander Size"
+msgstr "Laiendaja suurus"
+
+msgid "Size of the expander arrow"
+msgstr "Laienduse noole suurus"
+
 msgid "Input Methods"
 msgstr "Sisestusmeetodid"
 
@@ -17910,6 +17097,646 @@ msgstr "Välksõnumikontekst"
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Manuseriba sisse- ja väljalülitamine"
+
+#~ msgid "activate"
+#~ msgstr "aktiveerimine"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Liik:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "Lisa aadressiraamat"
+
+#~ msgid "Anonymously"
+#~ msgstr "Anonüümselt"
+
+#~ msgid "Basic"
+#~ msgstr "Peamine"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Eraldusnimi"
+
+#~ msgid "Email address"
+#~ msgstr "E-posti aadress:"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Leia võimalikud otsingupõhjad"
+
+#~ msgid "Search filter"
+#~ msgstr "Otsingufilter"
+
+#~ msgid "Sub"
+#~ msgstr "Kogu alampuu (Sub)"
+
+#~ msgid "Using email address"
+#~ msgstr "E-posti aadressi kasutamine"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Kui võimalik"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "Lisa _aadressiraamat"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Päised iga kirja jaoks"
+
+#~ msgid "Height:"
+#~ msgstr "Kõrgus:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Vahetult üksteise järgi"
+
+#~ msgid "Include:"
+#~ msgstr "Lisa:"
+
+#~ msgid "Landscape"
+#~ msgstr "Rõhtpaigutus"
+
+#~ msgid "Left:"
+#~ msgstr "Vasakul:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Tähenupud küljel"
+
+#~ msgid "Margins"
+#~ msgstr "Veerised"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Tulpade arv:"
+
+#~ msgid "Options"
+#~ msgstr "Valikud"
+
+#~ msgid "Orientation"
+#~ msgstr "Suund"
+
+#~ msgid "Page"
+#~ msgstr "Lehekülg"
+
+#~ msgid "Page Setup:"
+#~ msgstr "Lehekülje sätted:"
+
+#~ msgid "Paper"
+#~ msgstr "Paber"
+
+#~ msgid "Paper source:"
+#~ msgstr "Paberiallikas:"
+
+#~ msgid "Portrait"
+#~ msgstr "Püstpaigutus"
+
+#~ msgid "Preview:"
+#~ msgstr "Eelvaade:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Trükkimisel kasuta halli varjutamist"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Paarisarvulised leheküljed peeglisse"
+
+#~ msgid "Right:"
+#~ msgstr "Paremal:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sektsioonid:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Alusta uuelt leheküljelt"
+
+#~ msgid "Style name:"
+#~ msgstr "Stiili nimi:"
+
+#~ msgid "Top:"
+#~ msgstr "Ülevalt:"
+
+#~ msgid "Width:"
+#~ msgstr "Laius:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Kirjatüüp..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "Kas sündmuste kuvamisel arvestatakse talve- ja suveaja nihkega."
+
+#~ msgid "daylight savings time"
+#~ msgstr "talve- ja suveaja nihe"
+
+#~ msgid "after"
+#~ msgstr "pärast"
+
+#~ msgid "day(s)"
+#~ msgstr "päev(a)"
+
+#~ msgid "end of appointment"
+#~ msgstr "sündmuse lõppu"
+
+#~ msgid "hour(s)"
+#~ msgstr "tund(i)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(it)"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Arvestatakse s_uve- ja talveaja erinevustega"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> fail manusena"
+#~ msgstr[1] "<b>%d</b> faili manusena"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Peida manuseri_ba"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Näita manuseri_ba"
+
+#~ msgid "Show Attachments"
+#~ msgstr "Näita manuseid"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "1 päev enne sündmust"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 tund enne sündmust"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutit enne sündmust"
+
+#~ msgid "for"
+#~ msgstr "kokku"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>_Osalejad</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "_Muuda korraldajat"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "Ko_ntaktid..."
+
+#~ msgid "forever"
+#~ msgstr "igavesti"
+
+#~ msgid "month(s)"
+#~ msgstr "kuu(d)"
+
+#~ msgid "week(s)"
+#~ msgstr "nädal(at)"
+
+#~ msgid "year(s)"
+#~ msgstr "aasta(t)"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_Salvesta valik"
+
+#~ msgid "April"
+#~ msgstr "Aprill"
+
+#~ msgid "August"
+#~ msgstr "August"
+
+#~ msgid "December"
+#~ msgstr "Detsember"
+
+#~ msgid "February"
+#~ msgstr "Veebruar"
+
+#~ msgid "January"
+#~ msgstr "Jaanuar"
+
+#~ msgid "July"
+#~ msgstr "Juuli"
+
+#~ msgid "June"
+#~ msgstr "Juuni"
+
+#~ msgid "March"
+#~ msgstr "Märts"
+
+#~ msgid "May"
+#~ msgstr "Mai"
+
+#~ msgid "November"
+#~ msgstr "November"
+
+#~ msgid "October"
+#~ msgstr "Oktoober"
+
+#~ msgid "September"
+#~ msgstr "September"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "Postita-ku_hu väli"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Postita-kuhu välja kuvamise sisse- või väljalülitamine"
+
+#~ msgid "_Subject Field"
+#~ msgstr "_Teemaväli"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Teemavälja kuvamise sisse- ja väljalülitamine"
+
+#~ msgid "_To Field"
+#~ msgstr "_Kellele väli"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Saaja välja kuvamise sisse- või väljalülitamine"
+
+#~ msgid "ago"
+#~ msgstr "tagasi"
+
+#~ msgid "months"
+#~ msgstr "kuud"
+
+#~ msgid "the current time"
+#~ msgstr "praegune aeg"
+
+#~ msgid "the time you specify"
+#~ msgstr "sinu poolt määratud aeg"
+
+#~ msgid "years"
+#~ msgstr "aastat"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "Sõnumi vastuvõtmine..."
+
+#~ msgid "C_all To..."
+#~ msgstr "_Helista..."
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_Salvesta valitud..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d ma_nus"
+#~ msgstr[1] "%d ma_nust"
+
+#~ msgid "S_ave"
+#~ msgstr "Salves_ta"
+
+#~ msgid "No Attachment"
+#~ msgstr "Manus puudub"
+
+#~ 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 ""
+#~ "Külgribal ettevaatava otsinguvõimaluse lubamine, mille korral teksti "
+#~ "otsimine toimub interaktiivselt. Seda kasutades on võimalik hõlpsasti "
+#~ "leida näiteks kausta, sisestades kausta nime ja see kaust aktiveeritakse "
+#~ "automaatselt."
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Vaade/Pimekoopia menüükirje on märgitud"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Vaade/Pimekoopia menüükirje on märgitud."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Vaade/Koopia menüükirje on märgitud"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Vaade/Koopia menüükirje on märgitud."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Vaade/Kellelt menüükirje on märgitud"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Vaade/Kellelt menüükirje on märgitud."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Vaade/Kellele-vastata menüükirje on märgitud"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Vaade/Kellele-vastata menüükirje on märgitud."
+
+#~ msgid "Inline"
+#~ msgstr "Samal joonel"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "Algse sõnumiga samal joonel (Outlook'i moodi)"
+
+#~ msgid "Quoted"
+#~ msgstr "Tsitaadina"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "S_OCKS-i host:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Mustandite kausta valimine"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Saadetud sõnumite kausta valimine"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "Proksi _automaatseadistuse URL:"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "_Tõstutundlik"
+
+#~ msgid "F_ind:"
+#~ msgstr "Ot_sing:"
+
+#~ msgid "Find in Message"
+#~ msgstr "Otsing sõnumist"
+
+#~ msgid "None Selected"
+#~ msgstr "Ühtegi pole valitud"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Kohalike aadressiraamatute põhitalitluse tagamine."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Manuse olemasolule viitavate võtmesõnade otsimine sõnumist, et kahtluse "
+#~ "korral hoiatada kasutajat manuseta sõnumi väljasaatmise eest"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Vormindusplugin audiomanuste kuvamiseks sõnum osana ja nende esitamiseks "
+#~ "ilma välist esitajat avamata."
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Plugin Evolutioni andmete ja seadistuste varundamiseks ja taastamiseks."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV-i kalendriallikad"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Kohalike kalendrite põhitalitluse tagamine."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP-kalendrid"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Webcal- ja http-kalendrite põhitalitluse tagamine."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Ilmakalendrite põhitalitluse tagamine."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
+#~ "demonstreeriseks."
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Kalendri või aadressiraamatu vaikimisi kalendriks või aadressiraamatuks "
+#~ "märkimise funktsionaalsuse tagamine."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "_Määra postkasti nimi"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "Exchange'i kontole spetsiifiliste toimingute ja võimaluste käsitlemise "
+#~ "plugin."
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "Sõnumite koostamine välise redaktor abil"
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Plugin Google kalendri ja kontaktide seadistamiseks."
+
+#~ msgid "Google sources"
+#~ msgstr "Google allikad"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Plugin GroupWise kalendri- ja kontaktiallikate seadistamiseks."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Plugin Hula kalendriallikate seadistamiseks."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Hula konto sätted"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Plugin IMAP kontode võimaluste jaoks."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "_Impordi kalendrisse"
+
+#~ msgid "Import ICS"
+#~ msgstr "Impordi ICS-i"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "ICS-manuste importimine kalendrisse."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "Valitud ülesande/märkme/kalendri/aadressiraamatu sünkroniseerimine Apple "
+#~ "iPod'iga"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_Ülesanded :"
+
+#~ msgid "Memos :"
+#~ msgstr "Märkmed :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Kontode keelamise võimaldamine."
+
+#~ 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 ""
+#~ "Uue sõnumi saabumisel D-Bus sõnumi genereerimine või kasutaja teavitamine "
+#~ "teavitusala ja -sõnumi abil."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
+#~ "koosolekuid."
+
+#~ msgid "Mail to meeting"
+#~ msgstr "Sõnumi teisendamine koosolekuks"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
+#~ "ülesandeid."
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Kasutatakse kõigi kaustas olevate sõnumite loetuks määramiseks"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Plugin, mille abil teostatakse mono pluginaid."
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Plugin määramaks millised pluginad on lubatud ja millised mitte."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Testplugin, mis demonstreerib HTML-sõnumite keelamise võimalusega "
+#~ "vorminduspluginat.\n"
+#~ "\n"
+#~ "See plugin on mõeldud koodinäiteks ja pole seetõttu toetatud.\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Profileerimisandmete kirjutamine logisse."
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (sisseehitatud)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "Rämpsposti filtreerimine SpamAssassin'i abil. Selle plugina jaoks on "
+#~ "oluline, et SpamAssassin oleks paigaldatud."
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Plugin kõigi sõnumi manuste või osade ühekorraga salvestamiseks."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "Salvesta manused..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "Kõikide manuste salvestamine"
+
+#~ msgid "Select save base name"
+#~ msgstr "Salvestamise alusnime valimine"
+
+#~ msgid "Save"
+#~ msgstr "Salvesta"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr ""
+#~ "Lõimede koostamine teema järgi juhuks, kui sõnumeid pole võimalik muul "
+#~ "viisil lõimedesse jaotada."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Lihtne yTNEF'i kasutav plugin, TNEF-manuste lahtikodeerimiseks."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "Plugin WebDAV'i kontaktide seadistamiseks."
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Pos_tita uus sõnum kausta"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Postita _vastus"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Sõnumi postitamine avalikku kausta"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Vastuse postitamine avalikku kausta"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "Manuseriba"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Faili pole võimalik manusesse lisada: %s: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
+
+#~ msgid "File name:"
+#~ msgstr "Faili nimi:"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME tüüp:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Soovitan manust automaatselt kuvada"
+
+#~ msgid "Expanded"
+#~ msgstr "Laiendatud"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Kas laiendaja on laiendatud või mitte"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Laiendaja sildi tekst"
+
+#~ msgid "Use underline"
+#~ msgstr "Kasuta allakriipsutust"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "Määramise korral tähendab tekstis olev alakriips, et sellest järgnevale "
+#~ "märgile vastav klahv on menemooniline kiirendusklahv"
+
+#~ msgid "Label widget"
+#~ msgstr "Sildividin"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "Indikaatorivahe"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Ruum laiendaja noole ümber"
+
+#~ msgid "Current Message"
+#~ msgstr "Sellest sõnumist"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Redigeeri peamist kategooriate nimekirja..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "See kontakt kuulub järgnevatesse _kategooriatesse:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "_Saadaolevad kategooriad:"
+
+#~ msgid "categories"
+#~ msgstr "kategooriad"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD kood"
+
+#~ msgid "Full Header"
+#~ msgstr "Kogupäis"
+
+#~ msgid "Font Description"
+#~ msgstr "Kirjatüübi kirjeldus"
+
 #~ msgid ""
 #~ "We were unable to open this address book.  This either means you have "
 #~ "entered an incorrect URI, or the LDAP server is unreachable."
@@ -17965,9 +17792,6 @@ msgstr ""
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Aeg ja kulutused"
 
-#~ msgid "VIP"
-#~ msgstr "VIP"
-
 #~ msgid "Waiting"
 #~ msgstr "Ootamine"
 
@@ -17980,9 +17804,6 @@ msgstr ""
 #~ msgid "Please enter user name first."
 #~ msgstr "Palun sisesta esmalt kasutajanimi."
 
-#~ msgid "Error opening the FAQ webpage."
-#~ msgstr "Viga KKK veebilehe avamisel."
-
 #~ msgid "Re_fresh..."
 #~ msgstr "_Värskenda..."
 
diff --git a/po/he.po b/po/he.po
index fcdd2c76bd..2d5124121f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
-"POT-Creation-Date: 2009-05-25 15:58+0000\n"
-"PO-Revision-Date: 2009-05-25 19:59+0200\n"
+"POT-Creation-Date: 2009-06-19 03:43+0000\n"
+"PO-Revision-Date: 2009-06-19 12:12+0200\n"
 "Last-Translator: Mark Krapivner <mark125@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,33 +58,33 @@ msgstr "איש קשר:"
 msgid "evolution minicard"
 msgstr "כרטיסים קטנים של Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:271
 #, fuzzy
 msgid "It has recurrences."
 msgstr "מופע חוזר"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:274
 msgid "It is a meeting."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:280
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "אירוע יומן: הסיכום הוא %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:282
 msgid "Calendar Event: It has no summary."
 msgstr "אירוע יומן: אין סיכום."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:302
 msgid "calendar view event"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:530
 msgid "Grab Focus"
 msgstr "תפוס פוקוס"
 
@@ -155,7 +155,7 @@ msgid "calendar view for one or more days"
 msgstr ""
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:772
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -166,7 +166,7 @@ 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:774
+#: ../calendar/gui/calendar-component.c:775
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-day-view.c:1598
 #: ../calendar/gui/e-week-view-main-item.c:335
@@ -176,9 +176,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
+#: ../calendar/gui/calendar-component.c:777
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:784
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -186,10 +186,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
+#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:809
+#: ../calendar/gui/calendar-component.c:811
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -199,7 +199,7 @@ 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:800
+#: ../calendar/gui/calendar-component.c:801
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-day-view.c:1614
 #: ../calendar/gui/e-week-view-main-item.c:349
@@ -208,7 +208,7 @@ msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "יומן Gnome"
 
@@ -318,7 +318,7 @@ msgstr "%d %B %Y"
 #: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
-msgstr "יומן: מ-%s ועד %s"
+msgstr "יומן: מ־%s ועד %s"
 
 #: ../a11y/widgets/ea-calendar-item.c:338
 #, fuzzy
@@ -388,7 +388,7 @@ msgstr "שגיאה בטעינת ספר הכתובות."
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
-msgstr "שגיאה בשמירת {0} ל-{1}: ‏{2}"
+msgstr "שגיאה בשמירת {0} ל־{1}: ‏{2}"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
@@ -415,7 +415,7 @@ msgstr "גירסת שרת"
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
-msgstr ""
+msgstr "חלק מהאפשרויות לא יעבדו כראוי עם השרת הנוכחי שלך"
 
 #: ../addressbook/addressbook.error.xml.h:21
 #, fuzzy
@@ -523,7 +523,7 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:592
+#: ../addressbook/conduit/address-conduit.c:591
 msgid "Default Sync Address:"
 msgstr "כתובת סנכרון ברירת מחדל:"
 
@@ -560,7 +560,7 @@ msgstr "הגדר את ההשלמה האוטומטית כאן"
 #: ../calendar/gui/calendar-component.c:193
 #: ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../plugins/exchange-operations/exchange-folder.c:583
 msgid "Contacts"
 msgstr "אנשי קשר"
 
@@ -606,10 +606,10 @@ msgstr "Manage your S/MIME certificates here"
 #: ../calendar/gui/migration.c:577
 #: ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:149
-#: ../mail/em-folder-tree-model.c:203
-#: ../mail/em-folder-tree-model.c:205
-#: ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:318
+#: ../mail/em-folder-tree-model.c:192
+#: ../mail/em-folder-tree-model.c:194
+#: ../mail/em-migrate.c:2891
+#: ../mail/mail-component.c:320
 #: ../mail/mail-vfolder.c:217
 #: ../mail/message-list.c:1517
 msgid "On This Computer"
@@ -635,7 +635,7 @@ msgstr "על שרתי LDAP"
 #: ../addressbook/gui/component/addressbook-component.c:135
 #: ../addressbook/gui/component/addressbook-component.c:138
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 #: ../calendar/gui/calendar-component.c:232
 #: ../calendar/gui/calendar-component.c:238
 #: ../calendar/gui/memos-component.c:190
@@ -645,7 +645,7 @@ msgstr "על שרתי LDAP"
 #: ../calendar/gui/migration.c:1099
 #: ../calendar/gui/tasks-component.c:187
 #: ../calendar/gui/tasks-component.c:191
-#: ../mail/em-migrate.c:959
+#: ../mail/em-migrate.c:960
 #: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Personal"
 msgstr "אישי"
@@ -757,7 +757,7 @@ msgid "Details"
 msgstr "פרטים"
 
 #: ../addressbook/gui/component/addressbook-config.c:1033
-#: ../mail/em-folder-browser.c:1026
+#: ../mail/em-folder-browser.c:1024
 msgid "Searching"
 msgstr "מחפש"
 
@@ -772,13 +772,13 @@ msgstr "מאפייני ספר הכתובות"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1109
+#: ../mail/em-migrate.c:1110
 msgid "Migrating..."
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1169
 #, c-format
 msgid "Migrating '%s':"
 msgstr "ממיר את '%s':"
@@ -845,24 +845,24 @@ msgid "Save As vCard..."
 msgstr "שמור בשם..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/calendar-component.c:629
 #: ../calendar/gui/memos-component.c:481
 #: ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_שנה שם..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/e-calendar-table.c:1614
 #: ../calendar/gui/e-calendar-view.c:1833
-#: ../calendar/gui/e-memo-table.c:954
+#: ../calendar/gui/e-memo-table.c:952
 #: ../calendar/gui/memos-component.c:484
 #: ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2052
-#: ../mail/em-folder-view.c:1340
+#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-view.c:1341
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35
@@ -872,10 +872,10 @@ msgid "_Delete"
 msgstr "_מחק"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/calendar-component.c:637
 #: ../calendar/gui/memos-component.c:489
 #: ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2061
+#: ../mail/em-folder-tree.c:2112
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
@@ -898,11 +898,11 @@ msgstr "ניסיון ההזדהות נכשל.\n"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "הכנס סיסמה ל-%s (משתמש %s)"
+msgstr "הכנס סיסמה ל־%s (משתמש %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
+#: ../plugins/google-account-setup/google-source.c:417
 #: ../plugins/publish-calendar/publish-calendar.c:208
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1120,9 +1120,9 @@ msgstr "כרטיסים"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-http/calendar-http.c:278
+#: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-source.c:672
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "דקות"
@@ -1226,9 +1226,9 @@ msgstr "יום _הולדת:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
-msgstr "לוח _שנה:"
+msgstr "יו_מן:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_City:"
@@ -1317,9 +1317,9 @@ msgstr "מי_קוד:"
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
+#: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "שם"
 
@@ -1340,50 +1340,50 @@ msgid "Editable"
 msgstr "ניתן לעריכה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/widgets/eab-contact-display.c:613
 msgid "Skype"
 msgstr "Skype"
 
 #. red
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:958
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../mail/em-migrate.c:959
 msgid "Work"
 msgstr "עבודה"
 
@@ -1575,7 +1575,7 @@ msgstr "עורף אנשי קשר"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:213
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:816
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "בחר..."
@@ -1656,11 +1656,11 @@ 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: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:414
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:872
+#: ../plugins/groupwise-features/junk-settings.c:421
 #: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "דוא\"ל"
@@ -1730,7 +1730,7 @@ msgstr "מקור"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:567
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:554
@@ -1744,9 +1744,9 @@ msgid "Save as vCard..."
 msgstr "שמור בשם..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-table.c:1592
 #: ../calendar/gui/e-calendar-view.c:1811
-#: ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_פתח"
@@ -1801,11 +1801,11 @@ msgid "Cu_t"
 msgstr "ג_זור"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1600
 #: ../calendar/gui/e-calendar-view.c:1818
-#: ../calendar/gui/e-memo-table.c:945
-#: ../mail/em-folder-tree.c:928
-#: ../mail/em-folder-view.c:1325
+#: ../calendar/gui/e-memo-table.c:943
+#: ../mail/em-folder-tree.c:973
+#: ../mail/em-folder-view.c:1326
 #: ../mail/message-list.c:2105
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:40
@@ -1835,7 +1835,7 @@ msgid "Unmatched"
 msgstr "ללא התאמה"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Assistant"
 msgstr "עוזר"
 
@@ -1873,7 +1873,7 @@ msgid "Categories"
 msgstr "קטגוריות"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Company"
 msgstr "חברה"
 
@@ -1922,22 +1922,22 @@ msgid "Journal"
 msgstr "יומן"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Manager"
 msgstr "מנהל"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Mobile Phone"
 msgstr "טלפון סלולרי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Nickname"
 msgstr "כינוי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Note"
 msgstr "הערה"
 
@@ -1966,14 +1966,14 @@ msgid "Radio"
 msgstr "רדיו"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:579
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Spouse"
 msgstr "בן זוג"
 
@@ -2005,8 +2005,8 @@ 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-canvas-vbox.c:83
+#: ../widgets/misc/e-canvas-vbox.c:84
 #: ../widgets/misc/e-reflow.c:1423
 #: ../widgets/misc/e-reflow.c:1424
 #: ../widgets/table/e-table-click-to-add.c:522
@@ -2024,8 +2024,8 @@ 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-canvas-vbox.c:95
+#: ../widgets/misc/e-canvas-vbox.c:96
 #: ../widgets/misc/e-reflow.c:1431
 #: ../widgets/misc/e-reflow.c:1432
 #: ../widgets/table/e-table-click-to-add.c:529
@@ -2154,7 +2154,7 @@ msgid "_Open Link in Browser"
 msgstr "_פתח את הקישור בדפדפן"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2733
+#: ../mail/em-folder-view.c:2698
 msgid "_Copy Link Location"
 msgstr "_העתק את מיקום הקישור"
 
@@ -2181,27 +2181,27 @@ msgid "map"
 msgstr "מפה"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:839
 msgid "List Members"
 msgstr "רשימת חברים"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Department"
 msgstr "מחלקה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Profession"
 msgstr "מקצוע"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Position"
 msgstr "עמדה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
 msgid "Video Chat"
 msgstr "שיחת וידאו"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/gnome-cal.c:2523
@@ -2216,55 +2216,55 @@ msgstr "שיחת וידאו"
 msgid "Calendar"
 msgstr "יומן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "פנוי/עסוק"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Phone"
 msgstr "טלפון"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Fax"
 msgstr "פקס"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Address"
 msgstr "כתובת"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Home Page"
 msgstr "דף הבית"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Web Log"
 msgstr "יומן רשת"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 #: ../calendar/gui/e-calendar-view.c:2587
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 #: ../calendar/gui/e-calendar-view.c:2588
 msgid "Anniversary"
 msgstr "יום שנה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:857
 msgid "Job Title"
 msgstr "כותרת תפקיד"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:893
 msgid "Home page"
 msgstr "דף הבית"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:901
 msgid "Blog"
-msgstr "ב-לוג"
+msgstr "בלוג"
 
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:58
@@ -2320,9 +2320,9 @@ msgstr "פרוטוקול לא נתמך"
 #: ../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:664
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:662
+#: ../calendar/gui/print.c:2571
 msgid "Canceled"
 msgstr "בוטל"
 
@@ -2558,11 +2558,11 @@ msgstr "תצוגת כרטיסים"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687
 #: ../shell/shell.error.xml.h:7
 msgid "Importing..."
-msgstr "מייבא..."
+msgstr "מיבא..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
@@ -2606,8 +2606,8 @@ msgstr "vCard (.vcf, .gcrd)"
 msgid "Evolution vCard Importer"
 msgstr "Evolution לא יכולה להתחיל."
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:690
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "לא ניתן לפתוח קובץ"
@@ -2817,11 +2817,11 @@ msgstr "אל _תשלח"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr ""
+msgstr "מתבצעת כרגע הורדה. האם ברצונך לשמור את הפגישה?"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+msgstr "מתבצעת כרגע הורדה. האם ברצונך לשמור את המשימה?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
@@ -2854,15 +2854,15 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr ""
+msgstr "במידה ולא תשלח התרעת ביטול, יתכן שהמשתתפים האחרים לא ידעו שהישיבה בוטלה."
 
 #: ../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 ""
+msgstr "במידה ולא תשלח התרעת ביטול, יתכן שהמשתתפים האחרים לא ידעו שהתזכורת נמחקה."
 
 #: ../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 ""
+msgstr "במידה ולא תשלח התרעת ביטול, יתכן שהמשתתפים האחרים לא ידעו שהמשימה נמחקה."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "No response from the server."
@@ -2882,27 +2882,27 @@ msgstr "שמור משימה"
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr ""
+msgstr "שליחת מידע עדכני מאפשר למשתתפים האחרים לשמור על היומנים שלהם מעודכנים."
 
 #: ../calendar/calendar.error.xml.h:53
 msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr ""
+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 ""
+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 ""
+msgstr "חלק מהתצריפים כרגע בתהליך הורדה. שמירת המשימה תגרום לאיבוד התצריפים."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr ""
+msgstr "יתכן חלק מהאפשרויות לא יתפקדו כראוי עם השרת הנוכחי שלך."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr ""
+msgstr "היומן של Evolution נסגר באופן בלתי צפוי."
 
 #: ../calendar/calendar.error.xml.h:59
 #, fuzzy
@@ -2916,7 +2916,7 @@ msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr ""
+msgstr "המשימות של Evolution נסגר באופן בלתי צפוי."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
@@ -2933,7 +2933,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "היומן יוסר לצמיתות."
 
 #: ../calendar/calendar.error.xml.h:66
 #, fuzzy
@@ -2942,7 +2942,7 @@ msgstr "ספר הכתובות לא יכל להיפתח."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "רשימת המשימות תוסר לצמיתות."
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Unable to load the calendar"
@@ -2950,17 +2950,15 @@ msgstr "נכשל בטעינת יומן"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
-msgstr ""
+msgstr "האם ברצונך לשמור את השינויים לפגישה?"
 
 #: ../calendar/calendar.error.xml.h:70
-#, fuzzy
 msgid "Would you like to save your changes to this memo?"
-msgstr "האם ברצונך לשמור את השינויים שלך?"
+msgstr "האם ברצונך לשמור את השינויים שלך לתזכורת?"
 
 #: ../calendar/calendar.error.xml.h:71
-#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr "האם ברצונך לשמור את השינויים שלך?"
+msgstr "האם ברצונך לשמור את השינויים שלך למשימה?"
 
 #: ../calendar/calendar.error.xml.h:72
 #, fuzzy
@@ -2969,54 +2967,51 @@ msgstr "האם ברצונך לשמור את השינויים שלך?"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
+msgstr "האם ברצונך לשלוח לכל המשתתפים התרעת ביטול?"
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgstr "האם ברצונך לשלוח למשתתפים הזמנה לישיבה?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
-msgstr ""
+msgstr "האם ברצונך לשלוח את המשימה למשתתפים?"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgstr "האם ברצונך לשלוח נתוני עדכניים על הישיבה למשתתפים?"
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
+msgstr "האם ברצונך לשלוח נתוני עדכניים על המשימה למשתתפים?"
 
 #: ../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 ""
+msgstr "אתה מתחבר אל שרת GroupWise שלא נתמך ויתכן שתיתקל בבעיות במהלך השימוש ב־Evolution. עבור התוצאות הטובות ביותר, יש לעדכן את השרת לגרסה נתמכת."
 
 #: ../calendar/calendar.error.xml.h:79
-#, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
+msgstr "ביצעת שינויים לפגישה זו, אך עוד לא שמרת אותם."
 
 #: ../calendar/calendar.error.xml.h:80
-#, fuzzy
 msgid "You have changed this task, but not yet saved it."
-msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
+msgstr "ביצעת שינויים למשימה זו, אך עוד לא שמרת אותם."
 
 #: ../calendar/calendar.error.xml.h:81
-#, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
+msgstr "ביצעת שינויים לתזכורת זו, אך עוד לא שמרת אותם."
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
+msgstr "היומנים שלך לא יהיו זמינים עד להפעלה מחדש של Evolution."
 
 #: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
+msgstr "התזכורות שלך לא יהיו זמינים עד להפעלה מחדש של Evolution."
 
 #: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
+msgstr "המשימות שלך לא יהיו זמינים עד להפעלה מחדש של Evolution."
 
 #: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
@@ -3051,27 +3046,27 @@ msgstr "{0}."
 msgid "Split Multi-Day Events:"
 msgstr "פיצול אירועים רב־יומיים:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
 #: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/memo/memo-conduit.c:809
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
 #: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/memo/memo-conduit.c:811
 #: ../calendar/conduits/todo/todo-conduit.c:1009
+#: ../calendar/conduits/todo/todo-conduit.c:1010
 msgid "Could not start evolution-data-server"
 msgstr "לא ניתן להתחיל את evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1622
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:903
-#: ../calendar/conduits/memo/memo-conduit.c:906
+#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:907
 msgid "Could not read pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:950
-#: ../calendar/conduits/memo/memo-conduit.c:953
+#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:954
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 
@@ -3079,13 +3074,13 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "עדיפות ברירת מחדל:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1092
-#: ../calendar/conduits/todo/todo-conduit.c:1095
+#: ../calendar/conduits/todo/todo-conduit.c:1093
+#: ../calendar/conduits/todo/todo-conduit.c:1096
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:1137
-#: ../calendar/conduits/todo/todo-conduit.c:1140
+#: ../calendar/conduits/todo/todo-conduit.c:1138
+#: ../calendar/conduits/todo/todo-conduit.c:1141
 msgid "Could not write pilot's ToDo application block"
 msgstr ""
 
@@ -3095,8 +3090,8 @@ msgid "Calendar and Tasks"
 msgstr "יומן ומשימות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1241
+#: ../calendar/gui/calendar-component.c:820
+#: ../calendar/gui/calendar-component.c:1242
 msgid "Calendars"
 msgstr "יומנים"
 
@@ -3137,7 +3132,7 @@ msgid "Memo_s"
 msgstr "_תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293
+#: ../calendar/gui/e-memo-table.c:291
 #: ../calendar/gui/e-memos.c:1132
 #: ../calendar/gui/gnome-cal.c:1821
 #: ../calendar/gui/memos-component.c:566
@@ -3148,18 +3143,18 @@ msgid "Memos"
 msgstr "תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/e-calendar-table.c:723
 #: ../calendar/gui/e-tasks.c:1436
 #: ../calendar/gui/gnome-cal.c:1689
-#: ../calendar/gui/print.c:1988
+#: ../calendar/gui/print.c:1991
 #: ../calendar/gui/tasks-component.c:558
 #: ../calendar/gui/tasks-component.c:880
 #: ../calendar/gui/tasks-control.c:528
 #: ../calendar/gui/tasks-control.c:544
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
+#: ../calendar/importers/icalendar-importer.c:751
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/exchange-operations/exchange-folder.c:590
 #: ../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
@@ -3168,7 +3163,7 @@ msgstr "משימות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
-msgstr "_לוחות שנה"
+msgstr "_יומנים"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
@@ -3191,9 +3186,9 @@ msgstr[1] "דקות"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:22
 #: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-source.c:673
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
@@ -3216,10 +3211,10 @@ msgstr "שחרר הכל"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 #: ../calendar/gui/e-itip-control.c:1165
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1024
 msgid "Location:"
 msgstr "מיקום:"
 
@@ -3232,7 +3227,7 @@ msgid "_Dismiss"
 msgstr "_שחרר"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1019
+#: ../calendar/gui/dialogs/comp-editor.c:1029
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11
 #: ../mail/mail-config.glade.h:168
@@ -3256,32 +3251,32 @@ msgstr "_נודניק"
 msgid "location of appointment"
 msgstr "מיקום הפגישה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
 msgid "No summary available."
 msgstr "אין סיכום זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No description available."
 msgstr "אין תיאור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No location information available."
 msgstr "אין מידע מיקום זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1527
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
 #, c-format
 msgid "You have %d alarms"
 msgstr "יש לך %d התרעות"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3289,7 +3284,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -3299,7 +3294,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
 msgid "Do not ask me about this program again."
 msgstr "אל תשאל אותי על תוכנה זאת שוב."
 
@@ -3824,7 +3819,7 @@ msgstr "פגישות פעילות"
 #: ../calendar/gui/cal-search-bar.c:706
 #, fuzzy
 msgid "Next 7 Days' Appointments"
-msgstr "פגישה לכל ה_יום"
+msgstr "פגישות לשבוע הקרוב"
 
 #: ../calendar/gui/calendar-commands.c:90
 #: ../ui/evolution-addressbook.xml.h:26
@@ -3845,9 +3840,9 @@ msgstr ""
 
 #: ../calendar/gui/calendar-commands.c:326
 #: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-source.c:674
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -3873,99 +3868,99 @@ msgstr "מזג אויר"
 #: ../calendar/gui/calendar-component.c:291
 #: ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
-msgstr "ימי הולדת ו-\tימי שנה"
+msgstr "ימי הולדת וימי שנה"
 
-#: ../calendar/gui/calendar-component.c:626
+#: ../calendar/gui/calendar-component.c:627
 msgid "_New Calendar"
 msgstr "יומן _חדש"
 
-#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/calendar-component.c:628
 #: ../calendar/gui/memos-component.c:480
 #: ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2098
 msgid "_Copy..."
 msgstr "ה_עתק..."
 
-#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/calendar-component.c:633
 #: ../calendar/gui/memos-component.c:485
 #: ../calendar/gui/tasks-component.c:477
 #, fuzzy
 msgid "_Make available for offline use"
 msgstr "התחל במצב לא מקוון"
 
-#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/calendar-component.c:634
 #: ../calendar/gui/memos-component.c:486
 #: ../calendar/gui/tasks-component.c:478
 #, fuzzy
 msgid "_Do not make available for offline use"
 msgstr "התחל במצב לא מקוון"
 
-#: ../calendar/gui/calendar-component.c:963
+#: ../calendar/gui/calendar-component.c:964
 msgid "Failed upgrading calendars."
 msgstr "נכשל בשדרוג יומנים."
 
-#: ../calendar/gui/calendar-component.c:1092
+#: ../calendar/gui/calendar-component.c:1093
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "לא ניתן לפתוח את היומן '%s' ליצירת אירועים ופגישות"
 
-#: ../calendar/gui/calendar-component.c:1108
+#: ../calendar/gui/calendar-component.c:1109
 msgid "There is no calendar available for creating events and meetings"
 msgstr "אין יומן זמין ליצירת אירועים וישיבות"
 
-#: ../calendar/gui/calendar-component.c:1221
+#: ../calendar/gui/calendar-component.c:1222
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1437
+#: ../calendar/gui/calendar-component.c:1438
 msgid "New appointment"
 msgstr "פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1438
+#: ../calendar/gui/calendar-component.c:1439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/calendar-component.c:1439
+#: ../calendar/gui/calendar-component.c:1440
 msgid "Create a new appointment"
 msgstr "צור פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1445
+#: ../calendar/gui/calendar-component.c:1446
 msgid "New meeting"
 msgstr "ישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1446
+#: ../calendar/gui/calendar-component.c:1447
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_ישיבה"
 
-#: ../calendar/gui/calendar-component.c:1447
+#: ../calendar/gui/calendar-component.c:1448
 msgid "Create a new meeting request"
 msgstr "צור בקשה לישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1453
+#: ../calendar/gui/calendar-component.c:1454
 msgid "New all day appointment"
 msgstr "פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1454
+#: ../calendar/gui/calendar-component.c:1455
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "פגישה לכל ה_יום"
 
-#: ../calendar/gui/calendar-component.c:1455
+#: ../calendar/gui/calendar-component.c:1456
 msgid "Create a new all-day appointment"
 msgstr "צור פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1462
 msgid "New calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_יומן"
 
-#: ../calendar/gui/calendar-component.c:1463
+#: ../calendar/gui/calendar-component.c:1464
 msgid "Create a new calendar"
 msgstr "צור יומן חדש"
 
@@ -4002,7 +3997,7 @@ msgstr "תצריפים"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
-msgstr "משימה מוקצית - %s"
+msgstr "משתתף"
 
 #: ../calendar/gui/caltypes.xml.h:5
 #: ../calendar/gui/memotypes.xml.h:4
@@ -4018,7 +4013,7 @@ msgstr "סיווג"
 #: ../calendar/gui/caltypes.xml.h:7
 #: ../calendar/gui/e-cal-list-view.c:248
 #: ../calendar/gui/e-cal-model.c:352
-#: ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-calendar-table.c:566
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Confidential"
@@ -4071,7 +4066,7 @@ msgstr "_ארגון:"
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.c:247
 #: ../calendar/gui/e-cal-model.c:350
-#: ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "פרטי"
@@ -4080,7 +4075,7 @@ msgstr "פרטי"
 #: ../calendar/gui/e-cal-list-view.c:246
 #: ../calendar/gui/e-cal-model.c:341
 #: ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566
+#: ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ציבורי"
@@ -4240,7 +4235,6 @@ msgid "extra times every"
 msgstr ""
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-#, fuzzy
 msgid ""
 "minute(s)\n"
 "hour(s)\n"
@@ -4261,11 +4255,12 @@ msgstr ""
 "ימים"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-#, fuzzy
 msgid ""
 "start of appointment\n"
 "end of appointment"
-msgstr "תחילת הפגישה"
+msgstr ""
+"תחילת הפגישה\n"
+"סיום הפגישה"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -4297,11 +4292,11 @@ msgstr "צרף קבצים"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/event-page.c:2968
 #: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-day-view-time-item.c:789
 #: ../calendar/gui/e-itip-control.c:1151
 #: ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:704
-#: ../mail/em-account-editor.c:1432
+#: ../mail/em-account-editor.c:705
+#: ../mail/em-account-editor.c:1434
 #: ../mail/em-account-prefs.c:438
 #: ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
@@ -4510,9 +4505,8 @@ msgid "Tuesday"
 msgstr "יום שלישי"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#, fuzzy
 msgid "Use s_ystem time zone"
-msgstr "Show the \"Preview\" pane"
+msgstr "שימוש באזור הזמן של המ_ערכת"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 #: ../calendar/gui/dialogs/recurrence-page.c:1105
@@ -4701,137 +4695,133 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "שגיאת וידוא: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:190
+#: ../calendar/gui/print.c:2372
 msgid " to "
 msgstr " אל "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:194
+#: ../calendar/gui/print.c:2376
 msgid " (Completed "
 msgstr " (הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:196
+#: ../calendar/gui/print.c:2378
 msgid "Completed "
 msgstr "הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:201
+#: ../calendar/gui/print.c:2383
 msgid " (Due "
 msgstr " (עד "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:203
+#: ../calendar/gui/print.c:2385
 msgid "Due "
 msgstr "עד "
 
-#: ../calendar/gui/dialogs/comp-editor.c:245
-#: ../calendar/gui/dialogs/comp-editor.c:2676
-#: ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-msgid "attachment"
-msgstr "תצריף"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "לא ניתן לשמור התצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:474
+#: ../calendar/gui/dialogs/comp-editor.c:484
 msgid "Could not update object"
 msgstr "לא ניתן לעדכן אובייקט"
 
-#: ../calendar/gui/dialogs/comp-editor.c:563
+#: ../calendar/gui/dialogs/comp-editor.c:573
 msgid "Edit Appointment"
 msgstr "ערוך פגישה"
 
 # c-format
-#: ../calendar/gui/dialogs/comp-editor.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:580
 #, c-format
 msgid "Meeting - %s"
 msgstr "ישיבה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:582
 #, c-format
 msgid "Appointment - %s"
 msgstr "פגישה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:578
+#: ../calendar/gui/dialogs/comp-editor.c:588
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:590
 #, c-format
 msgid "Task - %s"
 msgstr "משימה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:585
+#: ../calendar/gui/dialogs/comp-editor.c:595
 #, c-format
 msgid "Memo - %s"
 msgstr "תזכורת - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:601
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "No Summary"
 msgstr "אין סיכום"
 
-#: ../calendar/gui/dialogs/comp-editor.c:743
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "Keep original item?"
 msgstr "להשאיר את הפריט המקורי?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:959
 msgid "Click here to close the current window"
-msgstr "הקלק אישור לסגור את החיבור ולעבוד בצורה לא מקוונת"
+msgstr "לחת כאן כדי לסגור את החלון הנוכחי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:963
+#: ../calendar/gui/dialogs/comp-editor.c:973
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:970
+#: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Click here to view help available"
 msgstr "לחץ כאן כדי לצפות בעזרה הזמינה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:987
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "Click here to save the current window"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 msgid "Select all text"
 msgstr "בחר את כל הטקסט"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012
+#: ../calendar/gui/dialogs/comp-editor.c:1022
 msgid "_Classification"
 msgstr "_סיווג"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 #: ../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:1033
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 #: ../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:1040
+#: ../calendar/gui/dialogs/comp-editor.c:1050
 msgid "_Insert"
 msgstr "_הכנס"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1047
+#: ../calendar/gui/dialogs/comp-editor.c:1057
 msgid "_Options"
 msgstr "א_פשרויות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1054
-#: ../mail/em-folder-tree.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1064
+#: ../mail/em-folder-tree.c:2090
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
@@ -4840,107 +4830,113 @@ msgstr "א_פשרויות"
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1074
 #: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_תצריף..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "Click here to attach a file"
 msgstr "לחץ כאן לצרף קובץ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "_Categories"
 msgstr "_קטגוריות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "Toggles whether to display categories"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Time _Zone"
 msgstr "אזור _זמן"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1094
 msgid "Toggles whether the time zone is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Pu_blic"
 msgstr "_ציבורי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as public"
 msgstr "סווג כציבורי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "_Private"
 msgstr "_פרטי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Classify as private"
 msgstr "סווג כפרטי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Confidential"
 msgstr "_חסוי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Classify as confidential"
 msgstr "סווג כחסוי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 #, fuzzy
 msgid "R_ole Field"
 msgstr "שדה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the Role field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Toggles whether the RSVP field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 #, fuzzy
 msgid "_Status Field"
 msgstr "_מצב:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Toggles whether the Status field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 #, fuzzy
 msgid "_Type Field"
 msgstr "שדה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1167
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "מסמכים _אחרונים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1593
+#: ../calendar/gui/dialogs/comp-editor.c:1603
 #: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "צרף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1905
-#: ../calendar/gui/dialogs/comp-editor.c:2707
+#: ../calendar/gui/dialogs/comp-editor.c:1866
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2765
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2736
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../mail/em-utils.c:373
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "תצריף"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2794
 msgid "Unable to use current version!"
 msgstr "לא ניתן להשתמש בגירסה הנוכחית"
 
@@ -4978,19 +4974,19 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
+msgstr "לא ניתן למחוק את האירוע בגלל שהגישה נדחתה"
 
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
-msgstr ""
+msgstr "לא ניתן למחוק את המשימה בגלל שהגישה נדחתה"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
-msgstr ""
+msgstr "לא ניתן למחוק את התזכורת בגלל שהגישה נדחתה"
 
 #: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
+msgstr "לא ניתן למחוק את הפריט בגלל שהגישה נדחתה"
 
 #: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
@@ -5039,7 +5035,7 @@ msgstr ""
 
 #: ../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
+#: ../plugins/groupwise-features/send-options.c:213
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "אפשרויות שליחה"
@@ -5265,21 +5261,21 @@ msgid ""
 msgstr "עד"
 
 #: ../calendar/gui/dialogs/memo-editor.c:111
-#: ../calendar/gui/print.c:2485
+#: ../calendar/gui/print.c:2492
 msgid "Memo"
 msgstr "תזכורת"
 
 #: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "לא ניתן לפתוח תזכורות ב-'%s'."
+msgstr "לא ניתן לפתוח תזכורות ב־'%s'."
 
 #: ../calendar/gui/dialogs/memo-page.c:1012
 #: ../mail/em-format-html.c:1567
 #: ../mail/em-format-html.c:1625
 #: ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:923
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77
 #: ../mail/message-list.etspec.h:20
 msgid "To"
@@ -5303,7 +5299,7 @@ msgstr "_קבוצה:"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
+msgstr "אתה משנה אירוע שחוזר על עצמו. מה תרצה לשנות?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
@@ -5313,12 +5309,12 @@ msgstr ""
 #: ../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:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr ""
+msgstr "אתה משנה תזכורת שחוזרת על עצמה. מה תרצה לשנות?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
@@ -5607,7 +5603,7 @@ msgstr "תאריך היעד שגוי"
 #: ../calendar/gui/dialogs/task-page.c:1767
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "לא ניתן לפתוח משימות ב-'%s'."
+msgstr "לא ניתן לפתוח משימות ב־'%s'."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -5643,56 +5639,56 @@ msgstr[1] "%d שבועות"
 
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
-msgstr ""
+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:476
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr ""
+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:481
 #, c-format
 msgid "%s %s after the start of the appointment"
-msgstr ""
+msgstr "‏%s %s אחרי התחלת הפגישה"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
-msgstr ""
+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:499
 #, c-format
 msgid "%s %s before the end of the appointment"
-msgstr ""
+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:504
 #, c-format
 msgid "%s %s after the end of the appointment"
-msgstr ""
+msgstr "‏%s %s אחרי סיום הפגישה"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr ""
+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:535
 #, c-format
 msgid "%s at %s"
-msgstr ""
+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
@@ -5702,24 +5698,20 @@ msgid "%s for an unknown trigger type"
 msgstr ""
 
 #: ../calendar/gui/e-attachment-handler-calendar.c:258
-#, fuzzy
 msgid "I_mport"
-msgstr "_יבא"
+msgstr "י_בוא"
 
 #: ../calendar/gui/e-attachment-handler-calendar.c:340
-#, fuzzy
 msgid "Select a Calendar"
-msgstr "בחר לוח שנה"
+msgstr "בחר יומן"
 
 #: ../calendar/gui/e-attachment-handler-calendar.c:367
-#, fuzzy
 msgid "Select a Task List"
-msgstr "משימות"
+msgstr "בחר רשימת משימות"
 
 #: ../calendar/gui/e-attachment-handler-calendar.c:377
-#, fuzzy
 msgid "I_mport to Calendar"
-msgstr "יבא ליומן"
+msgstr "יי_בא ללוח השנה"
 
 #: ../calendar/gui/e-attachment-handler-calendar.c:384
 #, fuzzy
@@ -5728,7 +5720,7 @@ msgstr "_יבא למשימות"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
 #: ../calendar/gui/e-cal-component-preview.c:67
-#: ../mail/em-folder-view.c:3249
+#: ../mail/em-folder-view.c:3214
 #, c-format
 msgid "Click to open %s"
 msgstr "לחץ כדי לפתוח את %s"
@@ -5737,7 +5729,7 @@ msgstr "לחץ כדי לפתוח את %s"
 #: ../calendar/gui/e-cal-component-preview.c:171
 #: ../filter/filter-rule.c:859
 msgid "Untitled"
-msgstr "ללא-שם"
+msgstr "ללא שם"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:181
 #: ../calendar/gui/e-cal-component-preview.c:211
@@ -5773,7 +5765,7 @@ msgstr "תאריך יעד:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1179
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Status:"
 msgstr "מצב:"
 
@@ -5781,9 +5773,9 @@ msgstr "מצב:"
 #: ../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:662
-#: ../calendar/gui/print.c:2558
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:660
+#: ../calendar/gui/print.c:2565
 msgid "In Progress"
 msgstr "בתהליך"
 
@@ -5792,12 +5784,12 @@ msgstr "בתהליך"
 #: ../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:663
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:661
 #: ../calendar/gui/e-itip-control.c:939
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561
+#: ../calendar/gui/print.c:2568
 #: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
@@ -5806,9 +5798,9 @@ msgstr "הסתיים"
 #: ../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:661
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:659
+#: ../calendar/gui/print.c:2562
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "לא התחיל"
@@ -5818,7 +5810,7 @@ msgid "Priority:"
 msgstr "עדיפות:"
 
 #: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/e-calendar-table.c:586
 #: ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1065
 msgid "High"
@@ -5826,14 +5818,14 @@ msgstr "גבוה"
 
 #: ../calendar/gui/e-cal-component-preview.c:268
 #: ../calendar/gui/e-cal-model.c:1058
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:587
 #: ../calendar/gui/tasktypes.xml.h:17
 #: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "רגיל"
 
 #: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:588
 #: ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1063
 msgid "Low"
@@ -5863,12 +5855,12 @@ msgid "Start Date"
 msgstr "תאריך התחלה"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:638
 msgid "Free"
 msgstr "פנוי"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/e-calendar-table.c:639
 #: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Busy"
 msgstr "עסוק"
@@ -5885,7 +5877,7 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029
 #: ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152
 #: ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:745
@@ -5895,7 +5887,7 @@ msgstr "כן"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029
 #: ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
@@ -5905,13 +5897,13 @@ msgstr "לא"
 #: ../calendar/gui/e-cal-model.c:354
 #: ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../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
+#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002
 #: ../mail/em-utils.c:1342
 #: ../plugins/itip-formatter/itip-formatter.c:448
 #: ../plugins/itip-formatter/itip-formatter.c:2217
@@ -5928,12 +5920,12 @@ msgstr "חוזר"
 msgid "Assigned"
 msgstr "מוקצה"
 
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* אין סיכום *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
+#: ../calendar/gui/e-calendar-table.c:370
 #: ../calendar/gui/e-calendar-view.c:2436
 #, fuzzy, c-format
 msgid "Organizer: %s <%s>"
@@ -5941,116 +5933,116 @@ msgstr "_ארגון:"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
+#: ../calendar/gui/e-calendar-table.c:373
 #: ../calendar/gui/e-calendar-view.c:2440
 #, fuzzy, c-format
 msgid "Organizer: %s"
 msgstr "_ארגון:"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "התחלה:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 #, fuzzy
 msgid "Due: "
 msgstr "עד "
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:589
 #: ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
+#: ../calendar/gui/e-calendar-table.c:898
 #: ../calendar/gui/e-calendar-view.c:658
-#: ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-memo-table.c:450
 msgid "Deleting selected objects"
 msgstr "מוחק את האובייקטים שנבחרו"
 
-#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-table.c:1177
 #: ../calendar/gui/e-calendar-view.c:872
-#: ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-memo-table.c:655
 msgid "Updating objects"
 msgstr "מעדכן אובייקטים"
 
-#: ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-table.c:1365
 #: ../calendar/gui/e-calendar-view.c:1334
-#: ../calendar/gui/e-memo-table.c:833
+#: ../calendar/gui/e-memo-table.c:831
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "שמירה בשם..."
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1589
 #: ../calendar/gui/e-calendar-view.c:1794
 msgid "New _Task"
 msgstr "משימה _חדשה"
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-memo-table.c:936
 msgid "Open _Web Page"
 msgstr "פתח _דף מארג"
 
-#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-table.c:1594
 #: ../calendar/gui/e-calendar-view.c:1812
-#: ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-memo-table.c:937
+#: ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_שמירה בשם..."
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1595
 #: ../calendar/gui/e-calendar-view.c:1797
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:938
 msgid "P_rint..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-calendar-table.c:1599
 #: ../calendar/gui/e-calendar-view.c:1817
-#: ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-memo-table.c:942
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -6058,10 +6050,10 @@ msgstr "ה_דפס..."
 msgid "C_ut"
 msgstr "_גזור"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1601
 #: ../calendar/gui/e-calendar-view.c:1800
 #: ../calendar/gui/e-calendar-view.c:1819
-#: ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-memo-table.c:944
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19
@@ -6069,39 +6061,39 @@ msgstr "_גזור"
 msgid "_Paste"
 msgstr "ה_דבק"
 
-#: ../calendar/gui/e-calendar-table.c:1607
+#: ../calendar/gui/e-calendar-table.c:1605
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_הקצה משימה"
 
-#: ../calendar/gui/e-calendar-table.c:1608
-#: ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1606
+#: ../calendar/gui/e-memo-table.c:948
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_העבר כ־iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark as Complete"
 msgstr "סמן כה_סתיים"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_סימון המשימות הנבחרות כמשימות שהושלמו"
 
-#: ../calendar/gui/e-calendar-table.c:1611
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark as Incomplete"
 msgstr "סמן כ_לא הסתיים"
 
-#: ../calendar/gui/e-calendar-table.c:1612
+#: ../calendar/gui/e-calendar-table.c:1610
 #, fuzzy
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "העבר את ההודעות שנבחרו לאשפה"
 
-#: ../calendar/gui/e-calendar-table.c:1617
+#: ../calendar/gui/e-calendar-table.c:1615
 msgid "_Delete Selected Tasks"
 msgstr "_מחק את המשימות הנבחרות"
 
-#: ../calendar/gui/e-calendar-table.c:1854
+#: ../calendar/gui/e-calendar-table.c:1852
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "‏לחץ כאן כדי להוסיף משימה"
@@ -6137,7 +6129,7 @@ msgstr "תאריך התחלה"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-list-view.c:604
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/em-filter-i18n.h:72
@@ -6209,7 +6201,7 @@ msgstr "ה_שב"
 
 #: ../calendar/gui/e-calendar-view.c:1829
 #: ../mail/e-attachment-handler-mail.c:140
-#: ../mail/em-folder-view.c:1330
+#: ../mail/em-folder-view.c:1331
 #: ../mail/em-popup.c:499
 #: ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
@@ -6230,7 +6222,7 @@ msgstr "מחק את _כל המופעים"
 
 #: ../calendar/gui/e-calendar-view.c:2291
 #: ../calendar/gui/e-itip-control.c:1184
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:195
 #: ../plugins/itip-formatter/itip-formatter.c:2205
@@ -6239,7 +6231,7 @@ msgstr "התקבל"
 
 #: ../calendar/gui/e-calendar-view.c:2292
 #: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../calendar/gui/e-meeting-store.c:197
 #: ../plugins/itip-formatter/itip-formatter.c:2211
@@ -6247,7 +6239,7 @@ msgid "Declined"
 msgstr "נדחה"
 
 #: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176
 #: ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/e-meeting-time-sel.c:396
@@ -6255,7 +6247,7 @@ msgid "Tentative"
 msgstr ""
 
 #: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:201
 #: ../plugins/itip-formatter/itip-formatter.c:2214
@@ -6269,7 +6261,7 @@ msgstr "בחר מיקום"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2456
-#: ../calendar/gui/print.c:2517
+#: ../calendar/gui/print.c:2524
 #, c-format
 msgid "Location: %s"
 msgstr "_מיקום: %s"
@@ -6296,17 +6288,19 @@ msgid ""
 "The date must be entered in the format: \n"
 "%s"
 msgstr ""
+"התאריך חייב להיות במבנה: \n"
+"%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * 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:750
+#: ../calendar/gui/e-day-view-time-item.c:751
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:772
 #, fuzzy
 msgid "Show the second time zone"
 msgstr "Show the \"Preview\" pane"
@@ -6320,29 +6314,29 @@ msgstr "Show the \"Preview\" pane"
 #: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-day-view.c:1581
 #: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1678
+#: ../calendar/gui/print.c:1681
 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:804
 #: ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:807
 #: ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:831
 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:2320
-#, fuzzy, c-format
+#, c-format
 msgid "Week %d"
-msgstr "שבוע"
+msgstr "שבוע %d"
 
 #: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
@@ -6469,7 +6463,7 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr ""
+msgstr "‏<b>%s</b>פרסם נתוני ישיבה."
 
 #: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
@@ -6511,7 +6505,7 @@ msgstr "בקשת עדכון פגישה"
 #: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
+msgstr "‏<b>%s</b> הגיב לבקשת ישיבה."
 
 #: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
@@ -6531,16 +6525,16 @@ msgstr "ביטול ישיבה"
 #: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "‏<b>%s</b> שלח הודעה לא ניתנת לקריאה."
 
 #: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
-msgstr ""
+msgstr "הודעת ישיבה לא טובה"
 
 #: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "‏<b>%s</b> פרסם נתוני משימה."
 
 #: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
@@ -6549,12 +6543,12 @@ msgstr "נתוני המשימה"
 #: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr ""
+msgstr "‏<b>%s</b>מבקש מ־%s לבצע משימה."
 
 #: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgstr "‏<b>%s</b> מבקש ממך לבצע משימה."
 
 #: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
@@ -6564,7 +6558,7 @@ msgstr "הצעת משימה"
 #: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr ""
+msgstr "‏<b>%s</b> מעוניין להצטרף למשימה קיימת."
 
 #: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
@@ -6573,7 +6567,7 @@ msgstr "עדכון משימה"
 #: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgstr "‏<b>%s</b> מעוניין בקבלת נתוני משימה עדכניים."
 
 #: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
@@ -6582,7 +6576,7 @@ msgstr "בקשת עדכון משימה"
 #: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
+msgstr "‏<b>%s</b> הגיב להטלת משימה."
 
 #: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
@@ -6591,7 +6585,7 @@ msgstr "תגובה למשימה"
 #: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr ""
+msgstr "‏<b>%s</b> ביטל משימה."
 
 #: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
@@ -6599,7 +6593,7 @@ msgstr "ביטול משימה"
 
 #: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
-msgstr ""
+msgstr "הודעת משימה לא טובה"
 
 #: ../calendar/gui/e-itip-control.c:1506
 #, c-format
@@ -6689,7 +6683,7 @@ msgstr "בחר פעולה:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2316
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-list-view.c:592
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -6773,71 +6767,71 @@ msgstr ""
 msgid "Resources"
 msgstr "משאבים"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-list-view.c:152
 #, fuzzy
 msgid "Attendees"
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../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/print.c:981
 msgid "Individual"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:87
 #: ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981
+#: ../calendar/gui/print.c:982
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:89
 #: ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "משאב"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:91
 #: ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "חדר"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120
 #: ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:178
 #: ../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/print.c:999
 msgid "Required Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:124
 #: ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "לא־משתתף"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:170
 #: ../calendar/gui/e-meeting-store.c:193
 #: ../calendar/gui/e-meeting-store.c:752
@@ -6845,7 +6839,7 @@ msgid "Needs Action"
 msgstr "נדרשת פעולה"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:547
 msgid "Attendee                          "
 msgstr "משתתף                          "
 
@@ -6965,11 +6959,11 @@ msgstr "שפה"
 msgid "Member"
 msgstr "חבר"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:953
 msgid "_Delete Selected Memos"
 msgstr "_מחק את התזכורות שנבחרו"
 
-#: ../calendar/gui/e-memo-table.c:1106
+#: ../calendar/gui/e-memo-table.c:1104
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "לחץ כאן כדי להוסיף תזכורת"
@@ -6989,7 +6983,7 @@ msgstr "טוען תזכורות"
 #: ../calendar/gui/e-memos.c:902
 #, c-format
 msgid "Opening memos at %s"
-msgstr "פותח תזכורות ב-%s"
+msgstr "פותח תזכורות ב־%s"
 
 #: ../calendar/gui/e-memos.c:1074
 #: ../calendar/gui/e-tasks.c:1328
@@ -7003,7 +6997,7 @@ msgstr "טוען משימות"
 #: ../calendar/gui/e-tasks.c:1060
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "פותח משימות ב-%s"
+msgstr "פותח משימות ב־%s"
 
 #: ../calendar/gui/e-tasks.c:1305
 msgid "Completing tasks..."
@@ -7021,7 +7015,7 @@ msgstr "בחר אזור זמן"
 #. 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:1659
+#: ../calendar/gui/print.c:1662
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -7040,17 +7034,17 @@ msgstr "_הגדרת תצוגות..."
 #: ../calendar/gui/gnome-cal.c:2891
 #, c-format
 msgid "Loading appointments at %s"
-msgstr "טוען פגישות ב-%s"
+msgstr "טוען פגישות ב־%s"
 
 #: ../calendar/gui/gnome-cal.c:2906
 #, c-format
 msgid "Loading tasks at %s"
-msgstr "טוען משימות ב-%s"
+msgstr "טוען משימות ב־%s"
 
 #: ../calendar/gui/gnome-cal.c:2915
 #, c-format
 msgid "Loading memos at %s"
-msgstr "טוען תזכורות ב-%s"
+msgstr "טוען תזכורות ב־%s"
 
 #: ../calendar/gui/gnome-cal.c:3027
 #, c-format
@@ -7128,14 +7122,13 @@ msgstr ""
 
 #: ../calendar/gui/itip-utils.c:640
 msgid "Calendar information"
-msgstr "מידע יומן"
+msgstr "נתוני יומן"
 
 #. 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 "התקבל"
@@ -7462,79 +7455,78 @@ msgstr "השלושים"
 msgid "31st"
 msgstr "השלושים ואחד"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "ראשון"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "שני"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "שלישי"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "רביעי"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "חמישי"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "שישי"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "שבת"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2488
 msgid "Appointment"
 msgstr "פגישה"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2490
 msgid "Task"
 msgstr "משימה"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2515
 #, c-format
 msgid "Summary: %s"
 msgstr "סיכום: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2538
 #, fuzzy
 msgid "Attendees: "
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Status: %s"
 msgstr "מצב: %s"
 
-#: ../calendar/gui/print.c:2587
+#: ../calendar/gui/print.c:2592
 #, c-format
 msgid "Priority: %s"
 msgstr "עדיפות: %s"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2607
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "אחוז הושלם: %i"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2619
 #, c-format
 msgid "URL: %s"
 msgstr "כתובת: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2632
 #, c-format
 msgid "Categories: %s"
 msgstr "קטגוריות: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2643
 msgid "Contacts: "
 msgstr "אנשי קשר: "
 
@@ -7615,7 +7607,7 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/tasks-control.c:491
-#: ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-view.c:1127
 msgid "Do not ask me again."
 msgstr "אל תשאל אותי שוב."
 
@@ -7651,37 +7643,37 @@ msgstr "קטן מאשר"
 msgid "Appointments and Meetings"
 msgstr "ישיבות ומפגשים"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
 #: ../plugins/itip-formatter/itip-formatter.c:1729
 msgid "Opening calendar"
 msgstr "פותח יומן"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "קבצי iCalendar ‏(ics.)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "תזכורת!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "קבצי vCalendar ‏(vcf.)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
-msgstr "אירועי לוח שנה"
+msgstr "אירועי יומן"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
@@ -9263,7 +9255,7 @@ msgid "Close the current file"
 msgstr "סגור את הקובץ הנוכחי"
 
 #: ../composer/e-composer-actions.c:329
-#: ../mail/em-folder-view.c:1337
+#: ../mail/em-folder-view.c:1338
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:119
@@ -9302,7 +9294,7 @@ msgid "Save as draft"
 msgstr "שמור כטיוטה"
 
 #: ../composer/e-composer-actions.c:364
-#: ../composer/e-composer-private.c:152
+#: ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "ש_לח"
 
@@ -9346,7 +9338,7 @@ msgstr "_חתימת PGP"
 
 #: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
-msgstr "חתום על הודעה זאת עם מפתח ה-PGP שלך"
+msgstr "חתום על הודעה זאת עם מפתח ה־PGP שלך"
 
 #: ../composer/e-composer-actions.c:420
 #, fuzzy
@@ -9419,6 +9411,14 @@ msgstr ""
 msgid "Save Draft"
 msgstr "שמור טיוטה"
 
+#: ../composer/e-composer-header.c:117
+msgid "Show"
+msgstr "הצג"
+
+#: ../composer/e-composer-header.c:120
+msgid "Hide"
+msgstr "הסתר"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "הכנס את הנמענים של ההודעה"
@@ -9439,38 +9439,38 @@ msgstr "_מאת:"
 msgid "_Reply-To:"
 msgstr "השב _אל:"
 
-#: ../composer/e-composer-header-table.c:940
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "א_ל:"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:945
-#, fuzzy
-msgid "Show CC"
-msgstr "ת_צוגה: "
+#: ../composer/e-composer-header-table.c:947
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "‏CC"
 
-#: ../composer/e-composer-header-table.c:950
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:950
-#, fuzzy
-msgid "Show BCC"
-msgstr "ת_צוגה: "
+#: ../composer/e-composer-header-table.c:953
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "‏BCC"
 
-#: ../composer/e-composer-header-table.c:955
+#: ../composer/e-composer-header-table.c:958
 #, fuzzy
 msgid "_Post To:"
 msgstr "_לך אל"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "נו_שא:"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "ח_תימה:"
 
@@ -9490,16 +9490,10 @@ msgstr ""
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-composer-private.c:169
-#, fuzzy
+#: ../composer/e-composer-private.c:203
 msgid "Save draft"
 msgstr "שמור טיוטה"
 
-#: ../composer/e-composer-private.c:186
-#, fuzzy
-msgid "Add attachment"
-msgstr "תצריף"
-
 #: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
@@ -9527,7 +9521,7 @@ msgstr "כל החשבונות הוסרו."
 
 #: ../composer/mail-composer.error.xml.h:3
 msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
-msgstr ""
+msgstr "האם אתה בטוח שברצונך להתעלם מהשינויים להודעה, שכותרתה '{0}', שאתה כרגע כותב?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -9539,7 +9533,7 @@ 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 ""
+msgstr "סגירת חלון כתיבת הודעה יבטל את השינויים להודעה לתמיד, אלא אם תבחר לשמור את ההודעה שלך בתיקיית הטיוטות. זה יאפשר לך להמשיך את ההודעה מאוחר יותר."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9682,7 +9676,7 @@ msgid "Evolution Query"
 msgstr "שאילתת Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr ""
@@ -9817,174 +9811,174 @@ msgstr "לא ניתן לפתוח את הקישור."
 msgid "Could not display help for Evolution."
 msgstr ""
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "_חשוב"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "ע_בודה"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_אישי"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 #, fuzzy
 msgid "_To Do"
 msgstr "_לך אל"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "_מאוחר יותר"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:321
 msgid "Label _Name:"
 msgstr "_שם תוית:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Edit Label"
 msgstr "ערוך תוית"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Add Label"
 msgstr "הוסף תוית"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:363
 msgid "Label name cannot be empty."
 msgstr "שם תווית לא יכול להיות ריק."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:368
 msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr ""
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "שגיאת GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1232
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "כל השגיאות הנוספות מוצגות במסוף בלבד."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שניה"
 msgstr[1] "לפני %d שניות"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "עוד שנייה"
 msgstr[1] "עוד %d שניות"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "עוד דקה"
 msgstr[1] "עוד %d דקות"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה אחת"
 msgstr[1] "לפני %d שנים"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "עוד שעה"
 msgstr[1] "עוד %d שעות"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "אתמול"
 msgstr[1] "לפני %d ימים"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "עוד יום"
 msgstr[1] "עוד %d ימים"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "עוד שבוע"
 msgstr[1] "עוד %d שבועות"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "עוד חודש"
 msgstr[1] "עוד %d חודשים"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "לפני שנה"
 msgstr[1] "לפני %d שנים"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "עוד שנה"
 msgstr[1] "עוד %d שנים"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<לחץ כאן כדי לבחור תאריך>"
 
-#: ../filter/filter-datespec.c:291
-#: ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "עכשיו"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/filter-datespec.c:448
 msgid "Select a time to compare against"
 msgstr ""
 
@@ -10002,14 +9996,12 @@ msgid "R_ule name:"
 msgstr "שם החוק_:"
 
 #: ../filter/filter-rule.c:882
-#, fuzzy
 msgid "Find items that meet the following conditions"
-msgstr "חפש פריטים שמתאימים לקריטריון הבא"
+msgstr "מצא פריטים שעומדים בתנאים הבאים"
 
 #: ../filter/filter-rule.c:916
-#, fuzzy
 msgid "A_dd Condition"
-msgstr "הוסף _פעולה"
+msgstr "הו_סף תנאי"
 
 #: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
@@ -10146,6 +10138,13 @@ msgid ""
 "months\n"
 "years"
 msgstr ""
+"שניות\n"
+"דקות\n"
+"שעות\n"
+"ימים\n"
+"שבועות\n"
+"חודשים\n"
+"שנים"
 
 #: ../filter/filter.glade.h:21
 msgid ""
@@ -10215,12 +10214,12 @@ msgid "Evolution Network configuration control"
 msgstr "Evolution Network configuration control"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:602
+#: ../mail/em-folder-view.c:603
 #: ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:599
-#: ../mail/mail-component.c:600
-#: ../mail/mail-component.c:769
+#: ../mail/mail-component.c:601
+#: ../mail/mail-component.c:602
+#: ../mail/mail-component.c:771
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "דואר"
@@ -10245,14 +10244,14 @@ msgid "_Mail"
 msgstr "_דואר"
 
 #: ../mail/e-attachment-handler-mail.c:133
-#: ../mail/em-folder-view.c:1331
+#: ../mail/em-folder-view.c:1332
 #: ../mail/em-popup.c:501
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "הע_בר"
 
 #: ../mail/e-attachment-handler-mail.c:147
-#: ../mail/em-folder-view.c:1329
+#: ../mail/em-folder-view.c:1330
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "ה_שב לשולח"
@@ -10266,20 +10265,19 @@ msgstr "הודעה מצורפת"
 #: ../mail/e-mail-attachment-bar.c:122
 #: ../mail/em-format-html-display.c:1654
 #: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:140
+#: ../widgets/misc/e-attachment-paned.c:141
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "תצריף"
 msgstr[1] "תצריפים"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
-#, fuzzy
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "Icon View"
-msgstr "תצוגת חודש"
+msgstr "תצוגת סמלים"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:602
 msgid "List View"
 msgstr "תצוגת רשימה"
 
@@ -10298,9 +10296,8 @@ msgid "Fin_d:"
 msgstr "_חפש:"
 
 #: ../mail/e-mail-search-bar.c:540
-#, fuzzy
 msgid "Clear the search"
-msgstr "חפש תמיד"
+msgstr "נקה את החיפוש"
 
 #: ../mail/e-mail-search-bar.c:559
 msgid "_Previous"
@@ -10333,30 +10330,30 @@ msgstr ""
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:307
+#: ../mail/em-account-editor.c:308
 msgid "No encryption"
 msgstr "ללא הצפנה"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:311
+#: ../mail/em-account-editor.c:312
 msgid "TLS encryption"
 msgstr "הצפנת TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:315
+#: ../mail/em-account-editor.c:316
 msgid "SSL encryption"
 msgstr "הצפנת SSL"
 
-#: ../mail/em-account-editor.c:406
+#: ../mail/em-account-editor.c:407
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s הסכם שימוש"
 
-#: ../mail/em-account-editor.c:413
+#: ../mail/em-account-editor.c:414
 #, c-format
 msgid ""
 "\n"
@@ -10365,84 +10362,85 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:485
+#: ../mail/em-account-editor.c:486
 #: ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-account-editor.c:609
-#: ../mail/em-account-editor.c:654
-#: ../mail/em-account-editor.c:721
+#: ../mail/em-account-editor.c:610
+#: ../mail/em-account-editor.c:655
+#: ../mail/em-account-editor.c:722
 #: ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr ""
 
-#: ../mail/em-account-editor.c:779
+#: ../mail/em-account-editor.c:780
 msgid "Never"
 msgstr "אף פעם"
 
-#: ../mail/em-account-editor.c:780
+#: ../mail/em-account-editor.c:781
 msgid "Always"
 msgstr "תמיד"
 
-#: ../mail/em-account-editor.c:781
+#: ../mail/em-account-editor.c:782
 #, fuzzy
 msgid "Ask for each message"
 msgstr "הודעה שלא נקראה:"
 
-#: ../mail/em-account-editor.c:1853
+#: ../mail/em-account-editor.c:1854
 #: ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "זהות"
 
-#: ../mail/em-account-editor.c:1904
+#: ../mail/em-account-editor.c:1905
 #: ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "קבלת דוא\"ל"
 
-#: ../mail/em-account-editor.c:2176
+#: ../mail/em-account-editor.c:2177
 msgid "Check for _new messages every"
 msgstr "בדוק אם קיים _דואר חדש כל"
 
-#: ../mail/em-account-editor.c:2184
+#: ../mail/em-account-editor.c:2185
 msgid "minu_tes"
 msgstr "ד_קות"
 
-#: ../mail/em-account-editor.c:2374
+#: ../mail/em-account-editor.c:2375
 #: ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "שליחת דוא\"ל"
 
-#: ../mail/em-account-editor.c:2433
+#: ../mail/em-account-editor.c:2434
 #: ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "ברירת מחדל"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2499
+#: ../mail/em-account-editor.c:2500
 #: ../mail/mail-config.glade.h:133
 #: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "אבטחה"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2536
-#: ../mail/em-account-editor.c:2631
+#: ../mail/em-account-editor.c:2537
+#: ../mail/em-account-editor.c:2632
 msgid "Receiving Options"
 msgstr "אפשרויות קבלה"
 
-#: ../mail/em-account-editor.c:2537
-#: ../mail/em-account-editor.c:2632
+#: ../mail/em-account-editor.c:2538
+#: ../mail/em-account-editor.c:2633
 msgid "Checking for New Messages"
 msgstr "בודק עבור הודעות חדשות"
 
-#: ../mail/em-account-editor.c:3089
+#: ../mail/em-account-editor.c:3098
 #: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "עורך חשבונות"
 
-#: ../mail/em-account-editor.c:3089
+#: ../mail/em-account-editor.c:3098
 #: ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "עוזר החשבונות של Evolution"
@@ -10479,31 +10477,31 @@ msgstr "הוסף תסריט חתימה"
 msgid "Signature(s)"
 msgstr "חתימה/ות"
 
-#: ../mail/em-composer-utils.c:1104
-#: ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1108
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- הודעה מועברת --------"
 
-#: ../mail/em-composer-utils.c:1556
+#: ../mail/em-composer-utils.c:1560
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1562
+#: ../mail/em-composer-utils.c:1566
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2027
+#: ../mail/em-composer-utils.c:2034
 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:2074
+#: ../mail/em-composer-utils.c:2081
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2217
+#: ../mail/em-composer-utils.c:2224
 msgid "-----Original Message-----"
 msgstr "-----הודעה מקורית-----"
 
@@ -10524,21 +10522,13 @@ msgstr ""
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "‏BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "‏CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
-msgstr "הסתיים ב-"
+msgstr "הסתיים ב־"
 
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
@@ -10553,7 +10543,7 @@ msgid "Date sent"
 msgstr "תאריך שליחה"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:770
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25
@@ -10612,7 +10602,7 @@ msgid "Forward to"
 msgstr "העבר"
 
 #: ../mail/em-filter-i18n.h:30
-#: ../mail/em-migrate.c:957
+#: ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "חשוב"
 
@@ -10682,9 +10672,8 @@ msgid "Message is not Junk"
 msgstr "הודעה זו אינה דואר זבל"
 
 #: ../mail/em-filter-i18n.h:50
-#, fuzzy
 msgid "Message Location"
-msgstr "ההודעה מכילה"
+msgstr "מיקום ההודעה"
 
 #: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
@@ -10696,7 +10685,7 @@ msgstr ""
 
 #: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
-msgstr ""
+msgstr "נגן צליל"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
 #: ../mail/em-filter-i18n.h:54
@@ -10781,8 +10770,8 @@ msgid "Stop Processing"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:74
-#: ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:926
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928
 #: ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18
 #: ../mail/message-tag-followup.c:305
@@ -10831,7 +10820,7 @@ msgstr "הודעות אחרונות"
 
 #: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
-msgstr "הודעות מ-5 הימים האחרונים"
+msgstr "הודעות מ־5 הימים האחרונים"
 
 #: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
@@ -10845,11 +10834,11 @@ msgstr "הודעות חשובות"
 msgid "Messages Not Junk"
 msgstr "הודעות שאינן זבל"
 
-#: ../mail/em-folder-browser.c:1202
+#: ../mail/em-folder-browser.c:1201
 msgid "Account Search"
 msgstr "חיפוש חשבון"
 
-#: ../mail/em-folder-browser.c:1255
+#: ../mail/em-folder-browser.c:1254
 msgid "All Account Search"
 msgstr "חיפוש בכל החשבונות"
 
@@ -10880,12 +10869,12 @@ msgstr "סה\"כ הודעות:"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:359
-#: ../mail/em-folder-tree-model.c:516
-#: ../mail/em-folder-tree.c:2524
-#: ../mail/mail-component.c:166
-#: ../mail/mail-component.c:587
+#: ../mail/em-folder-tree-model.c:522
+#: ../mail/em-folder-tree.c:2587
+#: ../mail/mail-component.c:168
+#: ../mail/mail-component.c:589
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "דואר נכנס"
 
@@ -10907,42 +10896,42 @@ msgid "Folder _name:"
 msgstr "_שם תיקייה:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:207
-#: ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:196
+#: ../mail/em-folder-tree-model.c:198
 #: ../mail/mail-vfolder.c:961
-#: ../mail/mail-vfolder.c:1028
+#: ../mail/mail-vfolder.c:1029
 msgid "Search Folders"
 msgstr "תיקיות חיפוש"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:213
-#: ../mail/em-folder-tree-model.c:215
+#: ../mail/em-folder-tree-model.c:202
+#: ../mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:511
-#: ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:515
+#: ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "טיוטות"
 
-#: ../mail/em-folder-tree-model.c:513
-#: ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:518
+#: ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "תבניות"
 
-#: ../mail/em-folder-tree-model.c:519
-#: ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:525
+#: ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree-model.c:521
-#: ../mail/mail-component.c:169
+#: ../mail/em-folder-tree-model.c:527
+#: ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "נשלח"
 
-#: ../mail/em-folder-tree-model.c:550
-#: ../mail/em-folder-tree-model.c:859
+#: ../mail/em-folder-tree-model.c:585
+#: ../mail/em-folder-tree-model.c:895
 msgid "Loading..."
 msgstr "טוען..."
 
@@ -10961,100 +10950,100 @@ msgstr "טוען..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:299
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:300
+#, c-format
 msgctxt "folder-display"
 msgid "%s (%u)"
-msgstr "%s (...)"
+msgstr "‏%s ‏(%u)"
 
-#: ../mail/em-folder-tree.c:664
+#: ../mail/em-folder-tree.c:709
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "_תיקיית דואר"
 
-#: ../mail/em-folder-tree.c:823
+#: ../mail/em-folder-tree.c:868
 #, c-format
 msgid "Moving folder %s"
 msgstr "מעביר את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:825
+#: ../mail/em-folder-tree.c:870
 #, c-format
 msgid "Copying folder %s"
 msgstr "מעתיק את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:832
+#: ../mail/em-folder-tree.c:877
 #: ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "מעביר הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:834
+#: ../mail/em-folder-tree.c:879
 #: ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "מעתיק הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:894
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:971
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "הע_תק אל תיקייה"
 
-#: ../mail/em-folder-tree.c:927
+#: ../mail/em-folder-tree.c:972
 #: ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "הע_בר אל תיקייה"
 
-#: ../mail/em-folder-tree.c:929
+#: ../mail/em-folder-tree.c:974
 #: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1187
 #: ../mail/message-list.c:2106
 msgid "_Move"
 msgstr "_העבר"
 
-#: ../mail/em-folder-tree.c:931
+#: ../mail/em-folder-tree.c:976
 #: ../mail/message-list.c:2108
 msgid "Cancel _Drag"
 msgstr "בטל _גרירה"
 
-#: ../mail/em-folder-tree.c:1641
+#: ../mail/em-folder-tree.c:1686
 #: ../mail/mail-ops.c:1065
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "סורק תיקיות ב-\"%s\""
+msgstr "סורק תיקיות ב־\"%s\""
 
-#: ../mail/em-folder-tree.c:2040
+#: ../mail/em-folder-tree.c:2091
 msgid "Open in _New Window"
 msgstr "פתח ב_חלון חדש"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2045
+#: ../mail/em-folder-tree.c:2096
 msgid "_New Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2099
 msgid "_Move..."
 msgstr "הע_בר..."
 
-#: ../mail/em-folder-tree.c:2056
+#: ../mail/em-folder-tree.c:2107
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_רענן"
 
-#: ../mail/em-folder-tree.c:2057
+#: ../mail/em-folder-tree.c:2108
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree.c:2063
+#: ../mail/em-folder-tree.c:2114
 #: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_רוקן את האשפה"
 
-#: ../mail/em-folder-tree.c:2166
+#: ../mail/em-folder-tree.c:2217
 #, fuzzy
 msgid "_Unread Search Folder"
 msgstr "צור תיקיית _חיפוש"
@@ -11065,15 +11054,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "מעתיק את `%s' אל `%s'"
 
 #: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-view.c:1187
+#: ../mail/em-folder-view.c:1202
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "בחר תיקייה"
 
 #: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-view.c:1202
 msgid "C_opy"
 msgstr "_העתק"
 
@@ -11095,169 +11084,165 @@ msgstr "צור תיקייה"
 msgid "Specify where to create the folder:"
 msgstr "ציין היכן ליצור את התיקייה:"
 
-#: ../mail/em-folder-view.c:1089
+#: ../mail/em-folder-view.c:1090
 #: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "מחיקת הדואר נכשלה"
 
-#: ../mail/em-folder-view.c:1090
+#: ../mail/em-folder-view.c:1091
 #: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 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
+#: ../mail/em-folder-view.c:1336
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_ערוך כהודעה חדשה..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1342
 msgid "U_ndelete"
 msgstr "_בטל מחיקה"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1343
 msgid "_Move to Folder..."
 msgstr "הע_בר לתיקייה..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1344
 msgid "_Copy to Folder..."
 msgstr "ה_עתק לתיקייה..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1347
 msgid "Mar_k as Read"
 msgstr "_סמן כנקרא"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Unread"
 msgstr "סמן כ_לא נקרא"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Important"
 msgstr "סמן כ_חשוב"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as Un_important"
 msgstr "סמן כל_א חשוב"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Junk"
 msgstr "סמן כ_דואר זבל"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Not Junk"
 msgstr "סמן _כלא דואר זבל"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 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
+#: ../mail/em-folder-view.c:1356
 #: ../widgets/misc/e-dateedit.c:477
 msgid "_None"
 msgstr "לל_א"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "_New Label"
 msgstr "תווית _חדשה"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1363
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1364
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1367
 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:1369
 #, fuzzy
 msgid "Search Folder based on _Subject"
-msgstr "חפש אנשי קשר..."
+msgstr "חיפוש בתיקייה לפני הנושא"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 #, fuzzy
 msgid "Search Folder based on Se_nder"
 msgstr "מקור הנייר:"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1371
 #, fuzzy
 msgid "Search Folder based on _Recipients"
 msgstr "חפש אנשי קשר..."
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1372
 #, fuzzy
 msgid "Search Folder based on Mailing _List"
 msgstr "צור תיקייה וירטואלית עבור רשימת תפוצה זו"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1380
 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:2234
-#: ../mail/em-folder-view.c:2277
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
+#: ../mail/em-folder-view.c:2235
+#: ../mail/em-folder-view.c:2278
+#: ../plugins/google-account-setup/google-source.c:223
+#: ../plugins/google-account-setup/google-source.c:508
+#: ../plugins/google-account-setup/google-source.c:719
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../mail/em-folder-view.c:2495
+#: ../mail/em-folder-view.c:2496
 msgid "Unable to retrieve message"
 msgstr "לא ניתן לקבל הודעה"
 
-#: ../mail/em-folder-view.c:2514
-msgid "Retrieving Message..."
-msgstr "מקבל הודעה..."
-
-#: ../mail/em-folder-view.c:2735
+#: ../mail/em-folder-view.c:2700
 msgid "Create _Search Folder"
 msgstr "צור תיקיית _חיפוש"
 
-#: ../mail/em-folder-view.c:2736
+#: ../mail/em-folder-view.c:2701
 msgid "_From this Address"
 msgstr "_מכתובת זו"
 
-#: ../mail/em-folder-view.c:2737
+#: ../mail/em-folder-view.c:2702
 msgid "_To this Address"
 msgstr "אל כ_תובת זו"
 
-#: ../mail/em-folder-view.c:3230
+#: ../mail/em-folder-view.c:3195
 #, c-format
 msgid "Click to mail %s"
-msgstr "לחץ כדי לשלוח דואר ל-%s"
+msgstr "לחץ כדי לשלוח דואר ל־%s"
 
-#: ../mail/em-folder-view.c:3242
+#: ../mail/em-folder-view.c:3207
 #, fuzzy, c-format
 msgid "Click to call %s"
 msgstr "‏לחץ כאן כדי להוסיף משימה"
 
-#: ../mail/em-folder-view.c:3247
+#: ../mail/em-folder-view.c:3212
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
@@ -11314,7 +11299,7 @@ msgstr "לא מוצפן"
 
 #: ../mail/em-format-html-display.c:581
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr ""
+msgstr "ההודעה לא מוצפנת. יתכן שתוכן ההודעה יוצג דרך כל האינטרנט."
 
 #: ../mail/em-format-html-display.c:582
 #: ../mail/em-format-html.c:666
@@ -11323,7 +11308,7 @@ msgstr "מוצפן, חלש"
 
 #: ../mail/em-format-html-display.c:582
 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 ""
+msgstr "ההודעה מוצפנת, אבל בעזרת אלגוריתם הצפנה חלש. זה יהיה קשה אך לא בלתי אפשרי עבור גורם חיצוני לצפות בתוכן ההודעה תוך זמן מעשי."
 
 #: ../mail/em-format-html-display.c:583
 #: ../mail/em-format-html.c:667
@@ -11332,7 +11317,7 @@ msgstr "מוצפן"
 
 #: ../mail/em-format-html-display.c:583
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr ""
+msgstr "ההודעה מוצפנת. יהיה קשה לגורם חיצוני לצפות בתוכן ההודעה."
 
 #: ../mail/em-format-html-display.c:584
 #: ../mail/em-format-html.c:668
@@ -11341,7 +11326,7 @@ msgstr "מוצפן, חזק"
 
 #: ../mail/em-format-html-display.c:584
 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 ""
+msgstr "ההודעה מוצפנת, בעזרת אלגוריתם הצפנה חזק. יהיה קשה לגורם חיצוני לצפות בתוכן ההודעה תוך זמן מעשי."
 
 #: ../mail/em-format-html-display.c:685
 #: ../smime/gui/smime-ui.glade.h:48
@@ -11354,7 +11339,7 @@ msgstr "תעודה זאת אינה ניתנת לצפייה"
 
 #: ../mail/em-format-html-display.c:992
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "הסתיים ב-%B %d, %Y, %l:%M %p"
+msgstr "הסתיים ב־%B %d, %Y, %l:%M %p"
 
 #: ../mail/em-format-html-display.c:1000
 msgid "Overdue:"
@@ -11458,8 +11443,8 @@ msgstr "חפש _בהודעה..."
 #: ../mail/em-format-html.c:1568
 #: ../mail/em-format-html.c:1632
 #: ../mail/em-format-html.c:1654
-#: ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:924
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926
 #: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
@@ -11467,15 +11452,15 @@ msgstr "Cc"
 #: ../mail/em-format-html.c:1569
 #: ../mail/em-format-html.c:1638
 #: ../mail/em-format-html.c:1657
-#: ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:925
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927
 #: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1749
-#: ../mail/em-format-quote.c:353
+#: ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr ""
@@ -11498,21 +11483,21 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:921
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75
 #: ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:301
 msgid "From"
 msgstr "מאת"
 
-#: ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:922
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "השב אל"
 
-#: ../mail/em-format.c:927
+#: ../mail/em-format.c:929
 #: ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:2
 #: ../widgets/misc/e-dateedit.c:324
@@ -11520,63 +11505,63 @@ msgstr "השב אל"
 msgid "Date"
 msgstr "תאריך"
 
-#: ../mail/em-format.c:928
+#: ../mail/em-format.c:930
 #: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:929
+#: ../mail/em-format.c:931
 #: ../mail/em-mailer-prefs.c:83
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "פנים"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "תצריף %s"
 
-#: ../mail/em-format.c:1235
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1372
-#: ../mail/em-format.c:1528
+#: ../mail/em-format.c:1376
+#: ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1380
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1390
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr ""
 
-#: ../mail/em-format.c:1390
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1547
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "תצורת חתימה לא נתמכת"
 
-#: ../mail/em-format.c:1555
-#: ../mail/em-format.c:1626
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1631
 msgid "Error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1555
-#: ../mail/em-format.c:1617
-#: ../mail/em-format.c:1626
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1622
+#: ../mail/em-format.c:1631
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1700
+#: ../mail/em-format.c:1705
 msgid "Could not parse PGP message"
 msgstr "לא ניתן לפענח הודעת PGP"
 
-#: ../mail/em-format.c:1700
+#: ../mail/em-format.c:1705
 msgid "Could not parse PGP message: Unknown error"
 msgstr "לא ניתן לפענח הודעת PGP: שגיאה לא ידועה"
 
@@ -11649,81 +11634,81 @@ msgid "No Junk plugin available"
 msgstr "אין תיאור זמין."
 
 #. green
-#: ../mail/em-migrate.c:960
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: ../mail/em-migrate.c:961
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr ""
 
-#: ../mail/em-migrate.c:1128
+#: ../mail/em-migrate.c:1129
 #, fuzzy
 msgid "Migration"
 msgstr "הגדרות"
 
-#: ../mail/em-migrate.c:1573
+#: ../mail/em-migrate.c:1574
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "נכשל ביצירת תיקייה חדשה `%s': %s"
 
-#: ../mail/em-migrate.c:1599
+#: ../mail/em-migrate.c:1600
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1784
+#: ../mail/em-migrate.c:1785
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1789
+#: ../mail/em-migrate.c:1790
 msgid ""
 "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 ""
 
-#: ../mail/em-migrate.c:1990
+#: ../mail/em-migrate.c:1991
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2004
+#: ../mail/em-migrate.c:2005
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2033
+#: ../mail/em-migrate.c:2034
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2504
-#: ../mail/em-migrate.c:2516
+#: ../mail/em-migrate.c:2505
+#: ../mail/em-migrate.c:2517
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 #, fuzzy
 msgid "Migrating Folders"
 msgstr "יוצר את התיקייה `%s'"
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 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..."
 msgstr ""
 
-#: ../mail/em-migrate.c:2956
+#: ../mail/em-migrate.c:2957
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2975
+#: ../mail/em-migrate.c:2976
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
@@ -11759,26 +11744,26 @@ msgstr "_הוסף לספר הכתובות"
 #: ../mail/em-popup.c:726
 #, c-format
 msgid "Open in %s..."
-msgstr "פתח ב-%s..."
+msgstr "פתח ב־%s..."
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "תיקייה"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "נא לבחור שרת."
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:895
 msgid "No server has been selected"
 msgstr "לא נבחר שרת"
 
@@ -11808,7 +11793,7 @@ msgstr "הוסף כתובת"
 #: ../mail/em-utils.c:1226
 #, c-format
 msgid "Messages from %s"
-msgstr "הודעה מ-%s"
+msgstr "הודעה מ־%s"
 
 #: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
@@ -12560,7 +12545,7 @@ msgstr "תיקיית יעד:"
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder to import into"
-msgstr "בחר תיקייה לייבא אליה"
+msgstr "בחר תיקייה ליבא אליה"
 
 #: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
@@ -12572,7 +12557,7 @@ msgstr ""
 
 #: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
-msgstr "מייבא תיבת דואר"
+msgstr "מיבא תיבת דואר"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
@@ -12581,7 +12566,7 @@ msgstr "מייבא תיבת דואר"
 #: ../shell/e-shell-importer.c:537
 #, c-format
 msgid "Importing `%s'"
-msgstr "מייבא `%s'"
+msgstr "מיבא את `%s'"
 
 #: ../mail/importers/mail-importer.c:371
 #, c-format
@@ -12598,7 +12583,7 @@ msgstr ""
 
 #: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
-msgstr "יבא דואר מ-Pine."
+msgstr "יבא דואר מ־Pine."
 
 #: ../mail/mail-autofilter.c:72
 #, c-format
@@ -12625,89 +12610,89 @@ msgstr "רשימת תפוצה %s"
 msgid "Add Filter Rule"
 msgstr "הוסף חוק סינון"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "אחד נבחר, "
 msgstr[1] "%d נבחרו, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:558
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d נמחק"
 msgstr[1] "%d נמחק"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:565
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d דואר זבל"
 msgstr[1] "%d דואר זבל"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "טיוטה %d"
 msgstr[1] "%d טיוטות"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d נשלח"
 msgstr[1] "%d נשלח"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d לא נשלח"
 msgstr[1] "%d לא נשלח"
 
-#: ../mail/mail-component.c:576
+#: ../mail/mail-component.c:578
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d לא נקראה, "
 msgstr[1] "%d לא נקראו, "
 
-#: ../mail/mail-component.c:577
+#: ../mail/mail-component.c:579
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d סה\"כ"
 msgstr[1] "%d סה\"כ"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:930
 msgid "New Mail Message"
 msgstr "הודאת דואר חדשה"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_הודעת דואר"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:932
 msgid "Compose a new mail message"
 msgstr "חבר הודעת דואר חדשה"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:938
 msgid "New Mail Folder"
 msgstr "תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:938
+#: ../mail/mail-component.c:939
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_תיקיית דואר"
 
-#: ../mail/mail-component.c:939
+#: ../mail/mail-component.c:940
 msgid "Create a new mail folder"
 msgstr "צור תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:1086
+#: ../mail/mail-component.c:1087
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -13024,7 +13009,7 @@ msgstr "הצפן הודעות יוצ_אות (כברירת מחדל)"
 
 #: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
-msgstr "רו_חב-קבוע:"
+msgstr "רו_חב־קבוע:"
 
 #: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
@@ -13260,7 +13245,7 @@ msgstr "שימוש בה_זדהות"
 
 #: ../mail/mail-config.glade.h:158
 #: ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:632
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
 msgid "User_name:"
@@ -13268,7 +13253,7 @@ msgstr "שם משתמש:"
 
 #: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
-msgstr "_רוחב-משתנה:"
+msgstr "_רוחב־משתנה:"
 
 #: ../mail/mail-config.glade.h:160
 msgid ""
@@ -13605,7 +13590,7 @@ msgstr ""
 #: ../mail/mail-ops.c:1742
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "מרוקן את האשפה ב-'%s'"
+msgstr "מרוקן את האשפה ב־'%s'"
 
 #: ../mail/mail-ops.c:1743
 msgid "Local Folders"
@@ -13631,46 +13616,46 @@ msgid_plural "Saving %d messages"
 msgstr[0] "שומר הודעה אחת"
 msgstr[1] "שומר %d הודעות"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2098
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2170
 msgid "Saving attachment"
 msgstr "שומר תצריף"
 
-#: ../mail/mail-ops.c:2186
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2188
+#: ../mail/mail-ops.c:2196
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2211
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "מתנתק מ %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "מתחבר מחדש ל %s"
 
-#: ../mail/mail-ops.c:2451
+#: ../mail/mail-ops.c:2453
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-ops.c:2537
+#: ../mail/mail-ops.c:2539
 msgid "Checking Service"
 msgstr "בודק שירות"
 
@@ -13774,11 +13759,11 @@ msgstr ""
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1068
 msgid "Edit Search Folder"
 msgstr "ערוך תיקיית חיפוש"
 
-#: ../mail/mail-vfolder.c:1156
+#: ../mail/mail-vfolder.c:1157
 msgid "New Search Folder"
 msgstr "תיקיית חיפוש חדשה"
 
@@ -13816,7 +13801,7 @@ 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
 #, fuzzy
@@ -13829,12 +13814,11 @@ 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
-#, fuzzy
 msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
-msgstr "האם לשלוח את ההודעה בתצורת HTML?"
+msgstr "אתה בטוח שברצונך להסיר לצמיתות את כל ההודעות שנמחקו מהתיקייה \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -13867,7 +13851,7 @@ msgstr "צור תיקיית _חיפוש"
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "לא ניתן להעתיק את התיקייה \"{0}\" אל \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder \"{0}\"."
@@ -14242,15 +14226,15 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
-msgstr ""
+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."
-msgstr ""
+msgstr "לא ניתן ליצור שני חשבונות עם אותו שם."
 
 #: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
@@ -14258,7 +14242,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
-msgstr ""
+msgstr "עליך לציין תיקייה."
 
 #: ../mail/mail.error.xml.h:132
 msgid ""
@@ -14268,7 +14252,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+msgstr "ההתחברות לשרת \"{0}\" כ־\"{0}\" נכשלה."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14473,10 +14457,15 @@ msgstr "הנושא מכיל"
 
 #: ../mail/searchtypes.xml.h:6
 #, fuzzy
-msgid "Subject or Recipients contains"
+msgid "Subject or Addresses contains"
 msgstr "הנושא או השולח מכילים"
 
 #: ../mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "הנושא או השולח מכילים"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "הנושא או השולח מכילים"
 
@@ -14543,7 +14532,7 @@ msgstr "בחר שם לקובץ הגיבוי של Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "_הפעל מחדש את Evolution אחרי הגיבוי"
 
 #: ../plugins/backup-restore/backup-restore.c:191
 msgid "Select name of the Evolution backup file to restore"
@@ -14551,7 +14540,7 @@ msgstr "בחר קובץ גיבוי של Evolution לשחזור"
 
 #: ../plugins/backup-restore/backup-restore.c:215
 msgid "_Restart Evolution after restore"
-msgstr ""
+msgstr "_הפעל מחדש את Evolution אחרי השחזור"
 
 #: ../plugins/backup-restore/backup-restore.c:288
 msgid "Restore from backup"
@@ -14562,7 +14551,7 @@ 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."
 msgstr ""
-"ניתן לשחזר את Evolution מגיבוי שעשית. ניתן לשחזר את כל הודעות הדואר, לוחות השנה, המשימות, התזכורות ואנשי הקשר. \n"
+"ניתן לשחזר את Evolution מגיבוי שעשית. ניתן לשחזר את כל הודעות הדואר, היומנים, המשימות, התזכורות ואנשי הקשר. \n"
 "ניתן גם לשחזר אם כל ההגדרות האישיות שלך, מסנני הודעות וכ'ו."
 
 #: ../plugins/backup-restore/backup-restore.c:296
@@ -14654,53 +14643,50 @@ msgid "Restoring from the folder %s"
 msgstr "משחזר מהתיקייה %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:410
+#: ../plugins/backup-restore/backup.c:411
 msgid "Evolution Backup"
 msgstr "גיבוי Evolution"
 
-#: ../plugins/backup-restore/backup.c:410
+#: ../plugins/backup-restore/backup.c:411
 msgid "Evolution Restore"
 msgstr "שחזור Evolution"
 
-#: ../plugins/backup-restore/backup.c:445
+#: ../plugins/backup-restore/backup.c:446
 msgid "Backing up Evolution Data"
 msgstr "מגבה את נתוני Evolution"
 
-#: ../plugins/backup-restore/backup.c:446
+#: ../plugins/backup-restore/backup.c:447
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
+msgstr "נא להמתין בזמן ש־Evolution מבצעת גיבוי לנתונים שלך."
 
-#: ../plugins/backup-restore/backup.c:448
+#: ../plugins/backup-restore/backup.c:449
 msgid "Restoring Evolution Data"
 msgstr "משחזר את נתוני Evolution"
 
-#: ../plugins/backup-restore/backup.c:449
+#: ../plugins/backup-restore/backup.c:450
 msgid "Please wait while Evolution is restoring your data."
-msgstr ""
+msgstr "נא להמתין בזמן ש־Evolution מבצעת שחזור לנתונים שלך."
 
-#: ../plugins/backup-restore/backup.c:467
+#: ../plugins/backup-restore/backup.c:468
 msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
+msgstr "פעולה זו עשויה להימשך זמן מה בהתאם לכמות הנתונים בחשבון שלך."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#, fuzzy
 msgid "Backup and Restore"
-msgstr "תוסף גיבוי ושחזור"
+msgstr "גיבוי ושחזור"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
 msgid "Backup and restore your Evolution data and settings."
-msgstr "גיבוי חשבונות והגדרות Evolution"
+msgstr "גיבוי ושחזור חשבונות והגדרות ונתוני Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "לסגור את Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
 msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "אתה בטוח שברצונך למחוק פגישה זו?"
+msgstr "אתה בטוח שברצונך לשחזר את Evolution מקובץ הגיבוי הנבחר?"
 
 #: ../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."
@@ -14741,39 +14727,39 @@ msgstr "שחזר _הגדרות..."
 msgid "_Backup Settings..."
 msgstr "_הגדרות גיבוי..."
 
-#: ../plugins/bbdb/bbdb.c:621
-#: ../plugins/bbdb/bbdb.c:630
+#: ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:633
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "אנשי קשר אוטומטיים"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:648
 #, fuzzy
 msgid "Create _address book entries when sending mails"
 msgstr "_הסתר כתובות בזמן שליחת דואר לרשימה זו"
 
-#: ../plugins/bbdb/bbdb.c:651
+#: ../plugins/bbdb/bbdb.c:654
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:669
 #, fuzzy
 msgid "Instant Messaging Contacts"
 msgstr "<b>הודעות מידיות</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:687
+#: ../plugins/bbdb/bbdb.c:690
 #, fuzzy
 msgid "Select Address book for Pidgin buddy list"
 msgstr "בחר ספר כתובות"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:701
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -14841,29 +14827,29 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_כתובת:"
 
 #: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-source.c:606
+#: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
-msgstr "השתמש ב-_SSL"
+msgstr "השתמש ב־_SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/google-account-setup/google-source.c:649
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "_רענן:"
 
 #: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-source.c:675
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "שבועות"
@@ -14885,11 +14871,11 @@ msgstr ""
 msgid "Local Calendars"
 msgstr "יומנים מקומיים"
 
-#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "חיבור _מאובטח"
 
-#: ../plugins/calendar-http/calendar-http.c:389
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "שם משתמש:"
 
@@ -14911,14 +14897,12 @@ msgid "Weather: Cloudy"
 msgstr "מזג אויר: מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
 msgid "Weather: Cloudy Night"
-msgstr "מזג אויר: מעונן"
+msgstr "מזג אויר: לילה מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
 msgid "Weather: Overcast"
-msgstr "מזג אויר: גשם"
+msgstr "מזג אויר: מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Showers"
@@ -14999,7 +14983,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:599
+#: ../shell/main.c:601
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15154,7 +15138,7 @@ msgstr "אני במשרד"
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
-msgstr "החלף את הסיסמה עבור חשבון ה-Exchange"
+msgstr "החלף את הסיסמה עבור חשבון ה־Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
@@ -15279,15 +15263,15 @@ msgstr "מותאם אישית"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:170
 msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "עורך (קריאה, יצירה, עריכה)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:174
 msgid "Author (read, create)"
-msgstr ""
+msgstr "יוצר (קריאה, יצירה)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:178
 msgid "Reviewer (read-only)"
-msgstr ""
+msgstr "מבקר (קריאה בלבד)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:228
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
@@ -15303,20 +15287,20 @@ 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:329
+#: ../plugins/exchange-operations/exchange-delegates-user.c:330
 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:334
+#: ../plugins/exchange-operations/exchange-delegates-user.c:335
 msgid "You have been given the following permissions on my folders:"
-msgstr ""
+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:352
+#: ../plugins/exchange-operations/exchange-delegates-user.c:355
 #, fuzzy
 msgid "You are also permitted to see my private items."
 msgstr "צור פריט מבחן חדש"
@@ -15324,11 +15308,11 @@ 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:359
+#: ../plugins/exchange-operations/exchange-delegates-user.c:362
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:391
+#: ../plugins/exchange-operations/exchange-delegates-user.c:394
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr ""
@@ -15407,6 +15391,8 @@ msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
+"משתמשים אלה יוכלו לשלוח דואר בשמך\n"
+"ולגשת לתיקיות שלך בהתאם להרשאות שתיתן להם."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 #, fuzzy
@@ -15424,7 +15410,7 @@ msgstr "_סכם הרשאות"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
+#: ../plugins/itip-formatter/itip-view.c:1915
 msgid "_Tasks:"
 msgstr "_משימות:"
 
@@ -15487,7 +15473,7 @@ msgstr "<b>הודעת מחוץ למשרד:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
-msgstr "<b>מצב::</b>"
+msgstr "<b>מצב:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
@@ -15537,8 +15523,8 @@ msgstr "הוסף משתמש:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:714
+#: ../plugins/groupwise-features/proxy.c:936
+#: ../plugins/groupwise-features/share-folder.c:718
 msgid "Add User"
 msgstr "הוסף משתמש"
 
@@ -15560,7 +15546,7 @@ msgstr "צור פריטים"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create subfolders"
-msgstr "צור תת-תיקיות"
+msgstr "צור תת־תיקיות"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
@@ -15917,7 +15903,7 @@ msgid "Unknown error looking up {0}"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
@@ -15929,7 +15915,7 @@ msgstr "סוג לא ידוע"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
-msgstr "פעולה לא ניתמכת."
+msgstr "פעולה לא נתמכת."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
@@ -16096,12 +16082,12 @@ msgstr ""
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:416
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16110,11 +16096,11 @@ msgstr ""
 "לא ניתן לקרוא את הנתונים מהשרת של Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:694
 msgid "Cal_endar:"
 msgstr "יו_מן:"
 
-#: ../plugins/google-account-setup/google-source.c:709
+#: ../plugins/google-account-setup/google-source.c:729
 msgid "Retrieve _list"
 msgstr "אחזור _רשימה"
 
@@ -16397,37 +16383,37 @@ msgstr "<b>שם חשבון</b>"
 msgid "Proxy Login"
 msgstr "כניסת מתווך"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:489
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
-msgstr "%s הכנס סיסמה ל%s (משתמש %s("
+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:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "כניסת _מתווך..."
 
 #. 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:690
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
 #. 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:696
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/send-options.c:215
 msgid "Advanced send options"
 msgstr "אפשרויות שליחה מתקדמות"
 
 #: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:749
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Users"
 msgstr "משתמשים"
 
@@ -16443,15 +16429,15 @@ msgstr "תיקייה משותפת _חדשה..."
 msgid "Sharing"
 msgstr "משתף"
 
-#: ../plugins/groupwise-features/share-folder.c:532
+#: ../plugins/groupwise-features/share-folder.c:536
 msgid "Custom Notification"
 msgstr "התרעה מותאמת אישית"
 
-#: ../plugins/groupwise-features/share-folder.c:754
+#: ../plugins/groupwise-features/share-folder.c:758
 msgid "Add   "
 msgstr "הוסף   "
 
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder.c:764
 msgid "Modify"
 msgstr "שינוי"
 
@@ -16570,15 +16556,15 @@ msgstr ""
 msgid "Hardware Abstraction Layer not loaded"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
 msgid "Search for an iPod failed"
 msgstr "חיפוש אחר iPod נכשל"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
 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 ""
 
@@ -16772,7 +16758,7 @@ msgid "_Delete message after acting"
 msgstr "_מחק את ההודעה לאחר הביצוע"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2571
-#: ../plugins/itip-formatter/itip-formatter.c:2603
+#: ../plugins/itip-formatter/itip-formatter.c:2604
 msgid "Conflict Search"
 msgstr "חיפוש התנגשויות"
 
@@ -16942,97 +16928,97 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s פרסמה את פרטי הישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr ""
+msgstr "‏<b>%s</b> פרסם את פרטי הישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr ""
+msgstr "‏<b>%s</b> הסמיך את הפגישה הבאה לך:"
 
 #: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s מבקש את הנוכחות שלך בישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> מבקש את הנוכחות שלך בישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s רוצה להוסיף לישיבה קיימת:"
 
 #: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> רוצה להוסיף לישיבה קיימת:"
 
 #: ../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 ""
+msgstr "‏<b>%s</b> דרך %s רוצה לקבל את המידע העדכני עבור הישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> רוצה לקבל את המידע העדכני עבור הישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s שלח את התגובה הבאה לישיבה:"
 
 #: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr ""
+msgstr "‏<b>%s</b> שלח את התגובה הבאה לישיבה:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s ביטל את הישיבה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr ""
+msgstr "‏<b>%s</b> ביטל את הישיבה הבאה."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s הציע שינויים לפגישה הבאה."
 
 #: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr ""
+msgstr "‏<b>%s</b> הציע שינויים לפגישה הבאה."
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s סרב לשינויים הבאים לפגישה:"
 
 #: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr ""
+msgstr "‏<b>%s</b> סרב לשינויים הבאים לפגישה."
 
 #: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s פרסם את המשימה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr ""
+msgstr "‏<b>%s</b> פרסם את המשימה הבאה:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
@@ -17052,12 +17038,12 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
+msgstr "‏<b>%s</b> דרך %s רוצה להוסיף למשימה קיימת:"
 
 #: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr ""
+msgstr "‏<b>%s</b> רוצה להוסיף למשימה קיימת:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
@@ -17140,106 +17126,106 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr ""
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:824
 msgid "_Open Calendar"
 msgstr "פתח _יומן"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Decline"
 msgstr "_סרב"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:864
 msgid "_Accept"
 msgstr "ק_בל"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Decline all"
 msgstr "_דחה הכל"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:835
 #, fuzzy
 msgid "_Tentative all"
 msgstr "מ_חק הכל"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 #, fuzzy
 msgid "_Tentative"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:836
 msgid "_Accept all"
 msgstr "קבל ה_כל"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Send Information"
 msgstr "_שלח מידע"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update Attendee Status"
 msgstr "_עדכן את מצב המשתתף"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update"
 msgstr "_עדכן"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1034
 msgid "Start time:"
 msgstr "שעת התחלה:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "End time:"
 msgstr "שעת סיום:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Comment:"
 msgstr "הערה:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1104
 #, fuzzy
 msgid "Send _reply to sender"
 msgstr "ה_שב לשולח"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1134
 msgid "Send _updates to attendees"
 msgstr "שלח _עדכונים למשתתפים"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1143
 msgid "_Apply to all instances"
 msgstr "_החל על כל המופעים"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1152
 #, fuzzy
 msgid "Show time as _free"
 msgstr "כותרת ההודעה"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "_Preserve my reminder"
 msgstr ""
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1161
 #, fuzzy
 msgid "_Inherit reminder"
 msgstr "מאפייני תצריף"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1917
 #, fuzzy
 msgid "_Memos:"
 msgstr "_תזכורות"
@@ -17385,7 +17371,7 @@ msgstr "דוא\"ל חדש"
 
 #: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
-msgstr "הצג איקון באיזור הה_תראות"
+msgstr "הצג סמל באזור הה_תרעות"
 
 #: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
@@ -17574,7 +17560,7 @@ 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 ""
+msgstr "אין אפשרות לשלוח הודעות לרשימת דיוור זו. יתכן שרשימת דיוור זו היא לקריאה בלבד. צור קשר עם הבעלים לקבל מידע."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 #, fuzzy
@@ -17682,17 +17668,15 @@ msgstr "תיקייה נוכחית בלבד"
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 #, fuzzy
 msgid "Mark All Read"
-msgstr "_סמן כנקרא"
+msgstr "סמן את כולם כנקראו"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
 msgid "Mark Me_ssages as Read"
-msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+msgstr ""
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#, fuzzy
 msgid "Mark all messages in a folder as read."
-msgstr "סמן את כל ההודעות בתיקייה כהודעות שנקראו"
+msgstr "סמן את כל ההודעות בתיקייה כהודעות שנקראו."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 #, fuzzy
@@ -17704,9 +17688,8 @@ msgid "Support plugins written in Mono."
 msgstr ""
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-#, fuzzy
 msgid "Manage your Evolution plugins."
-msgstr "שנה את הגדרות Evolution"
+msgstr "ניהול תוספי Evolution."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -17830,20 +17813,19 @@ msgid "Publish calendars to the web."
 msgstr "מידע אישי"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-#, fuzzy
 msgid "_Publish Calendar Information"
-msgstr "מידע אישי"
+msgstr "_פרסם נתוני יומן"
 
 #: ../plugins/publish-calendar/publish-calendar.c:95
 #: ../plugins/publish-calendar/publish-calendar.c:329
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open %s:"
-msgstr "לא ניתן לפתוח את המקור"
+msgstr "לא ניתן לפתוח את %s: "
 
 #: ../plugins/publish-calendar/publish-calendar.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "לא ניתן לפענח הודעת PGP: שגיאה לא ידועה"
+msgstr "לא ניתן לפתוח את %s: שגיאה לא ידועה"
 
 #: ../plugins/publish-calendar/publish-calendar.c:117
 #, c-format
@@ -17918,7 +17900,9 @@ msgstr ""
 "‏FTP ציבורי\n"
 "‏FTP (עם התחברות)\n"
 "שיתוף Windows\n"
-"WebDAV (HTTP)‏WebDAV מאובטח (HTTP)מיקום אחר"
+"WebDAV (HTTP)‏\n"
+"‏WebDAV מאובטח (HTTP)\n"
+"מיקום אחר"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
@@ -17973,11 +17957,11 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "מיקום חדש"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:482
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ערוך מיקום"
 
@@ -18043,11 +18027,11 @@ msgstr ""
 msgid "SpamAssassin is not available."
 msgstr "אפשרויות שליחה לא זמינות."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:904
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "זה יהפוך את SpamAssassin לאמין יותר, אך הוא יעבוד לאט יותר"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:916
 msgid "I_nclude remote tests"
 msgstr "כלול בדיקות מ_רוחקות"
 
@@ -18179,23 +18163,20 @@ msgid "Quickly select a single calendar or task list for viewing."
 msgstr "העבר את ההודעות שנבחרו לאשפה"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#, fuzzy
 msgid "Select One Source"
 msgstr "בחר מקור אחד"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "Show _only this Calendar"
-msgstr "לוח שנה"
+msgstr "הצג _רק את היומן הזה"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-#, fuzzy
 msgid "Show _only this Memo List"
-msgstr "לוח שנה"
+msgstr "הצג _רק את רשימת התזכורות הזאת"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr ""
+msgstr "הצג _רק את רשימת המשימות הזאת"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -18231,7 +18212,7 @@ msgstr "מייבא קבצים"
 #: ../plugins/startup-wizard/startup-wizard.c:117
 #: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
-msgstr "אנא בחר את המידע שברצומך לייבא:"
+msgstr "אנא בחר את המידע שברצונך לייבא:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:132
 #: ../shell/e-shell-importer.c:420
@@ -18337,9 +18318,8 @@ msgid "Save in Address Book"
 msgstr "שמור בספר הכתובות"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#, fuzzy
 msgid "Add WebDAV contacts to Evolution."
-msgstr "אנשי קשר מ־WebDAV"
+msgstr "הוסף אנשי קשר מ־WebDAV."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
@@ -18439,11 +18419,11 @@ msgstr "Initial file chooser folder"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
+msgstr "Initial folder for GtkFileChooser dialogs."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
-msgstr ""
+msgstr "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
@@ -18494,7 +18474,7 @@ msgid "Skip development warning dialog"
 msgstr "Skip development warning dialog"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:31
-#: ../shell/main.c:483
+#: ../shell/main.c:485
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -18628,7 +18608,7 @@ msgstr ""
 
 #: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
-msgstr ""
+msgstr "בחר יעד לייבוא"
 
 #: ../shell/e-shell-importer.c:141
 msgid ""
@@ -18652,11 +18632,11 @@ msgstr "_סוג הקובץ:"
 
 #: ../shell/e-shell-importer.c:358
 msgid "Import data and settings from _older programs"
-msgstr "יבא נתונים והגדרות מ תוכנות _ישנות יותר"
+msgstr "ייבא נתונים והגדרות מתוכנות _ישנות יותר"
 
 #: ../shell/e-shell-importer.c:361
 msgid "Import a _single file"
-msgstr "יבא _קובץ יחיד"
+msgstr "ייבא קובץ _יחיד"
 
 #: ../shell/e-shell-importer.c:725
 msgid "_Import"
@@ -18725,7 +18705,7 @@ msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr ""
-"Evolution נמצאת במצב מקוון.\n"
+"‏Evolution נמצאת במצב מקוון.\n"
 "לחץ כאן כדי לעבור למצב לא מקוון."
 
 #: ../shell/e-shell-window.c:382
@@ -18743,7 +18723,7 @@ msgstr ""
 #: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
-msgstr "החלף ל-%s"
+msgstr "החלף ל־%s"
 
 #: ../shell/e-shell.c:639
 msgid "Unknown system error."
@@ -18772,9 +18752,9 @@ msgstr ""
 msgid "Configuration Database not found"
 msgstr "בסיס נתוני ההגדרות לא נמצא"
 
-#: ../shell/e-user-creatable-items-handler.c:677
-#: ../shell/e-user-creatable-items-handler.c:687
-#: ../shell/e-user-creatable-items-handler.c:692
+#: ../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 "חדש"
 
@@ -18826,9 +18806,12 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
+"ברוך הבא לאשף היבוא של Evolution.\n"
+"הוא יסיע וידריך אותך בתהליך של\n"
+"יבוא קבצים חיצוניים ל־Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18848,7 +18831,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:245
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18856,43 +18839,43 @@ msgstr ""
 "תודה\n"
 "צוות Evolution\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:253
 msgid "Do not tell me again"
-msgstr "אל תודיע לי שוב"
+msgstr "Do not tell me again"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:483
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:487
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:490
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:494
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:497
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:499
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:501
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:588
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and Email Client"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:616
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18920,7 +18903,7 @@ msgstr "מחיקת מידע ישן מגרסה {0}?"
 
 #: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
-msgstr "Evolution לא יכולה להתחיל."
+msgstr "‏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."
@@ -18928,7 +18911,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "אין מספיק מקום פנוי עבור שדרוג."
 
 #: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
@@ -18952,7 +18935,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
-msgstr ""
+msgstr "שדרוג מגרסה קודמת נכשל: {0}"
 
 #: ../shell/shell.error.xml.h:21
 msgid ""
@@ -18960,6 +18943,9 @@ msgid ""
 "\n"
 "You will need to make more space available in your home directory before you can continue."
 msgstr ""
+"שדרוג הנתונים וההגדרות שלך ידרוש {0} מקום פנוי, אך יש לך רק {1} מקום זמין.\n"
+"\n"
+"יהיה עליך לפנות מקום בתיקיית הבית שלך לפני שתוכל להמשיך."
 
 #: ../shell/shell.error.xml.h:24
 msgid ""
@@ -19100,7 +19086,7 @@ msgstr ""
 
 #: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
-msgstr "cjr ,gusv"
+msgstr "בחר תעודה"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
@@ -19302,19 +19288,19 @@ msgstr ""
 
 #: ../smime/lib/e-cert.c:514
 msgid "Version"
-msgstr "גירסה"
+msgstr "גרסה"
 
 #: ../smime/lib/e-cert.c:529
 msgid "Version 1"
-msgstr "גירסה 1"
+msgstr "גרסה 1"
 
 #: ../smime/lib/e-cert.c:532
 msgid "Version 2"
-msgstr "גירסה 2"
+msgstr "גרסה 2"
 
 #: ../smime/lib/e-cert.c:535
 msgid "Version 3"
-msgstr "גירסה 3"
+msgstr "גרסה 3"
 
 #: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
@@ -19553,9 +19539,8 @@ msgid "Forward Contact"
 msgstr "העבר איש קשר"
 
 #: ../ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Mo_ve All Contacts To..."
-msgstr "הזז אנשי קשר ל"
+msgstr "הע_בר אנשי קשר אל..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
@@ -19588,7 +19573,7 @@ msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr ""
+msgstr "הדפס את אנשי הקשר הנבחרים"
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
@@ -19623,7 +19608,7 @@ msgstr "בחר ה_כל"
 
 #: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
-msgstr ""
+msgstr "בחר את כל אנשי הקשר"
 
 #: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
@@ -19796,15 +19781,15 @@ msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
-msgstr ""
+msgstr "בחר את היום"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
-msgstr ""
+msgstr "הצג כרשימה"
 
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
-msgstr ""
+msgstr "בחר יום אחד"
 
 #: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
@@ -19855,9 +19840,8 @@ msgid "Copy the selected folder into another folder"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
 #: ../ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "צור תיקייה וירטואלית עבור רשימת תפוצה זו"
+msgstr "צור תיקייה חדשה לאחסון דואר"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
@@ -19895,9 +19879,8 @@ msgid "Search F_olders"
 msgstr "תיקיות _חיפוש"
 
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
 msgid "Show Message _Preview"
-msgstr "כותרת ההודעה"
+msgstr "הצג תצוגה _מקדימה"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
@@ -19953,7 +19936,7 @@ msgstr "תיאור:"
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
-msgstr ""
+msgstr "_תצוגה אנכית"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -20577,7 +20560,7 @@ msgstr "הדפס את רשימת התזכורות"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
-msgstr ""
+msgstr "הצג את התזכורת הנבחרת"
 
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
@@ -20597,15 +20580,15 @@ msgstr "מחק משימות שהסתיימו"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr ""
+msgstr "מחק משימות הנבחרות"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr ""
+msgstr "סמ_ן שהושלמה"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr ""
+msgstr "סמן את המשימות הנבחרות כמשימות שהושלמו"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
@@ -20694,7 +20677,7 @@ msgstr "סמלים ו_טקסט"
 
 #: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
-msgstr "יבא נתונים מתוכניות אחרות"
+msgstr "ייבא נתונים מתוכניות אחרות"
 
 #: ../ui/evolution.xml.h:17
 msgid "Lay_out"
@@ -20902,11 +20885,11 @@ msgid "With _Status"
 msgstr "עם _מצב"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777
 msgid "UTC"
 msgstr "UTC"
 
@@ -20934,19 +20917,19 @@ msgstr ""
 "לחץ על הכפתור השמאלי בעכבר כדי להתקרב לאזור במפה ולבחור אזור זמן.\n"
 "לחץ על הפתור הימני בעכבר כדי להתרחק."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "אוסף"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr ""
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "הגדרת תצוגות"
 
@@ -20997,9 +20980,9 @@ msgid "C_urrent View"
 msgstr "תצוגה _נוכחית"
 
 #: ../widgets/menus/gal-view-menus.c:328
-#, fuzzy, c-format
+#, c-format
 msgid "Select View: %s"
-msgstr "תצוגת שבוע"
+msgstr "בחר תצוגה: %s"
 
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
@@ -21019,11 +21002,11 @@ msgstr "שמור תצוגה נוכחית"
 msgid "Create or edit views"
 msgstr "צור פריט מבחן חדש"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "הגדרת תצוגה חדשה"
 
@@ -21045,76 +21028,71 @@ msgid "Attached message"
 msgstr "הודעה מצורפת"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1719
-#: ../widgets/misc/e-attachment.c:2270
-#: ../widgets/misc/e-attachment-store.c:635
-#, fuzzy
+#: ../widgets/misc/e-attachment.c:1723
+#: ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
-msgstr "תצריף"
+msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1766
-#: ../widgets/misc/e-attachment.c:2572
+#: ../widgets/misc/e-attachment.c:1770
+#: ../widgets/misc/e-attachment.c:2567
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1774
-#: ../widgets/misc/e-attachment.c:2580
+#: ../widgets/misc/e-attachment.c:1778
+#: ../widgets/misc/e-attachment.c:2575
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1867
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:1871
+#, c-format
 msgid "Could not load '%s'"
-msgstr "לא ניתן לטעון את ספר הכתובות"
+msgstr "לא ניתן לטעון את '%s'"
 
-#: ../widgets/misc/e-attachment.c:1870
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:1874
+#, c-format
 msgid "Could not load the attachment"
-msgstr "לא ניתן לפתוח את הקישור."
+msgstr "לא ניתן לפתוח את התצריף."
 
-#: ../widgets/misc/e-attachment.c:2147
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:2138
+#, c-format
 msgid "Could not open '%s'"
-msgstr "לא ניתן לפתוח את המקור"
+msgstr "לא ניתן לפתוח את '%s'"
 
-#: ../widgets/misc/e-attachment.c:2150
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:2141
+#, c-format
 msgid "Could not open the attachment"
-msgstr "לא ניתן לפתוח את הקישור."
+msgstr "לא ניתן לפתוח את התצריף"
 
-#: ../widgets/misc/e-attachment.c:2588
-#, fuzzy
+#: ../widgets/misc/e-attachment.c:2583
 msgid "Attachment contents not loaded"
-msgstr "מאפייני תצריף"
+msgstr "לא ניתן לטעון את תוכן התצריף"
 
-#: ../widgets/misc/e-attachment.c:2665
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:2660
+#, c-format
 msgid "Could not save '%s'"
-msgstr "לא ניתן להריץ את '%s': %s\n"
+msgstr "לא ניתן לשמור את '%s'"
 
-#: ../widgets/misc/e-attachment.c:2668
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:2663
+#, c-format
 msgid "Could not save the attachment"
-msgstr "בחר תיקייה לשמירת כל התצריפים"
+msgstr "לא ניתן לשמור את התצריף"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "מאפייני תצריף"
 
 #: ../widgets/misc/e-attachment-dialog.c:328
-#, fuzzy
 msgid "_Filename:"
-msgstr "ש_ם הקובץ:"
+msgstr "שם ה_קובץ:"
 
 #: ../widgets/misc/e-attachment-dialog.c:363
-#, fuzzy
 msgid "MIME Type:"
-msgstr "סוג MIME"
+msgstr "סוג MIME:"
 
 #: ../widgets/misc/e-attachment-handler-image.c:95
-#, fuzzy
 msgid "Could not set as background"
-msgstr "קבע כ_רקע"
+msgstr "לא ניתן לקבוע כרקע"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 #, fuzzy
@@ -21124,9 +21102,8 @@ msgstr[0] "לא ניתן לפתוח את הקישור."
 msgstr[1] "לא ניתן לפתוח את הקישור."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
-#, fuzzy
 msgid "_Send To..."
-msgstr "שלח אל:"
+msgstr "__שלח אל..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
 #, fuzzy
@@ -21145,12 +21122,12 @@ msgstr "טוען..."
 msgid "Saving"
 msgstr "משתף"
 
-#: ../widgets/misc/e-attachment-paned.c:80
+#: ../widgets/misc/e-attachment-paned.c:81
 msgid "Hide _Attachment Bar"
 msgstr "ה_סתר את תיבת התצריפים"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
 msgid "Show _Attachment Bar"
 msgstr "_הצג את תיבת התצריפים"
 
@@ -21163,7 +21140,7 @@ msgstr "תצריף"
 msgid "A_ttach"
 msgstr "צ_רף"
 
-#: ../widgets/misc/e-attachment-store.c:606
+#: ../widgets/misc/e-attachment-store.c:607
 #, fuzzy
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
@@ -21179,12 +21156,12 @@ msgstr "שמור ה_כל"
 msgid "A_dd Attachment..."
 msgstr "הוסף _תצריף"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:643
 #, fuzzy, c-format
 msgid "Open with \"%s\""
 msgstr "פתח ב-%s..."
 
-#: ../widgets/misc/e-attachment-view.c:649
+#: ../widgets/misc/e-attachment-view.c:646
 #, fuzzy, c-format
 msgid "Open this attachment in %s"
 msgstr "שומר תצריף"
@@ -21245,7 +21222,7 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91
+#: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/misc/e-reflow.c:1416
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:649
@@ -21253,7 +21230,7 @@ msgstr "Y2"
 msgid "Minimum width"
 msgstr "רוחב מינימלי"
 
-#: ../widgets/misc/e-canvas-vbox.c:92
+#: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:1004
 #: ../widgets/table/e-table-group-leaf.c:650
@@ -21261,8 +21238,8 @@ msgstr "רוחב מינימלי"
 msgid "Minimum Width"
 msgstr "רוחב מינימלי"
 
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:101
+#: ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "ריווח"
 
@@ -21387,7 +21364,7 @@ msgstr ""
 
 #: ../widgets/misc/e-dateedit.c:345
 msgid "Click this button to show a calendar"
-msgstr "לחץ על כפתור זה כדי להציג לוח שנה"
+msgstr "לחץ על כפתור זה כדי להציג יומן"
 
 #: ../widgets/misc/e-dateedit.c:387
 msgid "Drop-down combination box to select time"
@@ -21430,30 +21407,30 @@ msgstr "_חיפושים"
 msgid "Searches"
 msgstr "חיפושים"
 
-#: ../widgets/misc/e-filter-bar.h:103
-#: ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "שמור _חיפוש..."
 
-#: ../widgets/misc/e-filter-bar.h:104
-#: ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_ערוך חיפושים שמורים"
 
-#: ../widgets/misc/e-filter-bar.h:105
-#: ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "חיפוש _מתקדם..."
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "כל החשבונות"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "חשבון נוכחי"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "תיקייה נוכחית"
 
@@ -21730,7 +21707,7 @@ msgstr "%s (%d%% הסתיים)"
 msgid "Click here to go to URL"
 msgstr "לחץ כאן כדי לעבור לכתובת"
 
-#: ../widgets/table/e-cell-combo.c:175
+#: ../widgets/table/e-cell-combo.c:173
 msgid "popup list"
 msgstr ""
 
@@ -21740,7 +21717,7 @@ msgstr "%l:%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
-msgstr "עמודה ניבחרת"
+msgstr "עמודה נבחרת"
 
 #: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
@@ -21792,12 +21769,12 @@ msgstr "לא ממוין"
 msgid "No grouping"
 msgstr "ללא קיבוץ"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:644
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "הצג שדות"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:665
 msgid "Available Fields"
 msgstr "שדות אפשריים"
 
@@ -21879,7 +21856,7 @@ msgstr ""
 msgid "_Sort..."
 msgstr "_מיין..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "הוסף עמודה..."
 
@@ -22245,6 +22222,15 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Show BCC"
+#~ msgstr "ת_צוגה: "
+
+#, fuzzy
+#~ msgid "Add attachment"
+#~ msgstr "תצריף"
+#~ msgid "Retrieving Message..."
+#~ msgstr "מקבל הודעה..."
 #~ msgid "Case _sensitive"
 #~ msgstr "תלוי _רשיות"
 #~ msgid "F_ind:"
diff --git a/po/or.po b/po/or.po
index 30cd9807ae..83e733c1f5 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
 "POT-Creation-Date: 2009-06-09 07:43+0000\n"
-"PO-Revision-Date: 2009-06-11 20:38+0530\n"
+"PO-Revision-Date: 2009-06-18 19:23+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -45,6 +45,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
@@ -1035,7 +1036,7 @@ msgstr "ଭୂଲମ୍ବ ଫଳକ ଅବସ୍ଥିତି"
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
-msgstr ""
+msgstr "ଭରଣରେ ସ୍ୱୟଂ ସମ୍ପୂର୍ଣ୍ଣ ସମ୍ପର୍କ ତାଲିକାର ନାମ ସହିତ ମେଲ ଠିକଣାକୁ ଦର୍ଶାଉଅଛି କି ନାହିଁ।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
@@ -4041,6 +4042,8 @@ msgid ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
+"ଏହି ପ୍ରୟୋଗଟି ବଚ୍ଛିତ ସମୟ ସୀମା ଠାରୁ ପୁରୁଣା ଘଟଣାଗୁଡ଼ିକୁ ସମ୍ପୂର୍ଣ୍ଣଭାବରେ ଲୁପ୍ତ କରିଦେବ। ଯଦି ଆପଣ ଅଗ୍ରସର "
+"ହୁଅନ୍ତି, ତେବେ ଆପଣ ସେହି ଘଟଣାଗୁଡ଼ିକର ପୁନରୁଦ୍ଧାର କରିପାରିବେ ନାହିଁ।"
 
 #: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
@@ -5196,7 +5199,7 @@ msgstr "ସମ୍ପୂର୍ଣ୍ଣ ଦିନର ଘଟଣା (_D)"
 
 #: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
-msgstr ""
+msgstr "ସାରା ଦିନର ଘଟଣାକୁ ପାଇବା ପାଇଁ ଆଗପଛ ହେଉଥାଏ"
 
 #: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
@@ -5204,7 +5207,7 @@ msgstr "ସମୟକୁ ବ୍ୟସ୍ତ ଭାବରେ ପ୍ରଦର୍ଶ
 
 #: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
-msgstr ""
+msgstr "ସମୟକୁ ବ୍ୟସ୍ତ ଭାବରେ ଦର୍ଶାଇବା ପାଇଁ ଆଗପଛ ହେଉଥାଏ"
 
 #: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
@@ -5212,7 +5215,7 @@ msgstr "ମୁକ୍ତ/ବ୍ୟସ୍ତ (_F)"
 
 #: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
-msgstr ""
+msgstr "ଅଂଶଗ୍ରହଣକାରୀମାନଙ୍କ ପାଇଁ ପ୍ରଶ୍ନ ମୁକ୍ତ / ବ୍ୟସ୍ତ ସୂଚନା"
 
 #: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
@@ -5267,7 +5270,7 @@ msgstr "ଅନ୍ତିମ ସମୟ ଭୂଲ ଅଟେ"
 #: ../calendar/gui/dialogs/memo-page.c:681
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "The organizer selected no longer has an account."
-msgstr ""
+msgstr "ବଚ୍ଛିତ ଆୟୋଜକଙ୍କର ଏବେ ଆଉ ଖାତା ନାହିଁ।"
 
 #: ../calendar/gui/dialogs/event-page.c:1427
 #: ../calendar/gui/dialogs/memo-page.c:687
@@ -5309,8 +5312,8 @@ msgstr "ଆପଣ %s ବଦଳରେ କାର୍ଯ୍ୟକରୁଛନ୍ତ�
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] ""
-msgstr[1] "d ଦିନ ପୂର୍ବରୁ"
+msgstr[0] "ସାକ୍ଷାତକାରର %d ଦିନ ପୂର୍ବେ"
+msgstr[1] "ସାକ୍ଷାତକାରର %d ଦିନ ପୂର୍ବେd ଦିନ ପୂର୍ବରୁ"
 
 #: ../calendar/gui/dialogs/event-page.c:2948
 #, c-format
@@ -5430,22 +5433,22 @@ msgstr "ସମୂହ (_G):"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
+msgstr "ଆପଣ ଗୋଟିଏ ପୁନଃପୌନିକ ଘଟଣାକୁ ପରିବର୍ତ୍ତନ କରୁଛନ୍ତି। ଆପଣ କଣ ପରିବର୍ତ୍ତନ କରିବାକୁ ଚାହୁଁଛନ୍ତି?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
+msgstr "ଆପଣ ଗୋଟିଏ ପୁନଃପୌନିକ ଘଟଣାର ପ୍ରତିନିଧିତ୍ତ୍ୱ କରୁଛନ୍ତି। ଆପଣ କଣ ପ୍ରତିନିଧିତ୍ତ୍ୱ କରିବାକୁ ଚାହୁଁଛନ୍ତି?"
 
 #: ../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:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr ""
+msgstr "ଆପଣ ଗୋଟିଏ ପୁନଃପୌନିକ ମେମୋକୁ ପରିବର୍ତ୍ତନ କରୁଛନ୍ତି। ଆପଣ କଣ ପରିବର୍ତ୍ତନ କରିବାକୁ ଚାହୁଁଛନ୍ତି?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
@@ -5465,7 +5468,7 @@ msgstr "ସମସ୍ତ ଦ୍ରୁଷ୍ଟାନ୍ତ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+msgstr "ଏହି ସାକ୍ଷାତକାରରେ ପୁନଃ ପ୍ରତିଫଳନ ହେଉଛି ଯାହାକୁକି Evolution ସମ୍ପାଦନ କରିପାରିବ ନାହିଁ।"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:888
 msgid "Recurrence date is invalid"
@@ -5473,7 +5476,7 @@ msgstr "ପୁନଃପୌନିକ ତାରିଖ ଅବୈଧ ଅଟେ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "End time of the recurrence was before event's start"
-msgstr ""
+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.
@@ -5611,7 +5614,7 @@ msgstr "ପ୍ରତ୍ଯେକ"
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
-msgstr ""
+msgstr "ଏହି ସାକ୍ଷାତକାରଟି ପୁଣି ଘଟିଥାଏ (_u)"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
@@ -5696,7 +5699,7 @@ msgstr "ସ୍ଥିତି ବିବରଣୀ (_S)"
 
 #: ../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:123
 #: ../composer/e-composer-actions.c:371
@@ -5977,6 +5980,9 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
+"ଭୌଗଳିକ ଅବସ୍ଥିତିକୁ ଏହି ଶୈଳୀରେ ଭରଣ କରିବା ଉଚିତ: \n"
+"\n"
+"45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
 #: ../calendar/gui/e-meeting-list-view.c:191
@@ -6517,11 +6523,11 @@ msgstr "ସାମୟିକଭାବେ ସ୍ବୀକୃତ"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
+msgstr "ସାକ୍ଷାତକାରଟି ବାତିଲ ହୋଇଯାଇଛି, ଯଦିଚ ଏହା ଆପଣଙ୍କ କ୍ୟାଲେଣ୍ଡରରେ ମିଳୁନାହିଁ"
 
 #: ../calendar/gui/e-itip-control.c:1278
 msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
+msgstr "କାର୍ଯ୍ୟଟି ବାତିଲ ହୋଇଯାଇଛି, ଯଦିଚ ଏହା ଆପଣଙ୍କ କାର୍ଯ୍ୟ ତାଲିକା ମିଳୁନାହିଁ"
 
 #: ../calendar/gui/e-itip-control.c:1356
 #, c-format
@@ -6587,7 +6593,7 @@ msgstr "ସାକ୍ଷାତ ବାତିଲ ହୋଇଛି"
 #: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "<b>%s</b> ଗୋଟିଏ ଅଜ୍ଞାତ ସନ୍ଦେଶ ପଠାଇଛି।"
 
 #: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
@@ -6629,7 +6635,7 @@ msgstr "କାର୍ଯ୍ୟ ଅଦ୍ୟତନ"
 #: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgstr "<b>%s</b> ନୂନତତମ କାର୍ଯ୍ୟ ସୂଚନା ଗ୍ରହଣ କରିବାକୁ ଇଚ୍ଛାପ୍ରକାଶ କରୁଅଛି।"
 
 #: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
@@ -6638,7 +6644,7 @@ msgstr "କାର୍ଯ୍ୟ ଅଦ୍ୟତନ ଅନୁରୋଧ"
 #: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
+msgstr "<b>%s</b> ଗୋଟିଏ ନ୍ୟସ୍ତ କାର୍ଯ୍ୟଭାରକୁ ଉତ୍ତର ଦେଇଅଛି।"
 
 #: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
@@ -6690,7 +6696,7 @@ msgstr "ଖରାପ ମୁକ୍ତ/ବ୍ଯସ୍ତ ସନ୍ଦେଶ"
 
 #: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
-msgstr ""
+msgstr "ସନ୍ଦେଶଟି ସଠିକ ଭାବରେ ସଜ୍ଜିକରଣ ହୋଇଥିବା ପରି ଦୃଶ୍ୟମାନ ହେଉନାହିଁ"
 
 #: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
@@ -6710,15 +6716,15 @@ msgstr "ଅଦ୍ୟତନ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି\n"
 
 #: ../calendar/gui/e-itip-control.c:2007
 msgid "Object is invalid and cannot be updated\n"
-msgstr ""
+msgstr "ବସ୍ତୁଟି ଅବୈଧ ଅଟେ ଏବଂ ଏହାକୁ ଅଦ୍ୟତନ କରାଯାଇପାରିବ ନାହିଁ\n"
 
 #: ../calendar/gui/e-itip-control.c:2024
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
+msgstr "ଏହି ଉତ୍ତରଟି ଜଣେ ପ୍ରଚଳିତ ଅଂଶଗ୍ରହଣକାରୀଙ୍କ ପାଖରୁ ଆସିନାହିଁ।  ଅଂଶଗ୍ରହଣକାରୀ ଭାବରେ ଯୋଗକରିବେ କି?"
 
 #: ../calendar/gui/e-itip-control.c:2042
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
+msgstr "ଗୋଟିଏ ଅବୈଧ ସ୍ଥିତି ହେତୁ ଅଂଶଗ୍ରହଣକାରୀ ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରାଯାଇପାରିଲା ନାହିଁ!\n"
 
 #: ../calendar/gui/e-itip-control.c:2066
 msgid "Attendee status updated\n"
@@ -6727,7 +6733,7 @@ msgstr "ଶ୍ରୋତା ସ୍ଥିତି ଅଦ୍ୟତନ\n"
 #: ../calendar/gui/e-itip-control.c:2073
 #: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+msgstr "ବସ୍ତୁଟି ଏବେ ଅବସ୍ଥିତ ନଥିବା ହେତୁ ଅଂଶଗ୍ରହଣକାରୀ ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରାଯାଇପାରିଲା ନାହିଁ"
 
 #: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2161
 msgid "Item sent!\n"
@@ -6759,7 +6765,7 @@ msgstr "ଗ୍ରହଣକର"
 
 #: ../calendar/gui/e-itip-control.c:2381
 msgid "Tentatively accept"
-msgstr ""
+msgstr "ଅସ୍ଥାୟୀ ଭାବରେ ଗ୍ରହଣ କରାଯାଇଛି"
 
 #: ../calendar/gui/e-itip-control.c:2382
 #: ../plugins/groupwise-features/process-meeting.c:55
@@ -6772,7 +6778,7 @@ msgstr "ମୁକ୍ତ/ବ୍ଯସ୍ତ ସୂଚନା ପଠାନ୍ତୁ
 
 #: ../calendar/gui/e-itip-control.c:2431
 msgid "Update respondent status"
-msgstr ""
+msgstr "ଅଦ୍ୟତନ ଉତ୍ତରଦାତା ସ୍ଥିତି"
 
 #: ../calendar/gui/e-itip-control.c:2455
 msgid "Send Latest Information"
@@ -6812,7 +6818,7 @@ msgstr "ସର୍ଭର ସନ୍ଦେଶ:"
 
 #: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
-msgstr ""
+msgstr "ଅଧ୍ଯକ୍ଷ"
 
 #: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
@@ -6834,7 +6840,7 @@ msgstr "ଉପସ୍ଥିତ ବ୍ୟକ୍ତି"
 #: ../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:981
 msgid "Individual"
-msgstr ""
+msgstr "ବ୍ୟକ୍ତିଗତ"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
@@ -6858,7 +6864,7 @@ msgstr "କକ୍ଷ"
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
 #: ../calendar/gui/print.c:998
 msgid "Chair"
-msgstr ""
+msgstr "ଅଧ୍ଯକ୍ଷ"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
@@ -6876,7 +6882,7 @@ msgstr "ଇଚ୍ଛାଧୀନ ଅଂଶଗ୍ରହଣ କାରୀ"
 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
 #: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
-msgstr ""
+msgstr "ଅଂଶଗ୍ରହଣ କାରୁନଥିବା ବ୍ୟକ୍ତି"
 
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
@@ -6945,15 +6951,15 @@ msgstr "ମୁକ୍ତ/ବ୍ୟସ୍ତ ଅଦ୍ୟତନ କରନ୍ତୁ
 
 #: ../calendar/gui/e-meeting-time-sel.c:492
 msgid "_<<"
-msgstr ""
+msgstr "_<<"
 
 #: ../calendar/gui/e-meeting-time-sel.c:510
 msgid "_Autopick"
-msgstr ""
+msgstr "ସ୍ୱୟଂ ଉଠାଣ (_A)"
 
 #: ../calendar/gui/e-meeting-time-sel.c:525
 msgid ">_>"
-msgstr ""
+msgstr ">_>"
 
 #: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "_All people and resources"
@@ -7048,7 +7054,7 @@ msgstr "କାର୍ଯ୍ୟ ସମ୍ପୂର୍ଣ୍ଣ କରୁଅଛି.
 
 #: ../calendar/gui/e-tasks.c:1355
 msgid "Expunging"
-msgstr ""
+msgstr "କାଟୁଅଛି"
 
 #: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
@@ -7095,7 +7101,7 @@ msgstr "%s କୁ ଖୋଲୁଅଛି"
 
 #: ../calendar/gui/gnome-cal.c:3995
 msgid "Purging"
-msgstr ""
+msgstr "ନିର୍ମଳ କରୁଅଛି"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid ""
@@ -7228,7 +7234,7 @@ msgstr "ମୁକ୍ତ/ବ୍ଯସ୍ତ ସୂଚନା (%s to %s)"
 
 #: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
-msgstr ""
+msgstr "iCalendar ସୂଚନା"
 
 #: ../calendar/gui/itip-utils.c:978
 msgid "You must be an attendee of the event."
@@ -7319,6 +7325,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution କାର୍ଯ୍ଯ ଫୋଲଡରର ଅବସ୍ଥାନ ଏବଂ ଅନୁକ୍ରମ Evolution 1.x ପରଠୁଁ ପରିବର୍ତ୍ତିତ ହୋଇଛି।\n"
+"\n"
+"Evolution ଆପଣଙ୍କର ଫୋଲଡରଗୁଡ଼ିକୁ ସ୍ଥାନାନ୍ତରିତ କରିବା ସମୟରେ ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
@@ -7327,24 +7336,27 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution କ୍ୟାଲେଣ୍ଡର ଫୋଲଡରର ଅବସ୍ଥାନ ଏବଂ ଅନୁକ୍ରମ Evolution 1.x ପରଠୁଁ ପରିବର୍ତ୍ତିତ ହୋଇଛି।\n"
+"\n"
+"Evolution ଆପଣଙ୍କର ଫୋଲଡରଗୁଡ଼ିକୁ ସ୍ଥାନାନ୍ତରିତ କରିବା ସମୟରେ ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ..."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "evolution/config.xmldb ରୁ ପୁରୁଣା ସଂରଚନାଗୁଡ଼ିକୁ ସ୍ଥାନାନ୍ତରିତ କରିବାରେ ଅସମର୍ଥ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr ""
+msgstr "କ୍ୟାଲେଣ୍ଡର `%s' କୁ ସ୍ଥାନାନ୍ତିରିତ କରିବାରେ ଅସମର୍ଥ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr ""
+msgstr "କାର୍ଯ୍ୟ `%s'କୁ ସ୍ଥାନାନ୍ତରିତ କରିବାରେ ଅସମର୍ଥ"
 
 #: ../calendar/gui/migration.c:1227
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
@@ -7479,35 +7491,35 @@ msgstr "ଏକତିଂଶ"
 
 #: ../calendar/gui/print.c:596
 msgid "Su"
-msgstr ""
+msgstr "Su"
 
 #: ../calendar/gui/print.c:596
 msgid "Mo"
-msgstr ""
+msgstr "Mo"
 
 #: ../calendar/gui/print.c:596
 msgid "Tu"
-msgstr ""
+msgstr "Tu"
 
 #: ../calendar/gui/print.c:596
 msgid "We"
-msgstr ""
+msgstr "We"
 
 #: ../calendar/gui/print.c:597
 msgid "Th"
-msgstr ""
+msgstr "Th"
 
 #: ../calendar/gui/print.c:597
 msgid "Fr"
-msgstr ""
+msgstr "Fr"
 
 #: ../calendar/gui/print.c:597
 msgid "Sa"
-msgstr ""
+msgstr "Sa"
 
 #: ../calendar/gui/print.c:2488
 msgid "Appointment"
-msgstr ""
+msgstr "ସାକ୍ଷାତକାର"
 
 #: ../calendar/gui/print.c:2490
 msgid "Task"
@@ -7569,7 +7581,7 @@ msgstr "କାର୍ଯ୍ୟ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି।
 #: ../calendar/gui/tasks-component.c:736
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
+msgstr "ଘଟଣା ଏବଂ ସାକ୍ଷାତକାର ନିର୍ମାଣ କରିବା ପାଇଁ କାର୍ଯ୍ୟ ତାଲିକା '%s'କୁ ଖୋଲିବାରେ ଅସମର୍ଥ"
 
 #: ../calendar/gui/tasks-component.c:749
 msgid "There is no calendar available for creating tasks"
@@ -7625,6 +7637,10 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
+"ଏହି ପ୍ରୟୋଗଟି ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଥିବା ପରି ଚିହ୍ନିତ ସମସ୍ତ କାର୍ଯ୍ୟକୁ ସବୁଦିନ ପାଇଁ ଲୁପ୍ତ କରିଦେବ। ଯଦି ଆପଣ ଅଗ୍ରସର "
+"ହୁଅନ୍ତି, ତେବେ ଆପଣ ଏହି କାର୍ଯ୍ୟଗୁଡ଼ିକୁ କାଢ଼ିବାରେ ସକ୍ଷମ ହେବେ ନାହିଁ।।\n"
+"\n"
+"ପ୍ରକୃତରେ ଏହି କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ଲିଭାନ୍ତୁ?"
 
 #: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127
 msgid "Do not ask me again."
@@ -9331,7 +9347,7 @@ msgstr "ସୁରକ୍ଷା (_S)"
 
 #: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
-msgstr ""
+msgstr "PGP ସଂଗୁପ୍ତ (_E)"
 
 #: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
@@ -9339,7 +9355,7 @@ msgstr "PGP ସହିତ ଏହି ସନ୍ଦେଶକୁ ସଂଗୁପ୍�
 
 #: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
-msgstr ""
+msgstr "PGP ହସ୍ତାକ୍ଷର (_S)"
 
 #: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
@@ -9351,15 +9367,15 @@ msgstr "ସନ୍ଦେଶକୁ ପ୍ରାଥମିକତା ଦିଅନ୍�
 
 #: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
-msgstr ""
+msgstr "ସନ୍ଦେଶ ପ୍ରାଥମିକତାକୁ ଉଚ୍ଚ କରନ୍ତୁ"
 
 #: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
-msgstr ""
+msgstr "ପଢ଼ାଯାଇଥିବା ରସିଦ ପାଇଁ ଅନୁରୋଧ (_q)"
 
 #: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
-msgstr ""
+msgstr "ଆପଣଙ୍କର ସନ୍ଦେଶଟି ପଢ଼ିବା ସମୟରେ ପ୍ରେରଣ ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରନ୍ତୁ"
 
 #: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
@@ -9367,7 +9383,7 @@ msgstr "S/MIME ସେଗୁପ୍ତ (_c)"
 
 #: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
+msgstr "ଆପଣଙ୍କର S/MIME ସଂଗୁପ୍ତ ପ୍ରମାଣପତ୍ର ସହିତ ଏହି ସନ୍ଦେଶକୁ ସଂଗୁପ୍ତ କରନ୍ତୁ"
 
 #: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
@@ -9375,7 +9391,7 @@ msgstr "S/MIME ହସ୍ତାକ୍ଷର (_n)"
 
 #: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
+msgstr "ଆପଣଙ୍କର S/MIME ହସ୍ତାକ୍ଷର ପ୍ରମାଣପତ୍ର ସହିତ ଏହି ସନ୍ଦେଶରେ ହସ୍ତାକ୍ଷର କରନ୍ତୁ"
 
 #: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
@@ -9391,7 +9407,7 @@ msgstr "Cc କ୍ଷେତ୍ର (_C)"
 
 #: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
-msgstr ""
+msgstr "CC କ୍ଷେତ୍ରଟି ଦର୍ଶାହୋଇଛି କି ନାହିଁ ଜାଣିବା ପାଇଁ ଆଗପଛ ହେଉଅଛି"
 
 #: ../composer/e-composer-actions.c:468
 msgid "_From Field"
@@ -9399,7 +9415,7 @@ msgstr "ଠାରୁ କ୍ଷେତ୍ର (_F)"
 
 #: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
-msgstr ""
+msgstr "ପ୍ରେରକ ଚୟନକର୍ତ୍ତାଟି ଦର୍ଶାହୋଇଛି କି ନାହିଁ ଜାଣିବା ପାଇଁ ଆଗପଛ ହେଉଛି"
 
 #: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
@@ -9407,7 +9423,7 @@ msgstr "କ୍ଷେତ୍ରକୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_R)"
 
 #: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
+msgstr "କୁ ଉତ୍ତର ଦିଅନ୍ତୁ କ୍ଷେତ୍ରଟି ଦର୍ଶାହୋଇକି ନାହିଁ ଜାଣିବା ପାଇଁ ଆଗପଛ ହେଉଛି"
 
 #: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
@@ -9419,17 +9435,17 @@ msgstr "ସନ୍ଦେଶର ଗ୍ରାହକକୁ ଭରଣ କରନ୍ତ
 
 #: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
+msgstr "ସନ୍ଦେଶର ନକଲକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଠିକଣା ଭରଣ କରନ୍ତୁ"
 
 #: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
-msgstr ""
+msgstr "ଗ୍ରାହକ ତାଲିକାରେ ଦୃଶ୍ୟମାନ ନହୋଇ ସନ୍ଦେଶର ନକଲକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଠିକଣା ଭରଣ କରନ୍ତୁ"
 
 #: ../composer/e-composer-header-table.c:927
 msgid "Fr_om:"
-msgstr ""
+msgstr "ରୁ (_o):"
 
 #: ../composer/e-composer-header-table.c:936
 msgid "_Reply-To:"
@@ -9441,7 +9457,7 @@ msgstr "ଏଠାକୁ (_T):"
 
 #: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
-msgstr ""
+msgstr "Cc (_C):"
 
 #: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
 msgid "CC"
@@ -9449,7 +9465,7 @@ msgstr "CC"
 
 #: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
-msgstr ""
+msgstr "Bcc (_B):"
 
 #: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
 msgid "BCC"
@@ -9465,23 +9481,23 @@ msgstr "ବି_ଷୟ:"
 
 #: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
-msgstr ""
+msgstr "ହସ୍ତାକ୍ଷର (_g):"
 
 #: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
-msgstr ""
+msgstr "ଠିକଣା ପୁସ୍ତକ ପାଇଁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ"
 
 #: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
-msgstr ""
+msgstr "ଲକ୍ଷ୍ୟସ୍ଥଳ ଦାଖଲ କରନ୍ତୁ"
 
 #: ../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 ""
+msgstr "ଦାଖଲ କରିବା ପାଇଁ ଫୋଲଡର ବାଛିବାକୁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ"
 
 #: ../composer/e-composer-private.c:169
 msgid "Save draft"
@@ -9490,12 +9506,16 @@ msgstr "ଡ୍ରାଫ୍ଟ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 #: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
+"ଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକରେ ହସ୍ତାକ୍ଷର କରିପାରିବେ ନାହିଁ: କୌଣସି ହସ୍ତାକ୍ଷର ପ୍ରମାଣପତ୍ର ଏହି ଖାତା ପାଇଁ ସେଟ "
+"କରାହୋଇନାହିଁ"
 
 #: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
+"ଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ସଂଗୁପ୍ତ କରିପାରିବେ ନାହିଁ: ଏହି ଖାତା ପାଇଁ କୌଣସି ସଂଗୁପ୍ତ ପ୍ରମାଣପତ୍ର ସେଟ "
+"କରାହୋଇନାହିଁ"
 
 #: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
@@ -9505,13 +9525,15 @@ msgstr "ସନ୍ଦେଶ ଲେଖନ୍ତୁ"
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
-msgstr ""
+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 ""
+" ସେଠାରେ କିଛି ସଂଲଗ୍ନକ ଆହରଣ କରାଯାଇଛି। ମେଲ ପଠାଇବା ଦ୍ୱାରା ବଳକା ଥିବା ସଂଲଗ୍ନ ବିନା ମେଲ "
+"ପଠାଯାଇଥାଏ"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -9521,15 +9543,15 @@ msgstr "ସମସ୍ତ ଆକାଉଣ୍ଟ ଗୁଡିକୁ କଢ଼ା �
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
+msgstr "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ସନ୍ଦେଶକୁ ପ୍ରତ୍ୟାଖାନ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ଶୀର୍ଷକ '{0}', ଆପଣ ଲେଖୁଛନ୍ତି କି?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
+msgstr "କାରଣ &quot;{0}&quot;, ଆପଣ ଭିନ୍ନ ପ୍ରକାର ମେଲ ବିକଳ୍ପଗୁଡ଼ିକୁ ବାଛିବାକୁ ଆବଶ୍ୟକ ହୋଇପାରେ।"
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
-msgstr ""
+msgstr "କାରଣ &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -9537,6 +9559,9 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
+"ଏହି ଲେଖକଙ୍କୁ ବନ୍ଦ କରିବା ଦ୍ୱାରା ସନ୍ଦେଶଟି ସବୁଦିନ ପାଇଁ ପ୍ରତ୍ୟାଖ୍ୟାନ ହୋଇଯିବ, ଅନ୍ୟଥା ଆପଣ ଏହାକୁ "
+"ଆପଣଙ୍କର ଡ୍ରାଫ୍ଟ ଫୋଲଡରରେ ସଂରକ୍ଷଣ କରିପାରିବେ। ଆପଣ ଏହି ସନ୍ଦେଶକୁ ପରବର୍ତ୍ତୀ ତାରିଖରେ ଅଗ୍ରସର କରିବା "
+"ପାଇଁ ଆପଣଙ୍କୁ ଅନୁମତି ଦେଇଥାଏ।"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9552,39 +9577,43 @@ msgstr "ହସ୍ତାକ୍ଷର ଫାଇଲ &quot;{0}&quot;କୁ ପଢ଼
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr ""
+msgstr "{0}ରୁ ସଂଲଗ୍ନ ହୋଇଥିବା ସନ୍ଦେଶକୁ କାଢ଼ି ପାରିଲାନାହିଁ।"
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr ""
+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?"
-msgstr ""
+msgstr "ଆହରଣ ଚାଲୁଅଛି। ଆପଣ ମେଲ ପଠାଇବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr ""
+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 ""
+"ଆପଣ ଗୋଟିଏ ନୂତନ ସନ୍ଦେଶ ଲେଖିବା ସମୟରେ Evolution ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ପ୍ରସ୍ଥାନ କରିଥାଏ। ସନ୍ଦେଶ "
+"କାଢ଼ିବା ଦ୍ୱାରା ଆପଣ ତ୍ୟାଗ କରିବା ସମୟରେ ଅଗ୍ରସର ହୋଇଥାଏ।"
 
 #: ../composer/mail-composer.error.xml.h:17
 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."
@@ -9592,13 +9621,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 ""
+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 ""
@@ -9607,10 +9638,13 @@ msgid ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
+"HTML ସମ୍ପାଦକ ନିୟନ୍ତ୍ରଣକୁ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ।\n"
+"\n"
+"ଦୟାକରି ନିଶ୍ଚିତ ହୁଅନ୍ତୁ ଯେ ଆପଣଙ୍କ ପାଖରେ gtkhtml ଏବଂ libgtkhtmlର ସଠିକ ସଂସ୍କରଣ ସ୍ଥାପିତ ହୋଇଛି।"
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
-msgstr ""
+msgstr "ଠିକଣା ଚୟନକର୍ତ୍ତା ନିୟନ୍ତ୍ରଣକୁ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ।"
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
@@ -9626,7 +9660,7 @@ msgstr "ଆପଣ ଏହି ସନ୍ଦେଶ ସହିତ `{0}' ଫାଇଲ�
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
+msgstr "ମେଲ ଲେଖିବା ପୂର୍ବରୁ ଆପଣଙ୍କୁ ଗୋଟିଏ ଖାତା ବିନ୍ୟାସ କରିବାକୁ ହେବ।"
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Continue Editing"
@@ -9650,7 +9684,7 @@ msgstr "Evolution କ୍ଯାଲେଣ୍ଡର ବସ୍ତୁ"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948
 msgid "Groupware Suite"
-msgstr ""
+msgstr "Groupware ସମୂହ"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
@@ -9658,7 +9692,7 @@ msgstr "ଆପଣଙ୍କ ମେଲକୁ ପରିଚାଳନା କରନ୍
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
-msgstr ""
+msgstr "ଠିକଣା କାର୍ଡ"
 
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
@@ -9700,7 +9734,7 @@ msgstr "ତ୍ରୁଟିନିବାରଣ ଲଗଗୁଡ଼ିକ"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:204
 msgid "Show _errors in the status bar for"
-msgstr ""
+msgstr "ଅବସ୍ଥିତି ପଟିରେ ତ୍ରୁଟିଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
@@ -9724,7 +9758,7 @@ msgstr "ସମୟ"
 #: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
-msgstr ""
+msgstr "ସନ୍ଦେଶଗୁଡ଼ିକ"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:300
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
@@ -9768,11 +9802,11 @@ msgstr "ମୁଦ୍ରଣ କରିବା ସମୟରେ ଗୋଟିଏ ତ�
 
 #: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "ମୁଦ୍ରଣ ତନ୍ତ୍ରରେ ତ୍ରୁଟି ବିଷୟରେ ନିମ୍ନଲିଖିତ ବିବରଣୀକୁ ଖବର କରାଯାଇଛି:"
 
 #: ../e-util/e-print.c:173
 msgid "The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "ମୁଦ୍ରଣ ତନ୍ତ୍ର ତ୍ରୁଟି ବିଷୟରେ କୌଣସି ଅତିରିକ୍ତ ବିବରଣୀ ଖବର କରିନଥାଏ।"
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
@@ -9855,6 +9889,8 @@ msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr ""
+"ସମାନ ଟ୍ୟାଗ ବିଶିଷ୍ଟ ଗୋଟିଏ ନାମପଟି ସର୍ଭରରେ ପୂର୍ବରୁ ଅବସ୍ଥିତ। ଦୟାକରି ଆପଣଙ୍କର ନାମପଟିକୁ ପୁନଃନାମକରଣ "
+"କରନ୍ତୁ।"
 
 #: ../e-util/gconf-bridge.c:1222
 #, c-format
@@ -9890,8 +9926,8 @@ msgstr[1] "%d ମିନଟ ପୂର୍ବରୁ"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] ""
-msgstr[1] "ମିନିଟ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ମିନଟ"
+msgstr[0] "ଭବିଷ୍ୟତରେ 1 ମିନଟ"
+msgstr[1] "ଭବିଷ୍ୟତରେ 1 ମିନଟମିନିଟ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ମିନଟ"
 
 #: ../filter/filter-datespec.c:77
 #, c-format
@@ -9925,15 +9961,15 @@ msgstr[1] "ଭବିଷ୍ୟତରେ %d ଦିନ"
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] "ସପ୍ତାହ ପୂର୍ବରୁ%d ସପ୍ତାହ ପୂର୍ବରୁ"
+msgstr[0] "1 ସପ୍ତାହ ପୂର୍ବେ"
+msgstr[1] "1 ସପ୍ତାହ ପୂର୍ବେସପ୍ତାହ ପୂର୍ବରୁ%d ସପ୍ତାହ ପୂର୍ବରୁ"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] ""
-msgstr[1] "ସପ୍ତାହ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ସପ୍ତାହ"
+msgstr[0] "ଭବିଷ୍ୟତରେ 1 ସପ୍ତାହ"
+msgstr[1] "ଭବିଷ୍ୟତରେ 1 ସପ୍ତାହସପ୍ତାହ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ସପ୍ତାହ"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
@@ -9979,7 +10015,7 @@ msgstr "%d-%b-%Y"
 
 #: ../filter/filter-datespec.c:448
 msgid "Select a time to compare against"
-msgstr ""
+msgstr "ସହିତ ତୁଳନା କରିବା ପାଇଁ ଗୋଟିଏ ସମୟ ବାଛନ୍ତୁ"
 
 #: ../filter/filter-file.c:284
 msgid "Choose a file"
@@ -9996,7 +10032,7 @@ msgstr "ନିୟମ ନାମ (_u):"
 
 #: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
-msgstr ""
+msgstr "ନିମ୍ନଲିଖିତ ସର୍ତ୍ତଗୁଡ଼ିକୁ ପୁରଣ କରିବା ପାଇଁ ବସ୍ତୁଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ"
 
 #: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
@@ -10024,15 +10060,15 @@ msgstr "ଉତ୍ତର ଦିଏ"
 
 #: ../filter/filter-rule.c:942
 msgid "Replies and parents"
-msgstr ""
+msgstr "ଉତ୍ତର ଏବଂ ମୂଖ୍ୟ ସ୍ତର"
 
 #: ../filter/filter-rule.c:942
 msgid "No reply or parent"
-msgstr ""
+msgstr "କୌଣସି ଉତ୍ତର ଏବଂ ମୂଖ୍ୟ ସ୍ତର ନାହିଁ"
 
 #: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
-msgstr ""
+msgstr "ସୂତ୍ରକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ (_n)"
 
 #: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:310
@@ -10049,11 +10085,11 @@ msgstr "ଖରାପ ନିୟମିତ ଅଭିବ୍ୟକ୍ତି &quot;{0}
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr ""
+msgstr "ନିୟମିତ ଅଭିବ୍ୟକ୍ତି &quot;{1}&quot; କୁ ତୁଳନା କରିପାରିଲା ନାହିଁ।"
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr ""
+msgstr "ଫାଇଲ &quot;{0}&quot; ଅବସ୍ଥିତ ନାହିଁ ଅଥବା ଗୋଟିଏ ନିୟମିତ ଫାଇଲ ନୁହଁ।"
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10104,18 +10140,24 @@ msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
+"ସନ୍ଦେଶର ତାରିଖକୁ ଉଲ୍ଲିଖିତ ତାରିଖର 12:00am\n"
+"ସହିତ ତୁଳନା କରାଯିବ।"
 
 #: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
+"ସନ୍ଦେଶର ତାରିଖକୁ ଛାଣିବା ସମୟର ସମୟ\n"
+"ସହିତ ତୁଳନା କରାଯିବ।"
 
 #: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
+"ସନ୍ଦେଶର ତାରିଖକୁ ଛାଣିବା ସମୟର ସମୟ\n"
+"ସହିତ ତୁଳନା କରାଯିବ।"
 
 #: ../filter/filter.glade.h:12
 msgid ""
@@ -10165,7 +10207,7 @@ 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"
@@ -10341,6 +10383,10 @@ msgid ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+"ସମସ୍ତ ଅନୁମତିପତ୍ରକୁ ନିମ୍ନରେ ଦର୍ଶାଯାଇଥିବା\n"
+"%s ପାଇଁ ଭଲ ଭାବରେ ପଢ଼ନ୍ତୁ\n"
+"ଏବଂ ଏହାକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଯାଞ୍ଚ ବାକ୍ସକୁ ଟିକ କରନ୍ତୁ\n"
 
 #: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
@@ -10452,7 +10498,7 @@ msgstr "କୌଣସି ଲକ୍ଷ୍ଯସ୍ଥଳ ଠିକଣା ଦିଆ
 
 #: ../mail/em-composer-utils.c:1566
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
+msgstr "ବ୍ୟବହାର କରିବା ପାଇଁ କୌଣସି ଖାତା ମିଲିଲା ନାହିଁ, ସନ୍ଦେଶର ଅଗ୍ରସରଣକୁ ବାତିଲ କରାଯାଇଛି।"
 
 #: ../mail/em-composer-utils.c:2034
 msgid "an unknown sender"
@@ -10658,7 +10704,7 @@ msgstr "ଗ୍ରହଣ କର୍ତ୍ତା"
 
 #: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex ମେଳକ"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
@@ -10767,7 +10813,7 @@ msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଢନ୍ତୁ"
 
 #: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
-msgstr ""
+msgstr "ପ୍ରଚଳିତ ସନ୍ଦେଶଗୁଡ଼ିକ"
 
 #: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
@@ -10797,8 +10843,8 @@ msgstr "ସମସ୍ତ ଖାତା ସନ୍ଧାନ"
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ପଢ଼ାହୋଇନଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ:"
+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
@@ -10811,12 +10857,12 @@ msgstr[1] "ସମୁଦାୟ ସନ୍ଦେଶଗୁଡ଼ିକ:"
 #: ../mail/em-folder-properties.c:196
 #, c-format
 msgid "Quota usage (%s):"
-msgstr ""
+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:359 ../mail/em-folder-tree-model.c:522
@@ -10834,7 +10880,7 @@ msgstr "ଫୋଲଡର ବିଶେଷତାଗୁଡିକ"
 
 #: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
-msgstr ""
+msgstr "<click here to select a folder>"
 
 #: ../mail/em-folder-selector.c:254
 msgid "C_reate"
@@ -10853,7 +10899,7 @@ msgstr "ଫୋଲ୍ଡରଗୁଡ଼ିକ ଖୋଜନ୍ତୁ"
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
-msgstr ""
+msgstr "UNMATCHED"
 
 #: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169
 msgid "Drafts"
@@ -10904,26 +10950,26 @@ msgstr "ମେଲ ଫୋଲଡର ବ୍ରୁକ୍ଷ"
 #: ../mail/em-folder-tree.c:867
 #, c-format
 msgid "Moving folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s କୁ ଗତିକରାଉଛି"
 
 #: ../mail/em-folder-tree.c:869
 #, c-format
 msgid "Copying folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s କୁ ନକଲ କରୁଅଛି"
 
 #: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s ମଧ୍ଯକୁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଗତିକରାଉଛି"
 
 #: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s ମଧ୍ଯକୁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ନକଲ କରୁଅଛି"
 
 #: ../mail/em-folder-tree.c:893
 msgid "Cannot drop message(s) into toplevel store"
-msgstr ""
+msgstr "ଉପର ସ୍ତରୀୟ ଭଣ୍ଡାରରେ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପକାଇପାରିବେ ନାହିଁ"
 
 #: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
@@ -11016,7 +11062,7 @@ msgstr "ମେଲ ବିଲୋପ ବିଫଳ ହୋଇଛି"
 
 #: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
-msgstr ""
+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:1336 ../ui/evolution-mail-message.xml.h:102
@@ -11041,7 +11087,7 @@ msgstr "ପଢ଼ାଯାଇଥିବା ପରି ଚିହ୍ନଟକରନ�
 
 #: ../mail/em-folder-view.c:1348
 msgid "Mark as _Unread"
-msgstr ""
+msgstr "ପଢ଼ାହୋଇନଥିବା ପରି ଚିହ୍ନଟ କରନ୍ତୁ (_U)"
 
 #: ../mail/em-folder-view.c:1349
 msgid "Mark as _Important"
@@ -11083,7 +11129,7 @@ msgstr "ଚିହ୍ନଟ କରିବା ସମାପ୍ତ (_g)"
 
 #: ../mail/em-folder-view.c:1364
 msgid "Cl_ear Flag"
-msgstr ""
+msgstr "ସୂଚକକୁ ସଫାକରନ୍ତୁ (_e)"
 
 #: ../mail/em-folder-view.c:1367
 msgid "Crea_te Rule From Message"
@@ -11171,7 +11217,7 @@ msgstr "ହସ୍ତାକ୍ଷର ହୋଇନଥିବା"
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
+msgstr "ଏହି ସନ୍ଦେଶରେ ହସ୍ତାକ୍ଷର ହୋଇନାହିଁ। ଏହି ସନ୍ଦେଶଟି ବୈଧ ବୋଲି ସେଥିରେ କୌଣସି ନିର୍ଭରୋକ୍ତି ନାହିଁ।"
 
 #: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656
 msgid "Valid signature"
@@ -11181,7 +11227,7 @@ msgstr "ବୈଧ ହସ୍ତକ୍ଷର"
 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:572 ../mail/em-format-html.c:657
 msgid "Invalid signature"
@@ -11191,41 +11237,45 @@ msgstr "ଅବୈଧ ହସ୍ତାକ୍ଷର"
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
+msgstr "ଏହି ସନ୍ଦେଶର ହସ୍ତାକ୍ଷରକୁ ଯାଞ୍ଚ କରାଯାଇପାରିବ ନାହିଁ, ଏହାକୁ transit ରେ ବଦଳା ଯାଇପାରେ।"
 
 #: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658
 msgid "Valid signature, but cannot verify sender"
-msgstr ""
+msgstr "ବୈଧ ହସ୍ତାକ୍ଷର, କିନ୍ତୁ ପ୍ରେରକକୁ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ"
 
 #: ../mail/em-format-html-display.c:573
 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:574 ../mail/em-format-html.c:659
 msgid "Signature exists, but need public key"
-msgstr ""
+msgstr "ହସ୍ତାକ୍ଷର ଅବସ୍ଥିତ, କିନ୍ତୁ ସାର୍ବଜନିକ କି ଆବଶ୍ୟକ"
 
 #: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
+"ଏହି ସନ୍ଦେଶକୁ ହସ୍ତାକ୍ଷର ମାଧ୍ଯମରେ ହସ୍ତାକ୍ଷର କରାଯାଇଛି, କିନ୍ତୁ ସେଠାରେ କୌଣସି ନିର୍ଭରଶୀଳ ସାର୍ବଜନୀକ "
+"କି ନାହିଁ।"
 
 #: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665
 msgid "Unencrypted"
-msgstr ""
+msgstr "ଅସଂଗୁପ୍ତ"
 
 #: ../mail/em-format-html-display.c:581
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr ""
+msgstr "ଏହି ସନ୍ଦେଶଟି ସଂଗୁପ୍ତ ନୁହଁ। ଏହାର ବିଷୟବସ୍ତୁକୁ ଇଣ୍ଟରନେଟରେ transit ମାଧ୍ଯମରେ ଦେଖାଯାଇ ପାରେ।"
 
 #: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "ସଂଗୁପ୍ତ, ଦୁର୍ବଳ"
 
 #: ../mail/em-format-html-display.c:582
 msgid ""
@@ -11233,20 +11283,24 @@ msgid ""
 "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:583 ../mail/em-format-html.c:667
 msgid "Encrypted"
-msgstr ""
+msgstr "ସଂଗୁପ୍ତ"
 
 #: ../mail/em-format-html-display.c:583
 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:584 ../mail/em-format-html.c:668
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "ସଂଗୁପ୍ତ, ସବଳ"
 
 #: ../mail/em-format-html-display.c:584
 msgid ""
@@ -11254,6 +11308,9 @@ msgid ""
 "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:685 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -11261,7 +11318,7 @@ msgstr "ଦୃଶ୍ଯ ପ୍ରମାଣପତ୍ର (_V)"
 
 #: ../mail/em-format-html-display.c:700
 msgid "This certificate is not viewable"
-msgstr ""
+msgstr "ଏହି ପ୍ରମାଣପତ୍ରକୁ ଦେଖିହେବ ନାହିଁ"
 
 #: ../mail/em-format-html-display.c:992
 msgid "Completed on %B %d, %Y, %l:%M %p"
@@ -11269,7 +11326,7 @@ msgstr "%B %d, %Y, %l:%M %pରେ ସମ୍ପୂର୍ଣ୍ଣ"
 
 #: ../mail/em-format-html-display.c:1000
 msgid "Overdue:"
-msgstr ""
+msgstr "ବକୟା:"
 
 #: ../mail/em-format-html-display.c:1003
 msgid "by %B %d, %Y, %l:%M %p"
@@ -11310,6 +11367,8 @@ 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 ଏହି ଇମେଲକୁ ଚିତ୍ରଣ କରିପାରିବ ନାହିଁ ଯେହେତୁ ଏହା କାର୍ଯ୍ୟକାରୀ କରିବା ଅତ୍ୟଧିକ ବଡ଼। ଆପଣ "
+"ଏହାକୁ ବିନା ସଜ୍ଜିକରଣରେ ଦେଖିପାରିବେ ଅଥବା ଗୋଟିଏ ବାହ୍ୟ ପାଠ୍ୟ ସମ୍ପାଦକ ସହିତ।"
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
@@ -11327,7 +11386,7 @@ msgstr "ଅଜଣା ବାହ୍ୟ ଶରୀର ଅଂଶ।"
 
 #: ../mail/em-format-html.c:938
 msgid "Malformed external-body part."
-msgstr ""
+msgstr "ତ୍ରୁଟିଯୁକ୍ତ ବାହ୍ୟ ଅଂଶ।"
 
 #: ../mail/em-format-html.c:968
 #, c-format
@@ -11366,13 +11425,13 @@ msgstr "ସନ୍ଦେଶକୁ ସଜାଡ଼ୁଛି..."
 #: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
 #: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
@@ -11431,19 +11490,19 @@ msgstr "%s ସଂଲଗ୍ନକ"
 
 #: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr ""
+msgstr "S/MIME ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ: ଅଜଣା ତ୍ରୁଟି"
 
 #: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
+msgstr "MIME ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ। ଉତ୍ସ ଭାବରେ ଦର୍ଶାଉଅଛି।"
 
 #: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
+msgstr "ଏକାଧିକ ଅଂଶ/ସଂଗୁପ୍ତକରଣ ପାଇଁ ଅସମର୍ଥିତ ସଂଗୁପ୍ତକରଣ ପ୍ରକାର"
 
 #: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
-msgstr ""
+msgstr "PGP/MIME ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ"
 
 #: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
@@ -11538,7 +11597,7 @@ msgstr "କରିବାକୁ"
 #. blue
 #: ../mail/em-migrate.c:962
 msgid "Later"
-msgstr ""
+msgstr "ପରବର୍ତ୍ତି"
 
 #: ../mail/em-migrate.c:1129
 msgid "Migration"
@@ -11566,6 +11625,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution ଡାକବାକ୍ସର ଫୋଲଡରଗୁଡ଼ିକର ଅବସ୍ଥାନ ଏବଂ ଅନୁକ୍ରମ Evolution 1.x ପରଠାରୁ ପରିବର୍ତ୍ତିତ "
+"ହୋଇଛି।\n"
+"\n"
+"Evolution ଆପଣଙ୍କର ଫୋଲଡରଗୁଡ଼ିକୁ ସ୍ଥାନାନ୍ତରିତ କରିବା ସମୟରେ ଦୟାକରି ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ..."
 
 #: ../mail/em-migrate.c:1991
 #, c-format
@@ -11598,6 +11661,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Evolution ଡାକବାକ୍ସର ଫୋଲଡରଗୁଡ଼ିକର ସାରାଂଶ Evolution 2.24 SQLite ପରଠାରୁ ସ୍ଥାନାନ୍ତରିତ "
+"ହୋଇଛି।\n"
+"\n"
+"Evolution ଆପଣଙ୍କର ଫୋଲଡରଗୁଡ଼ିକୁ ସ୍ଥାନାନ୍ତରିତ କରିବା ସମୟରେ ଦୟାକରି ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ..."
 
 #: ../mail/em-migrate.c:2957
 #, c-format
@@ -11609,6 +11676,8 @@ msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
+"ପୂର୍ବ Evolution ସ୍ଥାପନାରୁ ସଂରଚନାକୁ ପଢ଼ିବାରେ ଅସମର୍ଥ, `evolution/config.xmldb' ପ୍ରସ୍ଥାନ "
+"କିମ୍ବା ତ୍ରୁଟିଯୁକ୍ତ କରିନଥାଏ।"
 
 #: ../mail/em-popup.c:364
 msgid "Save As..."
@@ -11643,7 +11712,7 @@ msgstr "%s ରେ ଖୋଲନ୍ତୁ..."
 
 #: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
+msgstr "ଏହି ଭଣ୍ଡାର ସ୍ୱକାରୋକ୍ତିକୁ ସମର୍ଥନ କରିନଥାଏ, ଅଥବା ସେମାନେ ସକ୍ରିୟ ନାହାନ୍ତି।"
 
 #: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
@@ -11712,7 +11781,7 @@ msgstr "\"Send and Receive Mail\" ୱିଣ୍ଡୋ ଏସାର"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
-msgstr ""
+msgstr "Evolution କୁ ସୀମିତ ଆକାରର ପାଠ୍ୟଅଂଶକୁ ଦର୍ଶାଇବାକୁ ଅନୁମତି ଦେଇଥାଏ"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
@@ -11758,23 +11827,27 @@ msgstr "TO/CC/BCC ରେ ଠିକଣା ପ୍ରଦର୍ଶନକୁ ସଙ�
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr ""
+msgstr "TO/CC/BCC ରେ ଠିକଣାଗୁଡ଼ିକର ସଂକୁଚିତ ପ୍ରଦର୍ଶନକୁ 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 ସେକଣ୍ଡ ହେବା ଉଚିତ।"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
-msgstr ""
+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 ""
+"ଜଟିଳତା ଯାଞ୍ଚ କରିବା ସମୟରେ ଇଚ୍ଛାରୂପଣ ଶୀର୍ଷକକୁ ବ୍ୟବହାର ହୋଇଥାଏ। ତାଲିକା ଉପାଦାନଗୁଡ଼ିକ ଶୈଳୀ "
+"\"ଶୀର୍ଷକ ନାମ=ମୂଲ୍ୟ\" ବାକ୍ୟାଂଶ ଆକାରରେ ଅଛି।"
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -11832,11 +11905,11 @@ msgstr "କ୍ରେତା ସଂଳାପ ୱିଣ୍ଡୋର ପୂର୍ବ
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
-msgstr ""
+msgstr "ଜଟିଳ ଛଣା ଠିକଣାଗୁଡ଼ିକୁ କେବଳ ସ୍ଥାନୀୟ ଠିକଣା ବହିରେ ନିର୍ଦ୍ଧାରଣ କରିଥାଏ"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
-msgstr ""
+msgstr "ଠିକଣାବହିକୁ ପ୍ରେରକ ଇମେଲ ପାଇଁ ନିର୍ଦ୍ଧାରଣ କରିଥାଏ"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
@@ -11845,10 +11918,13 @@ msgid ""
 "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 ""
@@ -11856,12 +11932,16 @@ msgid ""
 "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 ""
+"ଭୂଲମ୍ବ ଦୃଶ୍ୟରେ \"ସନ୍ଦେଶ\" ସ୍ତମ୍ଭରେ ଉଭୟ \"ଠାରୁ\" ଏବଂ \"ବିଷୟ\" ସମାନ ଅକ୍ଷରରୂପ ପାଇଁ ନିର୍ଧାରଣ "
+"କରିଥାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -11873,11 +11953,11 @@ msgstr "ମେଲ ଉପାଦାନ ଫାଇଲଗୁଡ଼ିକୁ ସଂର
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr ""
+msgstr "ପାର୍ଶ୍ୱପଟିରେ ଫୋଲଡର ନାମଗୁଡ଼ିକୁ ଅଣ୍ଡାକାର କରିବାକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରିଥାଏ"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
-msgstr ""
+msgstr "ଆପଣ ଟାଇପା କରିବା ସଙ୍ଗେ ସଙ୍ଗେ ବନାନ ଯାଞ୍ଚ ତ୍ରୁଟି ସୂଚକ ଆଙ୍କମ କରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
@@ -11889,15 +11969,15 @@ msgstr "ପ୍ରସ୍ଥାନରେ ଖାଲି ଆବର୍ଜନା ପା
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
+msgstr "Evolutionରୁ ପ୍ରସ୍ଥାନ କରିବା ସମୟରେ ସମସ୍ତ ଜଟିଳ ଫୋଲଡରଗୁଡ଼ିକୁ ଖାଲିକରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
+msgstr "Evolutionରୁ ପ୍ରସ୍ଥାନ କରିବା ସମୟରେ ସମସ୍ତ ଆବର୍ଜନାପାତ୍ର ଫୋଲଡରଗୁଡ଼ିକୁ ଖାଲିକରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
+msgstr "କ୍ୟାରେଟ ଅବସ୍ଥାକୁ ସକ୍ରିୟ କରନ୍ତୁ, ତେଣୁ ଆପଣ ମେଲ ପଢ଼ିବା ସମୟରେ ସୂଚକକୁ ଦେଖିପାରିବେ।"
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
@@ -11909,7 +11989,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable or disable type ahead search feature"
-msgstr ""
+msgstr "ସନ୍ଧାନ ବିଶେଷତା ଉପରେ ପ୍ରକାରକୁ ସକ୍ରିୟ କିମ୍ବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
 #: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders"
@@ -11929,11 +12009,11 @@ msgstr ""
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr ""
+msgstr "ଖାଲିସ୍ଥାନ ପଟିକୁ ସକ୍ରିୟ କରିବା ପାଇଁ ସନ୍ଦେଶ ପ୍ରାକଦର୍ଶନକୁ, ସନ୍ଦେଶ ତାଲିକା ଏବଂ ଫୋଲଡରଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable to render message text part of limited size."
-msgstr ""
+msgstr "ସନ୍ଦେଶ ପାଠ୍ୟ ଅଂଶ ଚିତ୍ରଣକୁ ସୀମିତ ଆକାର କରିବା ପାଇଁ ସକ୍ରିୟ କରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable/disable caret mode"
@@ -11941,7 +12021,7 @@ msgstr "କେରେଟ ଧାରାକୁ ସକ୍ରିୟ/ନିଷ୍କ୍
 
 #: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
+msgstr "Outlook/GMail ପଦ୍ଧତିରେ ଫାଇଲ ନାମଗୁଡ଼ିକୁ ସାଙ୍କେତିକରଣ କରନ୍ତୁ"
 
 #: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
@@ -11961,19 +12041,21 @@ msgstr "ସନ୍ଦେଶ ତାଲିକା ପଟ୍ଟିକାର ଉଚ୍
 
 #: ../mail/evolution-mail.schemas.in.h:61
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
+msgstr "ଫୋଲଡର ପ୍ରତି ପ୍ରାକଦର୍ଶନକୁ ଲୁଚାଇଥାଏ ଏବଂ ଚୟନକୁ କାଢ଼ିଥାଏ"
 
 #: ../mail/evolution-mail.schemas.in.h:62
 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:63
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr ""
+msgstr "ଯଦି \"ପ୍ରାକଦର୍ଶନ\" ପଟ୍ଟିକାଟି ଅନ ଅଛି, ତେବେ ଏହାକୁ ଭୂଲମ୍ବ ପରିବର୍ତ୍ତେ ପାଖ-କୁ-ପାଖ ଦେଖାନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
@@ -11981,12 +12063,18 @@ msgid ""
 "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:65
 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:66
 msgid ""
@@ -11996,18 +12084,26 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"\"ମେଲ ପଠାନ୍ତୁ ଏବଂ ଗ୍ରହଣ କରନ୍ତୁ\" ୱିଣ୍ଡୋର ପ୍ରାରମ୍ଭିକ ଉଚ୍ଚତା। ଚାଳକ ସେହି ୱିଣ୍ଡୋର ଆକାର "
+"ପରିବର୍ତ୍ତନ କଲେ ମୂଲ୍ୟଟି ଅଦ୍ୟତିତ ହୋଇଥାଏ। ମନେରଖନ୍ତୁ, ଏହି ନିର୍ଦ୍ଦିଷ୍ଟ ମୂଲ୍ୟଟି Evolution "
+"ଦ୍ୱାରା ବ୍ୟବହୃତ ହୋଇନଥାଏ। \"ମେଲ ପଠାନ୍ତୁ ଏବଂ ଗ୍ରହଣ କରନ୍ତୁ\" ୱିଣ୍ଡୋର ଆକାର ବୃଦ୍ଧିକରିହେବ "
+"ନାହିଁ। ଏହି କିଟି କେବଳ ଗୋଟିଏ ପ୍ରୟୋଗାତ୍ମକ ବିବରଣୀ ଭାବରେ ଅବସ୍ଥିତ।"
 
 #: ../mail/evolution-mail.schemas.in.h:67
 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:68
 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 ""
@@ -12015,26 +12111,28 @@ msgid ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
+"ସନ୍ଧାନ ଫୋଲଡରରୁ ସନ୍ଦେଶକୁ ଅପସାରଣ କରିବା ଫଳରେ ତାହା ସବୁଦିନ ପାଇଁ ଅପସାରିତ ହୋଇଥାଏ ବୋଲି "
+"ଚେତାବନୀ ଦେବା ପ୍ରମ୍ପ୍ଟକୁ ଏହା ନିଷ୍କ୍ରିୟ/ସକ୍ରିୟ କରିଥାଏ, କେବଳ ଏହାକୁ ସନ୍ଧାନ ଫଳାଫଳରୁ ସହଜରେ ନକାଢ଼ି।"
 
 #: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
-msgstr ""
+msgstr "ଶେଷଥର ପାଇଁ ଖାଲି ଜଙ୍କକୁ ଚଲାଇକରି"
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
-msgstr ""
+msgstr "ଶେଷଥର ଖାଲି ଆବର୍ଜନାପାତ୍ରକୁ ଚଲାଯାଇଥିଲା"
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
-msgstr ""
+msgstr "ନାମପଟିଗୁଡ଼ିକର ତାଲିକା ଏବଂ ସେମାନଙ୍କ ସହିତ ସମ୍ପୃକ୍ତ ରଙ୍ଗଗୁଡ଼ିକ"
 
 #: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
+msgstr "Bonobo ଉପାଦାନ ପ୍ରଦର୍ଶକଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରିବା ପାଇଁ MIME ପ୍ରକାରଗୁଡ଼ିକର ତାଲିକା"
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
-msgstr ""
+msgstr "ଗ୍ରହଣୀୟ ଅନୁମତିପତ୍ରଗୁଡ଼ିକର ତାଲିକା"
 
 #: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
@@ -12045,24 +12143,28 @@ msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
+"Evolutionର ମେଲ ଉପାଦାନକୁ ଜଣାଥିବା ଖାତାଗୁଡ଼ିକର ତାଲିକା। ସେହି ତାଲିକା ବାକ୍ୟଖଣ୍ଡ ନାମକରଣ "
+"/apps/evolution/mail/accounts ସମ୍ପର୍କୀୟ ଉପ-ଡିରେକ୍ଟୋରୀ ଧାରଣ କରିଥାଏ।"
 
 #: ../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:79
 msgid "List of dictionary language codes used for spell checking."
-msgstr ""
+msgstr "ଅଭିଧାନ ଭାଷା ସଂକେତର ତାଲିକା ଯାହାକି ବନାନ ଯାଞ୍ଚ ପାଇଁ ବ୍ୟବହୃତ ହୋଇଥାଏ।"
 
 #: ../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 ""
+"Evolutionର ମେଲ ଉପାଦାନକୁ ଜଣାଥିବା ନାମପଟିଗୁଡ଼ିକର ତାଲିକା। ସେହି ତାଲିକା ନାମ:ରଙ୍ଗ ବାକ୍ୟଖଣ୍ଡ "
+"ଧାରଣ କରିଥାଏ ଯେଉଁଠି ରଙ୍ଗ ହେଉଛି HTML ଶୋହଳମିକ ସାଙ୍କେତିକରଣ।"
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
-msgstr ""
+msgstr "ପ୍ରୋଟୋକଲ ନାମଗୁଡ଼ିକର ତାଲିକା ଯାହାର ଅନୁମତିପତ୍ରକୁ ଗ୍ରହଣକରାଯାଇଛି।"
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Load images for HTML messages over HTTP"
@@ -12074,6 +12176,9 @@ msgid ""
 "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:84
 msgid "Log filter actions"
@@ -12176,10 +12281,12 @@ 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:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
+msgstr "ଚାଳକ ବିନା To କିମ୍ବା Cc ଗ୍ରହଣକର୍ତ୍ତା ସହିତ ସନ୍ଦେଶ ପଠାଉଇବାକୁ ଚେଷ୍ଟା କରିବା ସମୟରେ ପଚାରନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
@@ -12187,11 +12294,11 @@ msgstr "ଅନାବଶ୍ୟକ HTML ପଠାଇବା ପାଇଁ ଚେଷ�
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
-msgstr ""
+msgstr "ଏକାଧିକ ସନ୍ଦେଶକୁ ଚିହ୍ନଟ କରିବା ସମୟରେ ପଚାରନ୍ତୁ"
 
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "Recognize emoticons in text and replace them with images."
-msgstr ""
+msgstr "emoticonଗୁଡ଼ିକୁ ପାଠ୍ୟରେ ଚିହ୍ନନ୍ତୁ ଏବଂ ସେମାନଙ୍କୁ ପ୍ରତିଛବି ଦ୍ୱାରା ବଦଳାନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
@@ -12259,7 +12366,7 @@ msgstr "ଜୀବନ୍ତଚିତ୍ରଗୁଡିକୁ ଜୀବନାୟ�
 
 #: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
+msgstr "ସନ୍ଦେଶ ତାଲିକାରେ ଅପସାରିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (ରେଖାଙ୍କନ ସହିତ)।"
 
 #: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show deleted messages in the message-list"
@@ -12309,19 +12416,19 @@ msgstr ""
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr ""
+msgstr "ପ୍ରେରକଙ୍କର ଇମେଲ ଠିକଣାକୁ ସନ୍ଦେଶ ତାଲିକାର ପୃଥକ ସ୍ତମ୍ଭରେ ଦର୍ଶାନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the photo of the sender in the message reading pane."
-msgstr ""
+msgstr "ସନ୍ଦେଶ ପାଠ ପଟ୍ଟିକାରେ ପ୍ରେରକଙ୍କ ଫୋଟୋ ଦର୍ଶାନ୍ତୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Spell check inline"
-msgstr ""
+msgstr "ଇନଲାଇନ ବନାନ ଯାଞ୍ଚ"
 
 #: ../mail/evolution-mail.schemas.in.h:143
 msgid "Spell checking color"
-msgstr ""
+msgstr "ବନାନ ଯାଞ୍ଚ ରଙ୍ଗ"
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Spell checking languages"
@@ -12349,11 +12456,11 @@ msgstr "Junk ହୁକ ପାଇଁ ପୂର୍ବ ନିର୍ଦ୍ଧାର�
 
 #: ../mail/evolution-mail.schemas.in.h:150
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
+msgstr "ଶେଷ ଥର ପାଇଁ ଖାଲି ଜଙ୍କକୁ ଚଲାଯାଇଥିବା ସମୟ. ଦିନ ଆକାରରେ epoch ପରଠାରୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
+msgstr "ଶେଷ ଥର ପାଇଁ ଖାଲି ଆବର୍ଜନାପାତ୍ରକୁ ଚଲାଯାଇଥିବା ସମୟ. ଦିନ ଆକାରରେ epoch ପରଠାରୁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid "The terminal font for mail display."
@@ -12361,19 +12468,23 @@ msgstr "ମେଲ ପ୍ରଦର୍ଶନ ପାଇଁ ଟର୍ମିନାଲ
 
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "The variable width font for mail display."
-msgstr ""
+msgstr "ମେଲ ପ୍ରଦର୍ଶନ ପାଇଁ ଚଳ ଓସାର ଅକ୍ଷରରୂପ।"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 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:155
 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 ""
+"ଏହା ପାଠ୍ୟର ସର୍ବାଧିକ ଆକାରକୁ ନିର୍ଦ୍ଧାରଣ କରିଥାଏ ଯାହାକୁ କି Evolution ସହାୟତାରେ ସଜଡ଼ାଯାଇପାରିବ। "
+"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଆକାରଟି ହେଉଛି 4MB / 4096 KB ଏବଂ ଏହାକୁ KB ରେ ଉଲ୍ଲେଖ କରାଯାଇଥାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
@@ -12381,12 +12492,17 @@ msgid ""
 "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:157
 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:158
 msgid ""
@@ -12395,6 +12511,9 @@ msgid ""
 "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:159
 msgid ""
@@ -12402,22 +12521,29 @@ msgid ""
 "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:160
 msgid "This option would help in improving the speed of fetching."
-msgstr ""
+msgstr "ଏହି ବିକଳ୍ପଟି ଟାଣିବାର ଗତିକୁ ଉନ୍ନତ କରିବାରେ ସହାୟତା କରିଥାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:161
 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:162
 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:163
 msgid ""
@@ -12425,6 +12551,8 @@ msgid ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
+"ଏବି ସଂରଚନା ଉଲ୍ଲେଖ କରିଥାଏ କାଳେ ସୂତ୍ରଟି ସନ୍ଦେଶ ତାରିଖ ବଦଳରେ ନୂତନ ତମ ସନ୍ଦେଶ ଉପରେ "
+"ଆଧାର କରି ସଜାହୋଇଥାଏ। Evolution ପୁନଃ ଚାଳନ ଆବଶ୍ୟକ କରିଥାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
@@ -12452,7 +12580,7 @@ msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଖାତାର UID ବ
 
 #: ../mail/evolution-mail.schemas.in.h:170
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
+msgstr "ଭୁଲ ବନାନ ଶବ୍ଦଗୁଡ଼ିକୁ ରେଖାଙ୍କନ କରନ୍ତୁ ଯେତେବେଳେ ଇନଲାଇନ ବନାନ ବ୍ୟବହାର କରାଯାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
@@ -12488,21 +12616,23 @@ msgstr "ପରିବର୍ତ୍ତନଶୀଳ ଓସାର ଅକ୍ଷରର�
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
+msgstr "ଗୋଟିଏ ପଠନ ଅନୁରୋଧକୁ ପ୍ରତି ସନ୍ଦେଶରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ଯୋଗ କରାଯିବା ଉଚିତ କି ନୁହଁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
+msgstr "ପାର୍ଶ୍ୱପଟିରେ ଫୋଲଡର ନାମର ଅଣ୍ଡାକାର ବିଶେଷତାକୁ ନିଷ୍କ୍ରିୟ କରିବା ଉଚିତ କି ନୁହଁ।"
 
 #: ../mail/evolution-mail.schemas.in.h:181
 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 କିମ୍ବା "
+"ସନ୍ଦର୍ଭ ଶୀର୍ଷକ ସନ୍ଦେଶ ଧାରଣ କରିନଥାଏ।"
 
 #: ../mail/evolution-mail.schemas.in.h:182
 msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
+msgstr "ସଂକ୍ଷିପ୍ତ ବାକ୍ୟଖଣ୍ଡଗୁଡ଼ିକ ନୂତନତମ ସନ୍ଦେଶ ଉପରେ ଆଧାରିତ ହେବା ଉଚିତ କି ନୁହଁ"
 
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid "Width of the message-list pane"
@@ -12699,7 +12829,7 @@ msgstr "<b>ପ୍ରେରକ ଫୋଟୋଗ୍ରାଫ</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
-msgstr ""
+msgstr "<b>ହସ୍ତାକ୍ଷର (_n)</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
@@ -12719,7 +12849,7 @@ msgstr "<span weight=\"bold\"> ବୈଧିକରଣ</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ସନ୍ଦେଶଗୁଡ଼ିକୁ ଲେଖୁଅଛି</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -12832,11 +12962,11 @@ msgstr "ସର୍ବଦା (bcc) କରନ୍ତୁ (_b):"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr ""
+msgstr "ସର୍ବଦା ମୋର କିରିଙ୍ଗରେ ଥିବା କିଗୁଡ଼ିକୁ ସଂଗୁପ୍ତ ଭାବରେ ଥିବା ସମୟରେ ବିଶ୍ୱାସ କରନ୍ତୁ (_t)"
 
 #: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr ""
+msgstr "ସଂଗୁପ୍ତ ସନ୍ଦେଶ ପଠାଇବା ସମୟରେ ସର୍ବଦା ମୋତେ ସଂଗୁପ୍ତ କରନ୍ତୁ (_m)"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
@@ -12898,11 +13028,11 @@ msgstr "ଆସୁଥିବା ମେଲ ସନ୍ଦେଶଗୁଡ଼ିକୁ
 
 #: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
-msgstr ""
+msgstr "ସଫାକରନ୍ତୁ (_a)"
 
 #: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
-msgstr ""
+msgstr "ସଫାକରନ୍ତୁ (_r)"
 
 #: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
@@ -12910,7 +13040,7 @@ msgstr "ଭୁଲ ଉଚ୍ଚାରିତ ଶବ୍ଦଗୁଡ଼ିକ ପା
 
 #: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
-msgstr ""
+msgstr "ଗୋଟିଏ ଫୋଲଡରକୁ କାଟିବା ସମୟରେ ନିଶ୍ଚିତ କରନ୍ତୁ (_w)"
 
 #: ../mail/mail-config.glade.h:65
 msgid ""
@@ -12921,10 +13051,16 @@ msgid ""
 "\n"
 "Click \"Apply\" to save your settings."
 msgstr ""
+"ଅଭିନନ୍ଦନ, ଆପମଙ୍କର ମେଲ ସଂରଚନାଟି ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।\n"
+"\n"
+"ଆପଣ ବର୍ତ୍ତମାନ Evolution ବ୍ୟବହାର କରି ଇମେଲ ପଠାଇବା ଏବଂ ଗ୍ରହଣ\n"
+"କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି। \n"
+"\n"
+"ଆପଣଙ୍କର ସଂରଚନାକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ\"ପ୍ରୟୋଗ କରନ୍ତୁ\" କୁ କ୍ଲିକ କରନ୍ତୁ।"
 
 #: ../mail/mail-config.glade.h:71
 msgid "De_fault"
-msgstr ""
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ (_f)"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
@@ -12936,15 +13072,15 @@ msgstr "ପ୍ରସ୍ଥାନ କରିବା ସମୟରେ junk ସନ୍�
 
 #: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr ""
+msgstr "ବାହାରୁଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦ୍ୱିମିକ ଭାବରେ ହସ୍ତାକ୍ଷର କରନ୍ତୁ (_u) (ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ)"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
-msgstr ""
+msgstr "ପାଠ୍ୟ ଆକାର ଅତିକ୍ରମ କରିସାରିବା ପରେ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସଜାଡ଼ନ୍ତୁ (_z)"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
+msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ଜଟିଳ ଆକାରରେ ଚିହ୍ନଟ କରନ୍ତୁ ନାହିଁ ଯଦି ପ୍ରେରକ ମୋର ଠିକଣା ପୁସ୍ତକରେ ଅଛି (_k)"
 
 #: ../mail/mail-config.glade.h:79
 msgid "Done"
@@ -13040,7 +13176,7 @@ msgstr "ମେଲ ଶୀର୍ଷକଗୁଡିକର ସାରଣୀ"
 
 #: ../mail/mail-config.glade.h:108
 msgid "Mailbox location"
-msgstr ""
+msgstr "ମେଲବାକ୍ସ ଅବସ୍ଥାନ"
 
 #: ../mail/mail-config.glade.h:109
 msgid "Message Composer"
@@ -13052,17 +13188,17 @@ msgstr "ପାଇଁ ପ୍ରକ୍ସି ନାହିଁ (_P):"
 
 #: ../mail/mail-config.glade.h:111
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
+msgstr "ଟିପ୍ପଣୀ: ନାମପଟିରେ ଅବରେଖନକୁ ସ୍ମରକ ଚିହ୍ନାଇବାରେ ତାଲିକାରେ ବ୍ୟବହାର କରାଯାଇଥାଏ।"
 
 #: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
+msgstr "ଟିପ୍ପଣୀ: ପ୍ରଥମ ଥର ପାଇଁ ସଂଯୋଗ ନହେଲା ପର୍ଯ୍ୟନ୍ତ ଆପଣଙ୍କୁ ପ୍ରବେଶ ସଂକେତ ପଚରାଯିବା ନାହିଁ"
 
 #: ../mail/mail-config.glade.h:113
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
+msgstr "ବିକଳ୍ପକୁ ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି ଯଦି ଗୋଟିଏ ଇଚ୍ଛାମୁତାବକ ଜଙ୍କ ଶୀର୍ଷକ ମିଳିନଥାଏ।"
 
 #: ../mail/mail-config.glade.h:114
 msgid "Or_ganization:"
@@ -13081,12 +13217,16 @@ msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
+"ଏହି ଖାତା ପାଇଁ ନିମ୍ନରେ ଦୟାକରି ଗୋଟିଏ ବର୍ଣ୍ଣନାତ୍ମକ ନାମ ଭରଣ କରନ୍ତୁ।\n"
+"ଏହି ନାମକୁ କେବଳ ପ୍ରଦର୍ଶନ ଉଦ୍ଦେଶ୍ୟରେ ବ୍ୟବାହର କରାଯାଇଥାଏ।"
 
 #: ../mail/mail-config.glade.h:120
 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:121
 msgid ""
@@ -13094,6 +13234,9 @@ msgid ""
 "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:122
 msgid "Please select among the following options"
@@ -13105,7 +13248,7 @@ msgstr "ସଂଯୋଗିକୀ:"
 
 #: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
+msgstr "କେବଳ Bcc ଗ୍ରହଣକର୍ତ୍ତା ସହିତ ସନ୍ଦେଶ ପଠାଇବା ସମୟରେ ପଚାରନ୍ତୁ (_o)"
 
 #: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
@@ -13121,7 +13264,7 @@ msgstr "ପ୍ରବେଶ ସଂକେତ ମନେରଖନ୍ତୁ (_p)"
 
 #: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
-msgstr ""
+msgstr "କେବଳ ପ୍ରେରକର ଫୋଟଗ୍ରାଫକୁ ସ୍ଥାନୀୟ ଠିକଣା ବହିରେ ସନ୍ଧାନ କରନ୍ତୁ (_e)"
 
 #: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
@@ -13169,15 +13312,15 @@ msgstr "ସର୍ଭର ପ୍ରକାର (_T):"
 
 #: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
-msgstr ""
+msgstr "ହସ୍ତାକ୍ଷର ପ୍ରମାଣପତ୍ର (_n):"
 
 #: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
-msgstr ""
+msgstr "ହସ୍ତାକ୍ଷର (_u):"
 
 #: ../mail/mail-config.glade.h:145
 msgid "Signatures"
-msgstr ""
+msgstr "ହସ୍ତାକ୍ଷରଗୁଡ଼ିକ"
 
 #: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
@@ -13189,7 +13332,7 @@ msgstr "ବନାନ ଯାଞ୍ଚ କରାଯାଉଛି"
 
 #: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
-msgstr ""
+msgstr "ଉତ୍ତର ଦେବା ସମୟରେ ତଳେ ଟାଇପ କରନ୍ତୁ (_t)"
 
 #: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
@@ -13200,6 +13343,8 @@ 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 ""
@@ -13207,12 +13352,17 @@ msgid ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
+"ଏହି ସ୍କ୍ରିପ୍ଟର ଫଳାଫଳ ଆପଣଙ୍କର ହସ୍ତାକ୍ଷର ଭାବରେ\n"
+"ବ୍ୟବହୃତ ହୋଇଥାଏ। ଆପଣ ଉଲ୍ଲେଖ କରିଥିବା ନାମଗୁଡ଼ିକୁ\n"
+"କେବଳ ପ୍ରଦର୍ଶନ ଉଦ୍ଦେଶ୍ୟରେ ବ୍ୟବହାର କରାଯିବ।"
 
 #: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
+"ଏହି ଖାତାକୁ ଅନୁସରଣ କରିବା ପାଇଁ ନାମ ଲେଖନ୍ତୁ।\n"
+"ଉଦାହରଣ ସ୍ୱରୂପ: \"Work\" ଅଥବା \"Personal\""
 
 #: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
@@ -13239,6 +13389,9 @@ msgid ""
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
+"Evolution ମେଲ ସଂରଚନା ସହାୟକରେ ଆପଣଙ୍କୁ ସ୍ୱାଗତ କରୁଅଛୁ।\n"
+"\n"
+"ଆରମ୍ଭ କରିବା ପାଇଁ \"ଅଗ୍ରସର ହୁଅନ୍ତୁ\" କୁ କ୍ଲିକ କରନ୍ତୁ। "
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
@@ -13266,7 +13419,7 @@ msgstr "ଅଗ୍ରସର ଶୈଳୀ (_F):"
 
 #: ../mail/mail-config.glade.h:170
 msgid "_Keep Signature above the original message on replying"
-msgstr ""
+msgstr "ଉତ୍ତର ଦେବା ସମୟରେ ପ୍ରକୃତ ସନ୍ଦେଶ ଉପରେ ହସ୍ତାକ୍ଷର ରଖନ୍ତୁ (_K)"
 
 #: ../mail/mail-config.glade.h:171
 msgid "_Load images in messages from contacts"
@@ -13298,11 +13451,11 @@ msgstr "ପଥ (_P):"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
+msgstr "HTML ମେଲକୁ ଯୋଗାଯୋଗଗୁଡ଼ିକରେ ପଠାଇବା ସମୟରେ ପଚାରନ୍ତୁ ଯେଉଁମାନେ ଚାହାନ୍ତି ନାହିଁ (_P)"
 
 #: ../mail/mail-config.glade.h:180
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
+msgstr "ଖାଲି ବିଷୟନାମ ସହିତ ମେଲକୁ ପଠାଇବା ସମୟରେ ପଚାରନ୍ତୁ (_P)"
 
 #: ../mail/mail-config.glade.h:181
 msgid "_Reply style:"
@@ -13327,7 +13480,7 @@ msgstr "ପ୍ରତିଛବି ଜାବନାୟନ ଦର୍ଶାନ୍ତ�
 
 #: ../mail/mail-config.glade.h:188
 msgid "_Show the photograph of sender in the message preview"
-msgstr ""
+msgstr "ପ୍ରେରକଙ୍କର ଫୋଟୋଗ୍ରାଫ ସନ୍ଦେଶ ପ୍ରାକଦର୍ଶନରେ ଦର୍ଶାନ୍ତୁ (_S)"
 
 #: ../mail/mail-config.glade.h:189
 msgid "_Shrink To / Cc / Bcc headers to "
@@ -13347,15 +13500,15 @@ msgstr "ଅନ୍ୟ ପ୍ରୟୋଗଗୁଡ଼ିକ ପରି ସମାନ
 
 #: ../mail/mail-config.glade.h:195
 msgid "addresses"
-msgstr ""
+msgstr "ଠିକଣାଗୁଡ଼ିକ"
 
 #: ../mail/mail-config.glade.h:196
 msgid "color"
-msgstr ""
+msgstr "ରଙ୍ଗ"
 
 #: ../mail/mail-config.glade.h:197
 msgid "description"
-msgstr ""
+msgstr "ବର୍ଣ୍ଣନା"
 
 #: ../mail/mail-config.glade.h:198
 msgid "seconds"
@@ -13375,7 +13528,7 @@ msgstr "<span weight=\"bold\">ଡିଜିଟାଲ ହସ୍ତାକ୍ଷର<
 
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ସଂଗୁପ୍ତ</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
 msgid "All active remote folders"
@@ -13391,7 +13544,7 @@ msgstr "ସମସ୍ତ ସ୍ଥାନୀୟ ଫୋଲଡରଗୁଡ଼ିକ"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Co_mpleted"
-msgstr ""
+msgstr "ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି (_m)"
 
 #: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
 msgid "Flag to Follow Up"
@@ -13415,13 +13568,15 @@ msgstr "ସୁରକ୍ଷା ସୂଚନା"
 
 #: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
-msgstr ""
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ପୋଲଡରଗୁଡ଼ିକ"
 
 #: ../mail/mail-dialogs.glade.h:15
 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"
+"ଦୟାକରି \"Flag\" ତାଲିକାରୁ ଗୋଟିଏ ଅନୁସରଣ କାର୍ଯ୍ୟ ବାଛନ୍ତୁ।"
 
 #: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
@@ -13433,16 +13588,16 @@ msgstr "ଅନ୍ତିମ ଦିବସ (_D):"
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
-msgstr ""
+msgstr "ସୂଚକ ଚିହ୍ନ (_F):"
 
 #: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
-msgstr ""
+msgstr "ଅନୁମତିପତ୍ରକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଏହାକୁ ଚିହ୍ନଟ କରନ୍ତୁ (_T)"
 
 #: ../mail/mail-folder-cache.c:835
 #, c-format
 msgid "Pinging %s"
-msgstr ""
+msgstr "ପିଙ୍ଗ କରୁଅଛି %s"
 
 #: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
@@ -13510,12 +13665,12 @@ msgstr "ସନ୍ଦେଶକୁ %sରେ ନକଲ କରୁଅଛି"
 
 #: ../mail/mail-ops.c:1173
 msgid "Forwarded messages"
-msgstr ""
+msgstr "ଅଗ୍ରସର କରାଯାଇଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ"
 
 #: ../mail/mail-ops.c:1214
 #, c-format
 msgid "Opening folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s କୁ ଖୋଲୁଅଛି"
 
 #: ../mail/mail-ops.c:1279
 #, c-format
@@ -13525,35 +13680,35 @@ msgstr "ଫୋଲଡର %s ପାଇଁ କୋଟା ସୂଚନା କାଢ�
 #: ../mail/mail-ops.c:1348
 #, c-format
 msgid "Opening store %s"
-msgstr ""
+msgstr "ଭଣ୍ଡାର %s କୁ ଖୋଲୁଅଛି"
 
 #: ../mail/mail-ops.c:1419
 #, c-format
 msgid "Removing folder %s"
-msgstr ""
+msgstr "ଫୋଲଡର %s କୁ କାଢ଼ୁଅଛି"
 
 #: ../mail/mail-ops.c:1537
 #, c-format
 msgid "Storing folder '%s'"
-msgstr ""
+msgstr "ଫୋଲଡର '%s' କୁ ସଂରକ୍ଷଣ କରୁଅଛି"
 
 #: ../mail/mail-ops.c:1600
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr ""
+msgstr "ଖାତା '%s' କୁ କାଟିକରି ସଂରକ୍ଷଣ କରୁଅଛି"
 
 #: ../mail/mail-ops.c:1601
 #, c-format
 msgid "Storing account '%s'"
-msgstr ""
+msgstr "ଖାତା '%s' କୁ ସଂରକ୍ଷଣ କରୁଅଛି"
 
 #: ../mail/mail-ops.c:1655
 msgid "Refreshing folder"
-msgstr ""
+msgstr "ଫୋଲଡରକୁ ସତେଜ କରୁଅଛି"
 
 #: ../mail/mail-ops.c:1695 ../mail/mail-ops.c:1745
 msgid "Expunging folder"
-msgstr ""
+msgstr "ଫୋଲଡରକୁ କାଟୁଅଛି"
 
 #: ../mail/mail-ops.c:1742
 #, c-format
@@ -13631,7 +13786,7 @@ msgstr "ସର୍ଭିସ ଯାଞ୍ଚ କରୁଅଛି"
 
 #: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
-msgstr ""
+msgstr "ବାତିଲ କରୁଅଛି..."
 
 #: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
@@ -13697,16 +13852,16 @@ msgstr "ସ୍ପୁଲ ଡିରେକ୍ଟୋରୀ `%s' କୁ ନିର୍�
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "ଗୋଟିଏ ବିନା mbox ଉତ୍ସ `%s'କୁ ମେଲ ପଠାଇବା ପାଇଁ ଚେଷ୍ଟାକରୁଅଛି"
 
 #: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
-msgstr ""
+msgstr "ଅଗ୍ରସର କରାଯାଇଥିବା ସନ୍ଦେଶ - %s"
 
 #: ../mail/mail-tools.c:258
 msgid "Forwarded message"
-msgstr ""
+msgstr "ଅଗ୍ରସର କରାଯାଇଥିବା ସନ୍ଦେଶ"
 
 #: ../mail/mail-tools.c:298
 #, c-format
@@ -13751,28 +13906,38 @@ msgid ""
 "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}?"
 msgstr ""
+"ଗୋଟିଏ ପଢ଼ିବା ରସିଦ ବିଜ୍ଞପ୍ତିକୁ \"{1}\" ପାଇଁ ଅନୁରୋଧ କରାଯାଇଛି। {0} କୁ ସେହି "
+"ରସିଦ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବେ?"
 
 #: ../mail/mail.error.xml.h:7
 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 ""
+"ଆପଣଙ୍କର ସନ୍ଦେଶଗୁଡ଼ିକରେ ଗୋଟିଏ ଯୁକ୍ତିଯୁକ୍ତ ବିଷୟ ଯୋଗ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ ଗ୍ରହଣକର୍ତ୍ତାଙ୍କୁ "
+"ଆପଣଙ୍କ ମେଲ ବିଷୟରେ କିଛି ଯୁକ୍ତି ପ୍ରଦାନ କରିଥାଏ। "
 
 #: ../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?"
@@ -13780,43 +13945,47 @@ 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 ""
+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 ""
+"ସମସ୍ତ ଫୋଲଡରରୁ ଆପଣ ସବୁଦିନପାଇଁ ଏହି ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅପସାରଣ କରିବାକୁ "
+"ଚାହୁଁଛନ୍ତି କି?"
 
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
+"ଫୋଲଡର \"{0}\"ରୁ ଆପଣ ସବୁଦିନପାଇଁ ଏହି ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅପସାରଣ କରିବାକୁ "
+"ଚାହୁଁଛନ୍ତି କି?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr ""
+msgstr "HTML ଶୈଳୀରେ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଠାଇବା ପାଇଁ ଆପଣ ନିଶ୍ଚିତକି?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
+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}\"."
-msgstr ""
+msgstr "କାରଣ \"{0}\"।"
 
 #: ../mail/mail.error.xml.h:20
 msgid "Because \"{2}\"."
-msgstr ""
+msgstr "କାରଣ \"{2}\"।"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
@@ -13875,6 +14044,8 @@ 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/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -13909,6 +14080,8 @@ msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ସଠିକ ଭାବରେ କାର୍ଯ୍ୟ କରୁଛି କି ନାହିଁ ନିଶ୍ଚିତ କରିବା ପାଇଁ ଯାଞ୍ଚ କରନ୍ତୁ। "
+"ମନେରଖନ୍ତୁ ଯେ ଅଧିକାଂଶ ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ଅକ୍ଷର ନିର୍ଦ୍ଦିଷ୍ଟ; ଆପଣଙ୍କର caps lock ଅନ ଥାଇପାରେ।"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -13932,7 +14105,7 @@ msgstr "ସନ୍ଧାନ ଫୋଲଡରରେ ଥିବା ସନ୍ଦେଶ
 
 #: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
-msgstr ""
+msgstr "ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ପ୍ରତ୍ୟାଖାନ କରିବେ କି?"
 
 #: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
@@ -13951,6 +14124,8 @@ 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?"
@@ -13993,6 +14168,8 @@ 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."
@@ -14015,6 +14192,8 @@ msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
+"ଯଦି ଆପଣ ବିଦାୟ ନେବେ, ତେବେ ଏହି ସନ୍ଦେଶଗୁଡ଼ିକୁ Evolution ଆରମ୍ଭ ନହେବ ପର୍ଯ୍ୟନ୍ତ "
+"ପୁଣିଥରେ ପଠାଯିବା ନାହିଁ।"
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -14035,6 +14214,10 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
+"ଅଧିକାଂଶ ଇମେଲ ତନ୍ତ୍ର ସନ୍ଦେଶରେ ଅତିକମରେ ଗୋଟିଏ-To ଶୀର୍ଷକ ଯୋଗକରନ୍ତି ଯେଉଁଥିରେ କେବଳ "
+"BCC ଗ୍ରହଣକର୍ତ୍ତା ଥାଏ। ଏହି ଶୀର୍ଷକ, ଯଦି ଯୋଗକରାଯାଏ, ଆପଣଙ୍କର ସମସ୍ତ ଗ୍ରହଣକର୍ତ୍ତାଙ୍କୁ ଆପଣଙ୍କ "
+"ସନ୍ଦେଶରେ ଯେକୌଣସି ପ୍ରକାରେ ତାଲିକାଭୁକ୍ତ କରିଥାଏ। ଏହାକୁ ଏଡ଼ାଇବା ପାଇଁ, ଆପଣଙ୍କୁ ଅତିକମରେ "
+"ଗୋଟିଏ To: କିମ୍ବା CC: ଗ୍ରହଣକର୍ତ୍ତା ଯୋଗ କରିବା ଉଚିତ।"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -14050,7 +14233,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."
@@ -14065,6 +14248,8 @@ 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 ""
+"To: କ୍ଷେତ୍ରରେ ଦୟାକରି ଗୋଟିଏ ବୈଧ ଇମେଲ ଠିକଣା ଭରଣ କରନ୍ତୁ। ଆପଣ ଇମେଲ ପାଇଁ ଭରଣ ବାକ୍ସ "
+"ପରେଥିବା To: ବଟନରେ କ୍ଲିକ କରି ସନ୍ଧାନ କରିପାରିବେ।"
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
@@ -14072,10 +14257,13 @@ msgid ""
 "HTML email:\n"
 "{0}"
 msgstr ""
+"ଦୟାକରି ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ନିମ୍ନଲିଖିତ ଗ୍ରହଣକର୍ତ୍ତାମାନେ HTML ଇମେଲ ଗ୍ରହଣ କରିବା ପାଇଁ "
+"ଇଚ୍ଛୁକ ଏବଂ ସମର୍ଥ:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
-msgstr ""
+msgstr "ଏହି ହସ୍ତାକ୍ଷରକୁ ଚିହ୍ନିବା ପାଇଁ ଦୟାକରି ଗୋଟିଏ ଅନନ୍ୟ ନାମ ପ୍ରଦାନ କରନ୍ତୁ।"
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
@@ -14083,7 +14271,7 @@ msgstr "ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ।"
 
 #: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgstr "ପୁରୁଣା ମେଲ ଫୋଲଡର \"{0}\"କୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ସମୟରେ ସମସ୍ୟା।"
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server"
@@ -14091,7 +14279,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."
@@ -14134,6 +14322,8 @@ msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
+"Evolution କୁ ସଠିକ ଭାବରେ କାର୍ଯ୍ୟ କରିବା ପାଇଁ ତନ୍ତ୍ର ଫୋଲଡରଗୁଡ଼ିକ ଆବଶ୍ୟକ ଏବଂ ପୁନଃନାମକରଣ, "
+"ଘୁଞ୍ଚାଇବା, ଅଥବା ଅପସାରଣ କରାଯାଇପାରିବ ନାହିଁ।"
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
@@ -14144,6 +14334,12 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
+"ଆପଣ ପଠାଉଥିବା ଯୋଗାଯୋଗ ତାଲିକାଟି ଗ୍ରହଣକର୍ତ୍ତାମାନଙ୍କୁ ଲୁଚାଇବା ପାଇଁ ବିନ୍ୟାସିତ।\n"
+"\n"
+"ଅନେକ ଇମେଲ ତନ୍ତ୍ରଗୁଡ଼ିକ ପାଖାପାଖି To ଶୀର୍ଷକକୁ ସନ୍ଦେଶରେ ଯୋଗ କରିଥାଏ ଯେଉଁଥିରେ କେବଳ "
+"BCC ଗ୍ରହଣକର୍ତ୍ତା ଥାଏ। ଏହି ଶୀର୍ଷକ, ଯଦି ଯୋଗକରାଯାଇଥାଏ, ତେବେ ସନ୍ଦେଶରେ ସମସ୍ତ "
+"ଗ୍ରହଣକର୍ତ୍ତାଙ୍କୁ ତାଲିକାଭୁକ୍ତ କରିଥାଏ। ଏହାକୁ ଏଡ଼ାଇବା ପାଇଁ, ଆପଣଙ୍କୁ ଅତିକମରେ ଗୋଟିଏ To: କିମ୍ବା CC: "
+"ଗ୍ରହଣକର୍ତ୍ତା ଯୋଗକରିବା ଉଚିତ।"
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -14153,6 +14349,11 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
+"ନିମ୍ନଲିଖିତ ସନ୍ଧାନ ଫୋଲଡର(ଗୁଡ଼ିକ):\n"
+"{0}\n"
+"ବର୍ତ୍ତମାନ କଢ଼ାଯାଇଥିବା ଫୋଲଡରକୁ ବ୍ୟବହାର କରିଥାଏ:\n"
+"    \"{1}\"\n"
+"ଏବଂ ଅଦ୍ୟତନ କରାଯାଇଥାଏ।"
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
@@ -14162,6 +14363,11 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
+"ନିମ୍ନଲିଖିତ ଛାଣକ ନିୟମ(ଗୁଡ଼ିକ):\n"
+"{0}\n"
+"ବର୍ତ୍ତମାନ କଢ଼ାଯାଇଥିବା ଫୋଲଡରଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିଥାଏ:\n"
+"    \"{1}\"\n"
+"ଏବଂ ଅଦ୍ୟତନ କରାଯାଇଥାଏ।"
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -14172,22 +14378,24 @@ msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
+"ଏହି ଫୋଲଡରକୁ କ୍ଷୁଦ୍ରତମ ଆକାରରେ ଯୋଗକରାଯାଇଥାଏ,\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 ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr ""
+msgstr "ଏହି ସର୍ଭର ଏହି ପ୍ରକାର ପ୍ରାଧିକରଣକୁ ସମର୍ଥନ କରେନାହିଁ ଏବଂ ବୈଧିକରଣକୁ କଦାପି ସମର୍ଥନ କରିନଥାଏ।"
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
@@ -14198,6 +14406,8 @@ 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."
@@ -14207,7 +14417,7 @@ msgstr "ସାମହିକ ସର୍ଭର ସହିତ ସଂଯୋଗ କର�
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr ""
+msgstr "ଏହି ଖାତା ପାଇଁ ଡ୍ରାଫ୍ଟ ଫୋଲଡରକୁ ଖୋଲିବାରେ ଅସମର୍ଥ। ଏହା ପିରବର୍ତ୍ତେ ତନ୍ତ୍ର ଡ୍ରାଫ୍ଟ ଫୋଲଡର ବ୍ୟବହାର କରିବେ କି?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -14227,18 +14437,21 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
+"ଚେତାବନୀ: ଗୋଟିଏ ସନ୍ଧାନ ଫୋଲଡରରୁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅପସାରଣ କରିବା ଦ୍ୱାରା ଏହା ପ୍ରକୃତ "
+"ସନ୍ଦେଶକୁ ଆପଣଙ୍କର ସ୍ଥାନୀୟ ଅଥବା ସୂଦୁର ଫୋଲଡରରୁ ଅପସାରଣ କରିଥାଏ।\n"
+"ଆପଣ ପ୍ରକୃତରେ ଏହା କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
-msgstr ""
+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."
-msgstr ""
+msgstr "ଆପଣ ସମାନ ନାମ ବିଶିଷ୍ଟ ଦୁଇଟି ଖାତା ଖୋଲିନାହାନ୍ତି।"
 
 #: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
@@ -14254,6 +14467,9 @@ msgid ""
 "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."
@@ -14356,6 +14572,8 @@ msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"କୌଣସି ସନ୍ଦେଶ ଆପଣଙ୍କର ସନ୍ଧାନ ପ୍ରକାରକୁ ସନ୍ତୁଷ୍ଟ କରିପାରିବ ନାହିଁ। ସନ୍ଧାନ->ତାଲିକା ବସ୍ତୁକୁ ସଫାକରନ୍ତୁ "
+"କିମ୍ବା ଏହାକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ ସହାୟତାରେ ସଫାକରନ୍ତୁ।"
 
 #: ../mail/message-list.c:4301
 msgid "There are no messages in this folder."
@@ -14433,7 +14651,7 @@ msgstr "ସମାଲୋଚନା"
 
 #: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
-msgstr ""
+msgstr "ବିଷୟ ବସ୍ତୁ"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
@@ -14475,13 +14693,13 @@ 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:478
 #: ../plugins/templates/templates.c:390
@@ -14502,6 +14720,8 @@ msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
+"Evolution କିଛି ସୂଚକ ଶବ୍ଦ ପାଇଅଛି ଯାହାକି ପ୍ରସ୍ଥାବ ଦେଇଥାଏ ଯେ ଏହି ସନ୍ଦେଶ "
+"ଗୋଟିଏ ସଂଲଗ୍ନକ ଆବଶ୍ୟକ କରିଥାଏ।"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
@@ -14525,15 +14745,15 @@ msgstr ""
 
 #: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
-msgstr ""
+msgstr "Evolution ନକଲ ସଂରକ୍ଷଣ ଫାଇଲର ନାମ ବାଛନ୍ତୁ"
 
 #: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "ନକଲ ସଂରକ୍ଷଣ ପରେ Evolutionକୁ ପୁନଃ ଚାଳନ କରନ୍ତୁ (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:191
 msgid "Select name of the Evolution backup file to restore"
-msgstr ""
+msgstr "ପୁନଃସ୍ଥାପନ କରିବା ପାଇଁ Evolution ନକଲ ସଂରକ୍ଷଣ ଫାଇଲର ନାମ ଚୟନ କରନ୍ତୁ"
 
 #: ../plugins/backup-restore/backup-restore.c:215
 msgid "_Restart Evolution after restore"
@@ -14549,14 +14769,17 @@ msgid ""
 "Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
+"ଆପଣ ନକଲ ସଂରକ୍ଷଣରୁ Evolution କୁ ପୁନଃସ୍ଥାପନ କରିପାରିବେ। ଏହା ସମସ୍ତ ମେଲ, "
+"କ୍ୟାଲେଣ୍ଡର, କାର୍ଯ୍ୟ, ମେମୋ, ସମ୍ପର୍କକୁ ପୁନଃସ୍ଥାପନ କରିଥାଏ। \n"
+"ଏହା ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସଂରଚନା, ମେଲ ଛାଣକ ଇତ୍ୟାଦିକୁ ପୁନଃସ୍ଥାପନ କରିଥାଏ।"
 
 #: ../plugins/backup-restore/backup-restore.c:296
 msgid "_Restore Evolution from the backup file"
-msgstr ""
+msgstr "Evolutionକୁ ନକଲସଂରକ୍ଷଣ ଫାଇଲରୁ ପୁନଃସ୍ଥାପନ କରିଥାଏ (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:303
 msgid "Please select an Evolution Archive to restore:"
-msgstr ""
+msgstr "ଦୟାକରି ପୁନଃସ୍ଥାପନ କରିବା ପାଇଁ ଗୋଟିଏ Evolution ଆଲେଖୀ ବାଛନ୍ତୁ:"
 
 #: ../plugins/backup-restore/backup-restore.c:306
 msgid "Choose a file to restore"
@@ -14593,7 +14816,7 @@ msgstr "Evolutionର ବିନ୍ଯାସକୁ ପରିବର୍ତ୍ତନ
 
 #: ../plugins/backup-restore/backup.c:200
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
+msgstr "Evolution ତଥ୍ୟକୁ ନକଲ ସଂରକ୍ଷଣ କରୁଅଛି (ମେଲ, ସମ୍ପର୍କ, କ୍ୟାଲେଣ୍ଡର, କାର୍ଯ୍ୟ, ମେମୋ)"
 
 #: ../plugins/backup-restore/backup.c:211
 msgid "Backup complete"
@@ -14678,7 +14901,7 @@ 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 ""
+msgstr "Evolutionକୁ ବଚ୍ଛିତ ନକଲ ସଂରକ୍ଷଣ ଫାଇଲରୁ ପୁନଃସ୍ଥାପନ କରିବା ପାଇଁ ଆପଣ ନିଶ୍ଚିତ କି?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -14768,7 +14991,7 @@ msgstr "ସାଥି ତାଲିକା ସହିତ ବର୍ତ୍ତମାନ
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
-msgstr ""
+msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
@@ -14788,17 +15011,17 @@ msgstr "%sକୁ ସ୍ପନିଙ୍ଗ କରିବା ସମୟରେ ତ୍
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "Bogoଛାଣକ ନିମ୍ନସ୍ତରର ପଦ୍ଧତି ଉତ୍ତର ଦିଏ ନାହିଁ, ରଦ୍ଦକରୁଅଛି..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
+msgstr "Bogoଛାଣକ ନିମ୍ନସ୍ତର ବାଧାପ୍ରାପ୍ତ ପାଇଁ ଅପେକ୍ଷା କରନ୍ତୁ, ବନ୍ଦ କରୁଅଛି..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "Bogoଛାଣକ ପାଇଁ ପାଇପ ବିଫଳ ହୋଇଛି, ତ୍ରୁଟି ସଂକେତ: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
 msgid "Convert message text to _Unicode"
@@ -14828,7 +15051,7 @@ msgstr "Bogofilter ବ୍ୟବହାର କରି ଜଙ୍କ ସନ୍ଦେ�
 
 #: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
-msgstr ""
+msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:366
 #: ../plugins/calendar-http/calendar-http.c:171
@@ -14876,7 +15099,7 @@ msgstr "ସ୍ଥାନୀୟ କ୍ୟାଲେଣ୍ଡରଗୁଡ଼ିକ"
 
 #: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
-msgstr ""
+msgstr "ସୁରକ୍ଷିତ ସଂଯୋଗ (_S)"
 
 #: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
@@ -15046,6 +15269,8 @@ msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
+"ଗୋଟିଏ ଇଚ୍ଛାମୁତାବକ ଶୀର୍ଷକ କି ମୂଲ୍ୟ ଭାବରେ ଉଲ୍ଲେଖ କରିବା ପାଇଁ ସଜଡ଼ାଯାଇଥାଏ:\n"
+"\";\" ଦ୍ୱାରା ପୃଥକ ହୋଇଥିବା ଇଚ୍ଛାରୂପଣ ଶୀର୍ଷକ କି ମୂଲ୍ୟଗୁଡ଼ିକ।"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
@@ -15070,6 +15295,9 @@ 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 ""
+"ଇଚ୍ଛାମୁତାବକ ଶୀର୍ଷକ ଯାହାକୁକି ଆପଣ ଯାଉଥିବା ସନ୍ଦେଶରେ ବ୍ୟବହାର କରିପାରିବେ। "
+"ଗୋଟିଏ ଶୀର୍ଷକ ଏବଂ ଶୀର୍ଷକ ମୂଲ୍ୟକୁ ଉଲ୍ଲେଖ କରିବା ପାଇଁ: ଇଚ୍ଛାରୂପଣ ଶୀର୍ଷକର ନାମ ଏବଂ "
+"ତାପରେ \"=\" ଏବଂ \";\" ଦ୍ୱାରା ପୃଥକ ହୋଇଥିବା ମୂଲ୍ୟ"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15122,6 +15350,8 @@ 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"
+"ଯେଉଁମାନେ ଆପଣଙ୍କ ପାଖକୁ କାର୍ଯ୍ୟାଳୟ ବାହାରୁ ମେଲ ପଠାଇଥାଆନ୍ତି।"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:291
 #: ../plugins/exchange-operations/exchange-account-setup.c:296
@@ -15146,7 +15376,7 @@ msgstr "ଗୁପ୍ତଶବ୍ଦ ବଦଳାଅ"
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "ବିନିମୟ ଖାତା ପାଇଁ ପ୍ରତିନିଧି ବିନ୍ୟାସକୁ ପରିଚାଳନା କରନ୍ତୁ"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
@@ -15220,6 +15450,8 @@ msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
+"Evolution ଅଫଲାଇନ ଅବସ୍ଥାରେ ଅଛି। ଆପଣ ବର୍ତ୍ତମାନ କଦାପି ଫୋଲଡର ନିର୍ମାଣ କିମ୍ବା ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ।\n"
+"ଏହି ପ୍ରୟୋଗ ପାଇଁ ଦୟାକରି ଅନଲାଇନ ଧାରାକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -15295,6 +15527,8 @@ 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 ""
+"ଆପଣଙ୍କୁ ପ୍ରତିନିଧି ଭାବରେ ପଦନ୍ୱତ କରାଯାଇଛି ବୋଲି ସୂଚାଇବା ପାଇଁ ଏହି ସନ୍ଦେଶକୁ Evolution "
+"ଦ୍ୱାରା ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପଠାଯାଇଛି। ଆପଣ ବର୍ତ୍ତମାନ ମୋ ବଦଳରେ ସନ୍ଦେଶ ପଠାଇପାରିବେ।"
 
 #. To translators: Another chunk of the same message.
 #.
@@ -15692,6 +15926,8 @@ msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr ""
+"ବିନିମୟ ଖାତା \"{0}\" ପାଇଁ ବିକଳ୍ପଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ Evolutionକୁ "
+"ପୁନଃ ଚାଳନ କରିବା ପରେ ହୋଇଥିଲା।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
@@ -15707,6 +15943,9 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
+"ବିନିମୟ ଖାତାକୁ ସଂରଚନା କରିପାରିଲା ନାହିଁ କାରଣ \n"
+"ଗୋଟିଏ ଅଜଣା ତ୍ରୁଟି ଘଟିଅଛି। URL, \n"
+"ଚାଳକ ନାମ, ଏବଂ ପ୍ରବେଶ ସଂକେତକୁ ଯାଞ୍ଚ କରନ୍ତୁ, ଏବଂ ପୁଣି ଚେଷ୍ଟାକରନ୍ତୁ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
@@ -15718,7 +15957,7 @@ msgstr "ସେବକ {0} ସହିତ ସମ୍ପର୍କ ସ୍ଥାପନ �
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
-msgstr ""
+msgstr "ପ୍ରତିନିଧିମାନଙ୍କ ପାଇଁ ଫୋଲଡର ଅନୁମତି ନିର୍ଦ୍ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
@@ -15754,7 +15993,7 @@ msgstr "କାର୍ୟ୍ୟାଳୟ ବାହାର ସ୍ଥିତିକୁ
 
 #: ../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 "ସ୍ୱୀକୃତି ପ୍ରାପ୍ତ ମେଲବାକ୍ସକୁ ଧାରଣ କରିବା ପାଇଁ Evolution କୁ ପୁନଃ ଚାଳନ କରିବାକୁ ହେବ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
@@ -15775,6 +16014,18 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
+"ବିନିମୟ ସଂଯୋଗିକୀ କିଛି ଫଳନ ପାଇଁ Exchange Serverରେ ଅଭିଗମ୍ୟତା\n"
+"ଆବଶ୍ୟକ କରେ ଯାହାକି ନିଷ୍କ୍ରିୟ ଅଥବା ଅଟକିଯାଇଥିବା ପରି\n"
+"ଦୃଶ୍ୟମାନ ହେଉଛି। (ଏହା ସାଧାରଣତଃ \n"
+"ଉଦ୍ଦେଶ୍ୟ ବିହୀନ ଭାବରେ ହୋଇଥାଏ।) ଆପଣଙ୍କର ବିନିମୟ \n"
+"ପ୍ରଶାସକଙ୍କୁ Evolution ବିନିମୟ ସଂଯୋଗିକୀକୁ \n"
+"ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବାକୁ ଏହି ଫଳନକୁ ସକ୍ରିୟ କରିବା ଆବଶ୍ୟକ।\n"
+"\n"
+"ଆପଣଙ୍କ ବିନିମୟ ପ୍ରଶାସକଙ୍କୁ ସୂଚନା ପ୍ରଦାନ କରିବା ପାଇଁ, \n"
+"ଦୟାକରି ନିମ୍ନରେ ପ୍ରଦତ୍ତ ସଂଯୋଗକୁ ଅନୁସରଣ କରନ୍ତୁ:\n"
+"\n"
+"{0}\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
@@ -15806,6 +16057,8 @@ 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."
@@ -15876,6 +16129,8 @@ msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
+"ସର୍ଭରଟି Exchange 5.5କୁ ଚଲାଉଅଛି। ବିନିମୟ ସଂଯୋଗିକୀ \n"
+"Microsoft Exchange 2000 ଏବଂ 2003 କୁ ହିଁ କେବଳ ସମର୍ଥନ କରିଥାଏ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
@@ -15885,6 +16140,11 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"ଏହା ସମ୍ଭବତଃ ଆପଣଙ୍କ ସର୍ଭର ଆବଶ୍ୟକ କରୁଅଛି ଯେ \n"
+"ଆପଣ Windowsର ପରିସର ନାମକୁ ଆପଣଙ୍କର ଚାଳକ ନାମ ଭାବରେ \n"
+"ଉଲ୍ଲେଖ କରନ୍ତୁ (ଯେପରି କି, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"ଅଥବା ଆପଣ ଭୁଲ ପ୍ରବେଶ ସଂକେତ ଟାଇପ କରିଛନ୍ତି।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
@@ -15919,13 +16179,13 @@ msgstr "ଅସହାୟକ ଚାଳନା"
 
 #: ../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: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:76
 msgid "You cannot make yourself your own delegate"
@@ -15944,18 +16204,24 @@ 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 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."
@@ -16037,10 +16303,12 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
+"ଆପଣଙ୍କ ପ୍ଲଗଇନ ପସନ୍ଦରେ ସେଟ କରାଯାଇଥିବା ବାହ୍ୟ ସମ୍ପାଦକକୁ ଆରମ୍ଭ କରାଯାଇପାରିବ ନାହିଁ। "
+"ଅନ୍ୟ ଏକ ସମ୍ପାଦକ ସେଟ କରି ଚେଷ୍ଟାକରନ୍ତୁ।"
 
 #: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ପାଇଁ ନିଷ୍ପାଦନ କରିବାକୁ ଥିବା ନିର୍ଦ୍ଦେଶ: "
 
 #: ../plugins/external-editor/external-editor.c:110
 msgid ""
@@ -16221,6 +16489,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"
@@ -16248,7 +16518,7 @@ msgstr "ସନ୍ଦେଶ କାଢ଼ିବା ବିଫଳ"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
-msgstr ""
+msgstr "ସର୍ଭିର ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅନୁସନ୍ଧାନ କରିବାକୁ ଅନୁମତି ଦେଇନଥିଲା। "
 
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
@@ -16269,12 +16539,12 @@ msgstr "ଚାଳକ ଉଲ୍ଲେଖ କରନ୍ତୁ"
 #. 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.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
-msgstr ""
+msgstr "ଆପଣ ପୂର୍ବରୁ ଏହି ଚାଳକ ପାଇଁ ପ୍ରକ୍ସି ଅନୁମତି ଦେଇଛନ୍ତି।"
 
 #. 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.error.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.error.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
@@ -16289,14 +16559,16 @@ 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.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
+msgstr "ଆପଣ ଏହି ଫୋଲଡରକୁ ଉଲ୍ଲିଖିତ ଚାଳକ &quot;{0}&quot; ସହିତ ସହଭାଗ କରିପାରିବେ ନାହିଁ"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଚାଳକ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ ଯାହାକୁକି ଆପଣ ତାଲିକାରେ ଯୋଗ କରିବାକୁ ଚାହୁଁଛନ୍ତି"
 
 #: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Accept Tentatively"
@@ -16584,7 +16856,6 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr "ହାର୍ଡୱେର ଛାଣିବା ସ୍ତରକୁ ଧାରଣ କରାଯାଇନାହିଁ"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-#, fuzzy
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -16597,7 +16868,6 @@ msgid "Search for an iPod failed"
 msgstr "iPod ସନ୍ଧାନ ବିଫଳ ହୋଇଛି"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:85
-#, fuzzy
 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."
@@ -16776,7 +17046,6 @@ msgid "The calendar attached contains multiple items"
 msgstr "ସଂଲଗ୍ନ ହୋଇଥିବା କାଲେଣ୍ଡରଟି ଏକାଧିକ ବସ୍ତୁ ଧାରଣ କରିଅଛି"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1590
-#, fuzzy
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16809,7 +17078,6 @@ msgstr "ଦ୍ୱନ୍ଦ ସନ୍ଧାନ"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2586
-#, fuzzy
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ସାକ୍ଷାତକାର ଦ୍ୱନ୍ଦଗୁଡ଼ିକୁ ସନ୍ଧାନ କରିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର ବାଛନ୍ତୁ"
 
@@ -16822,21 +17090,18 @@ msgstr "ଆଜି"
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
-#, fuzzy
 msgid "Today %H:%M"
 msgstr "ଆଜି %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
-#, fuzzy
 msgid "Today %H:%M:%S"
 msgstr "ଆଜି %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
-#, fuzzy
 msgid "Today %l:%M:%S %p"
 msgstr "ଆଜି %l:%M:%S %p"
 
@@ -16848,69 +17113,60 @@ msgstr "ଆସନ୍ତାକାଲି"
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
-#, fuzzy
 msgid "Tomorrow %H:%M"
 msgstr "ଆସନ୍ତାକାଲି %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
-#, fuzzy
 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:233
-#, fuzzy
 msgid "Tomorrow %l:%M %p"
 msgstr "ଆସନ୍ତାକାଲି %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
-#, fuzzy
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ଆସନ୍ତାକାଲି %l:%M:%S %p"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
-#, fuzzy, c-format
+#, 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:261
-#, fuzzy
 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:265
-#, fuzzy
 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:270
-#, fuzzy
 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:274
-#, fuzzy
 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:283
-#, fuzzy
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
@@ -16918,210 +17174,201 @@ msgstr "%A, %B %e"
 #. without a year and a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
-#, fuzzy
 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:293
-#, fuzzy
 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:298
-#, fuzzy
 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:302
-#, fuzzy
 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:308
-#, fuzzy
 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:313
-#, fuzzy
 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:317
-#, fuzzy
 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:322
-#, fuzzy
 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:326
-#, fuzzy
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
 #: ../plugins/itip-formatter/itip-view.c:351
 #: ../plugins/itip-formatter/itip-view.c:439
 #: ../plugins/itip-formatter/itip-view.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ପାଇଁ ଦୟାକରି ଉତ୍ତର ଦିଅନ୍ତୁ"
 
 #: ../plugins/itip-formatter/itip-view.c:353
 #: ../plugins/itip-formatter/itip-view.c:441
 #: ../plugins/itip-formatter/itip-view.c:529
-#, fuzzy, c-format
+#, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ପାଇଁ ଗ୍ରହଣ କରିଅଛି"
 
 #: ../plugins/itip-formatter/itip-view.c:358
-#, fuzzy, c-format
+#, 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:360
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭାର ସୂଚନାକୁ ପ୍ରକାଶ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭାର ପ୍ରତିନିଧିତ୍ତ୍ୱ ଆପଣଙ୍କୁ ନ୍ୟସ୍ତ କରିଛନ୍ତି:"
 
 #: ../plugins/itip-formatter/itip-view.c:368
-#, fuzzy, c-format
+#, 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:370
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭାରେ ଆପଣଙ୍କର ଉପସ୍ଥିତି କାମନା କରୁଛନ୍ତି:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#, 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:378
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ଗୋଟିଏ ସ୍ଥିତବାନ ସଭାକୁ ଯୋଗକରିବାକୁ ଚାହୁଁଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
-#, fuzzy, c-format
+#, 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:384
-#, fuzzy, c-format
+#, 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:388
-#, fuzzy, c-format
+#, 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:390
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭା ଉତ୍ତରକୁ ପଛକୁ ପଠାଇଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> %s ମାଧ୍ଯମରେ ନିମ୍ନଲିଖିତ ସଭାକୁ ବାତିଲ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:396
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭାକୁ ବାତିଲ କରିଅଛି।"
 
 #: ../plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
+#, 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:402
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭାର ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ପ୍ରସ୍ତାବ ଦେଇଅଛି।"
 
 #: ../plugins/itip-formatter/itip-view.c:406
-#, fuzzy, c-format
+#, 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:408
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସଭା ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ପ୍ରତ୍ୟାଖ୍ୟାନ କରିଅଛି।"
 
 #: ../plugins/itip-formatter/itip-view.c:446
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> %s ମାଧ୍ଯମରେ ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟକୁ ପ୍ରକାଶ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟକୁ ପ୍ରକାଶ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
-#, fuzzy, c-format
+#, 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:456
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> %s ମାଧ୍ଯମରେ ଆପଣଙ୍କୁ ଗୋଟିଏ କାର୍ଯ୍ୟଭାର ନ୍ୟସ୍ତ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ଆପଣଙ୍କୁ ଗୋଟିଏ କାର୍ଯ୍ୟଭାର ନ୍ୟସ୍ତ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
-#, fuzzy, c-format
+#, 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:466
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ଗୋଟିଏ ସ୍ଥିତବାନ କାର୍ଯ୍ୟକୁ ଯୋଗ କରିବା ପାଇଁ ଇଚ୍ଛାପ୍ରକାଶ କରୁଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
-#, fuzzy, c-format
+#, 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:472
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
@@ -17130,67 +17377,67 @@ msgstr ""
 "ଇଚ୍ଛାପ୍ରକାଶ କରୁଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
-#, fuzzy, c-format
+#, 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:478
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ନ୍ୟସ୍ତ କାର୍ଯ୍ୟର ଉତ୍ତରକୁ ପଛକୁ ପଠାଇଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
+#, 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:484
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ନ୍ୟସ୍ତ କାର୍ଯ୍ଯକୁ ବାତିଲ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
-#, fuzzy, c-format
+#, 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:490
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ନ୍ୟସ୍ତ କାର୍ଯ୍ୟଭାର ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ପ୍ରସ୍ତାବିତ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
-#, fuzzy, c-format
+#, 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:496
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ନ୍ୟସ୍ତ କାର୍ଯ୍ୟକୁ ପ୍ରତ୍ୟାଖ୍ଯାନ କରିଥାଏ:"
 
 #: ../plugins/itip-formatter/itip-view.c:534
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> %s ମାଧ୍ଯମରେ ନିମ୍ନଲିଖିତ ମେମୋକୁ ପ୍ରକାଶିତ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:536
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ମେମୋକୁ ପ୍ରକାଶିତ କରିଅଛି:"
 
 #: ../plugins/itip-formatter/itip-view.c:541
-#, fuzzy, c-format
+#, 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:543
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ଗୋଟିଏ ସ୍ଥିତବାନ ସ୍ମାରକ ପତ୍ରରେ ଯୋଗ କରିବା ପାଇଁ ଇଚ୍ଛାକରିଥାଏ:"
 
 #: ../plugins/itip-formatter/itip-view.c:547
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> %s ମାଧ୍ଯମରେ ନିମ୍ନଲିଖିତ ସହଭାଗୀ ସ୍ମାରକପତ୍ରକୁ ବାତିଲ କରିଛି:"
 
@@ -17282,19 +17529,16 @@ msgid "_Apply to all instances"
 msgstr "ସମସ୍ତ ଦ୍ରୁଷ୍ଟାନ୍ତରେ ପ୍ରୟୋଗ କରନ୍ତୁ (_A)"
 
 #: ../plugins/itip-formatter/itip-view.c:1152
-#, fuzzy
 #| msgid "Show Side _Bar"
 msgid "Show time as _free"
 msgstr "ପାର୍ଶ୍ବ ପଟିକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ (_B)"
 
 #: ../plugins/itip-formatter/itip-view.c:1155
-#, fuzzy
 msgid "_Preserve my reminder"
 msgstr "ମୋର ସ୍ମାରକକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
 #: ../plugins/itip-formatter/itip-view.c:1161
-#, fuzzy
 #| msgid "Sh_ow a reminder"
 msgid "_Inherit reminder"
 msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_I)"
@@ -17304,7 +17548,6 @@ msgid "_Memos:"
 msgstr "ସ୍ମାରକପତ୍ର (_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#, fuzzy
 #| msgid "Displays text/calendar parts in messages."
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "ପାଠ୍ଯ/କାଲେଣ୍ଡର ଅଂଶବିଶେଷକୁ ସନ୍ଦେଶରେ ଦର୍ଶାନ୍ତୁ।"
@@ -17314,7 +17557,6 @@ msgid "Itip Formatter"
 msgstr "Itip ସଜ୍ଜିକରଣ ଶୈଳୀ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
@@ -17363,7 +17605,6 @@ 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
-#, fuzzy
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -17454,17 +17695,14 @@ msgid "Show icon in _notification area"
 msgstr "ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ଚିତ୍ରସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_n)"
 
 #: ../plugins/mail-notification/mail-notification.c:569
-#, fuzzy
 msgid "B_link icon in notification area"
 msgstr "ସୂଚନା ପରିସରରେ ଦପଦପ ଚିତ୍ରସଙ୍କେତ (_l)"
 
 #: ../plugins/mail-notification/mail-notification.c:571
-#, fuzzy
 msgid "Popup _message together with the icon"
 msgstr "ଚିତ୍ରସଙ୍କେତ ସହିତ ପପ-ଅପ ସନ୍ଦେଶ (_m)"
 
 #: ../plugins/mail-notification/mail-notification.c:752
-#, fuzzy
 msgid "_Play sound when new messages arrive"
 msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଚଲାନ୍ତୁ (_P)"
 
@@ -17489,7 +17727,6 @@ msgid "Pl_ay"
 msgstr "ଚଲାନ୍ତୁ (_a)"
 
 #: ../plugins/mail-notification/mail-notification.c:829
-#, fuzzy
 msgid "Notify new messages for _Inbox only"
 msgstr "କେବଳ ଇନବକ୍ସ ପାଇଁ ନୂତନ ସନ୍ଦେଶ ସୂଚୀତ କରନ୍ତୁ (_I)"
 
@@ -17498,7 +17735,6 @@ msgid "Mail Notification"
 msgstr "ଡାକ ସୂଚନା"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-#, fuzzy
 #| msgid "Play sound when new messages arrive."
 msgid "Notifies you when new mail messages arrive."
 msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଚଲାନ୍ତୁ।"
@@ -17509,14 +17745,12 @@ msgid "Cannot open calendar. %s"
 msgstr "କ୍ୟାଲେଣ୍ଡର ଖୋଲି ପାରିବେ ନାହିଁ। %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:350
-#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "ଚୟିତ ଉତ୍ସ ଅଟେ ପଢନ୍ତୁ ମନୋନୀତ କର ଅନ୍ଯ ଉତ୍ସ."
 
 #: ../plugins/mail-to-task/mail-to-task.c:353
-#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17525,7 +17759,6 @@ msgstr ""
 "ଉତ୍ସକୁ ଦୟାକରି ବାଛନ୍ତୁ।"
 
 #: ../plugins/mail-to-task/mail-to-task.c:356
-#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -17542,7 +17775,6 @@ msgid "Cannot get source list. %s"
 msgstr "ଉତ୍ସ ତାଲିକାକୁ ପ୍ରାପ୍ତ କରିପାରିବେ ନାହିଁ। %s"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-#, fuzzy
 #| msgid "Convert the selected message to a new task"
 msgid "Convert a mail message to a task."
 msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ତାଲିକାରେ ରୂପାନ୍ତର କରନ୍ତୁ"
@@ -17568,7 +17800,6 @@ msgid "Convert to an _Event"
 msgstr "ଗୋଟିଏ ଘଟଣାକୁ ରୂପାନ୍ତର କରନ୍ତୁ (_E)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-#, fuzzy
 #| msgid "Mail to task"
 msgid "Mail-to-Task"
 msgstr "କାର୍ଯ୍ୟକୁ ମେଲ"
@@ -17611,7 +17842,6 @@ msgid "Mailing _List"
 msgstr "ମେଲ ତାଲିକା (_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-#, fuzzy
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "ପାଇଁ ତାଲିକା."
 
@@ -17620,12 +17850,10 @@ msgid "_Post message to list"
 msgstr "ତାଲିକାରେ ସନ୍ଦେଶ ପୋଷ୍ଟ କରନ୍ତୁ (_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#, fuzzy
 msgid "_Subscribe to list"
 msgstr "ତାଲିକାକୁ କିଣନ୍ତୁ (_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#, fuzzy
 msgid "_Un-subscribe to list"
 msgstr "ତାଲିକାକୁ କିଣନ୍ତୁ ନାହିଁ (_U)"
 
@@ -17634,7 +17862,6 @@ msgid "Action not available"
 msgstr "କାର୍ଯ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-#, fuzzy
 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"
@@ -17660,7 +17887,6 @@ msgid "Posting not allowed"
 msgstr "ପଠାଇବା ଅନୁମୋଦିତ ନୁହଁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-#, fuzzy
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -17673,7 +17899,6 @@ 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. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -17686,7 +17911,6 @@ msgstr ""
 "ଶୀର୍ଷକ: {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
-#, fuzzy
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -17697,7 +17921,6 @@ msgstr ""
 "ଶୀର୍ଷକ: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-#, fuzzy
 msgid ""
 "This message does not contain the header information required for this "
 "action."
@@ -17724,32 +17947,26 @@ msgid "Get List _Archive"
 msgstr "ତାଲିକା ଅଭିଲେଖନ ପ୍ରାପ୍ତ କରନ୍ତୁ (_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-#, fuzzy
 msgid "Get List _Usage Information"
 msgstr "ବ୍ୟବହାର ବିଧି ସୂଚନା ତାଲିକା ପ୍ରାପ୍ତ କରନ୍ତୁ (_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-#, fuzzy
 msgid "Get an archive of the list this message belongs to"
 msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାର ଗୋଟିଏ ଆଲେଖୀ ଗ୍ରହଣ କରନ୍ତୁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ଏହି ସନ୍ଦେଶଟି ଯାହାର ତାହାର ବ୍ୟବହାର ବିଧି ବିଷୟରେ ସୂଚନା ଗ୍ରହଣ କରନ୍ତୁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାରେ ଗୋଟିଏ ସନ୍ଦେଶ ଦିଅନ୍ତୁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାକୁ ସ୍ବୀକାରକ୍ତି ଦିଅନ୍ତୁ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାକୁ ଅସ୍ବୀକାରକ୍ତି ଦିଅନ୍ତୁ"
 
@@ -17770,7 +17987,6 @@ msgid "Also mark messages in subfolders?"
 msgstr "ଉପ-ଫୋଲଡରରେ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଚିହ୍ନଟ କରିବେ କି?"
 
 #: ../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?"
@@ -17795,7 +18011,6 @@ msgid "Mark Me_ssages as Read"
 msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ (_s)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#, fuzzy
 #| msgid "Mark all messages in the folder as read"
 msgid "Mark all messages in a folder as read."
 msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ"
@@ -17809,7 +18024,6 @@ msgid "Support plugins written in Mono."
 msgstr ""
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-#, fuzzy
 #| msgid "Change Evolution's settings"
 msgid "Manage your Evolution plugins."
 msgstr "Evolutionର ବିନ୍ଯାସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
@@ -17855,7 +18069,6 @@ msgid "Plain Text Mode"
 msgstr "ସାଧାରଣ ପାଠ୍ଯ ଧାରା"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-#, fuzzy
 #| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "ସାଧାରଣ-ପାଠ୍ଯକୁ ପସନ୍ଦ କରନ୍ତୁ"
@@ -17928,7 +18141,6 @@ msgid "Locations"
 msgstr "ଅବସ୍ଥାନ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#, fuzzy
 #| msgid "Allows calendars to be published to the web"
 msgid "Publish calendars to the web."
 msgstr "କ୍ୟାଲେଣ୍ଡରକୁ ୱେବରେ ପ୍ରକାଶନ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"
@@ -18152,13 +18364,11 @@ msgid "I_nclude remote tests"
 msgstr "ସୂଦୂର ପରୀକ୍ଷଣକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ (_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
 #| msgid "Filters junk messages using Bogofilter."
 msgid "Filter junk messages using SpamAssassin."
 msgstr "Bogofilter ବ୍ୟବହାର କରି ଜଙ୍କ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣନ୍ତୁ।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
 #| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin Junk Filter"
 msgstr "SpamAssassin ଜଙ୍କ ପ୍ଲଗଇନ"
@@ -18248,7 +18458,6 @@ msgid "Save Selected"
 msgstr "ବଚ୍ଛିତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save a calendar or task list to disk."
 msgstr "ଚୟିତ କାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ତାଲିକାକୁ ଡିସ୍କରେ ସଂରକ୍ଷଣ କରିଥାଏ।"
@@ -18275,13 +18484,11 @@ msgid "Select destination file"
 msgstr "ଲକ୍ଷ୍ଯ ସ୍ଥଳ ଫାଇଲ ମନୋନୀତ କରନ୍ତୁ"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 #| msgid "Selects a single calendar or task source for viewing."
 msgid "Quickly select a single calendar or task list for viewing."
 msgstr "ଦେଖିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ଉତ୍ସ ବାଛନ୍ତୁ।"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#, fuzzy
 #| msgid "Select one source"
 msgid "Select One Source"
 msgstr "ଗୋଟିଏ ଉତ୍ସ ମନୋନୀତ କରନ୍ତୁ"
@@ -18315,7 +18522,6 @@ msgid "Welcome"
 msgstr "ସ୍ବାଗତମ"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
-#, fuzzy
 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"
@@ -18354,7 +18560,6 @@ msgid "Please wait"
 msgstr "ଦଯାକରି  ଅପେକ୍ଷାକର"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-#, fuzzy
 #| msgid "Thread messages by subject"
 msgid "Sort mail message threads by subject."
 msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ବିଷୟ ଅନୁସାରେ ବାନ୍ଧନ୍ତୁ"
@@ -18399,13 +18604,11 @@ msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#, fuzzy
 #| msgid "TNEF Attachment decoder"
 msgid "TNEF Decoder"
 msgstr "TNEF ସଂଲଗ୍ନ ସାଙ୍କେତିକରଣ"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#, fuzzy
 #| msgid "Multiple vCards"
 msgid "Inline vCards"
 msgstr "ଏକାଧିକ vCards"
@@ -18424,29 +18627,26 @@ msgid "Show Compact vCard"
 msgstr "ସଂକ୍ଷିପ୍ତ vCard କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
 
 #: ../plugins/vcard-inline/vcard-inline.c:218
-#, fuzzy
 #| msgid "There is one other contact."
 #| msgid_plural "There are %d other contacts."
 msgid "There is one other contact."
 msgstr "ସେଠାରେ ଅନ୍ଯ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।"
 
 #: ../plugins/vcard-inline/vcard-inline.c:227
-#, fuzzy, c-format
+#, c-format
 #| msgid "There is one other contact."
 #| msgid_plural "There are %d other contacts."
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "ସେଠାରେ ଅନ୍ଯ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।"
-msgstr[1] "ସେଠାରେ ଅନ୍ଯାନ୍ଯ %d ସମ୍ପର୍କ ଅଛନ୍ତି।"
+msgstr[0] "ସେଠାରେ %d ଟି ଅନ୍ଯାନ୍ୟ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।"
+msgstr[1] "ସେଠାରେ %d ଟି ଅନ୍ଯାନ୍ୟ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।"
 
 #: ../plugins/vcard-inline/vcard-inline.c:248
-#, fuzzy
 #| msgid "Save in address book"
 msgid "Save in Address Book"
 msgstr "ଠିକଣା ପୁସ୍ତିକାରେ ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#, fuzzy
 #| msgid "WebDAV contacts"
 msgid "Add WebDAV contacts to Evolution."
 msgstr "WebDAV ସମ୍ପର୍କ"
@@ -18517,7 +18717,7 @@ msgstr "ଇଣ୍ଟରନେଟ ଉପରେ HTTP/ସୁରକ୍ଷିତ HTTP
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr "ଏଚ୍.ଟି.ଟି.ପି. ଛାୟା ଆଧାର ନାମ"
+msgstr "HTTP ପ୍ରକ୍ସି ଆଧାର ନାମ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
@@ -18525,26 +18725,23 @@ msgstr "HTTP ପ୍ରକ୍ସି ପ୍ରବେଶ ସଂକେତ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
-msgstr "ଏଚ୍.ଟି.ଟି.ପି. ଛାୟା ସଂଯୋଗିକୀ"
+msgstr "HTTP ପ୍ରକ୍ସି ସଂଯୋଗିକୀ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
-msgstr "ଏଚ୍.ଟି.ଟି.ପି. ଛାୟା ଚାଳକନାମ"
+msgstr "HTTP ପ୍ରକ୍ସି ଚାଳକନାମ"
 
 #: ../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:14
-#, fuzzy
 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 ""
-"true କୁ ସରବର୍ ବୈଧିକରଣ ଅଟେ ଠାରୁ ନେଟୱାର୍କ config ବୈଧିକରଣ ବ୍ଯବହାରକାରୀ GConf କି ଏବଂ "
-"ଗୁପ୍ତଶବ୍ଦ ଅଟେ ଠାରୁ କିମ୍ବା କ୍ରମବିକାଶ  ଗୁପ୍ତଶବ୍ଦ ଫାଇଲ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Initial attachment view"
@@ -18603,7 +18800,6 @@ msgid "Secure HTTP proxy port"
 msgstr "ସୁରକ୍ଷିତ ଏଚ୍.ଟି.ଟି.ପି. ଛାୟା ଆଧାର ସଂଯୋଗିକୀ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
-#, fuzzy
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -18632,7 +18828,6 @@ msgid "Statusbar is visible"
 msgstr "ସ୍ଥିତିପଟିଟି ଦୃଶ୍ୟମାନ ଅଟେ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
-#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18653,7 +18848,6 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "ପାର୍ଶ୍ୱପଟିର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର, ପିକ୍ସେଲରେ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18674,7 +18868,6 @@ msgid "The machine name to proxy socks through."
 msgstr "ଏସ୍.ଓ.ସି.କେ.ଏସ୍. ଛାୟା ପାଇଁ ଯନ୍ତ୍ରର ନାମ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
-#, fuzzy
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -18683,7 +18876,6 @@ msgstr ""
 "ସଂଯୋଗିକୀ ଯାହା ମାଧ୍ଯମରେ ଆପଣ ପ୍ରକ୍ସି କରିଥାନ୍ତି।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
-#, fuzzy
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -18692,7 +18884,6 @@ msgstr ""
 "ସଂଯୋଗିକୀ ଯାହା ମାଧ୍ଯମରେ ଆପଣ ପ୍ରକ୍ସି କରିଥାନ୍ତି।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-#, fuzzy
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -18800,7 +18991,6 @@ msgid "Choose the destination for this import"
 msgstr "ଏହି ଆମଦାନୀ ପାଇଁ ଲକ୍ଷ୍ଯ ସ୍ଥଳ ବାଛନ୍ତୁ"
 
 #: ../shell/e-shell-importer.c:141
-#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18852,10 +19042,10 @@ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME ପଥପ୍ରଦର୍ଶକ ସାଧନଗୁଡ଼ିକ ଏହି ତନ୍ତ୍ରରେ ସ୍ଥାପିତ ହେବାପରି ଦୃଶ୍ୟମାନ ହେଉନାହିଁ।"
 
 #: ../shell/e-shell-window-commands.c:78
-#, fuzzy, c-format
+#, c-format
 #| msgid "Error executing %s."
 msgid "Error executing %s. (%s)"
-msgstr "%s କୁ ନିଷ୍ପାଦନ କରିବାରେ ତ୍ରୁଟି।"
+msgstr "%s କୁ ନିଷ୍ପାଦନ କରିବାରେ ତ୍ରୁଟି। (%s)"
 
 #: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy is not installed."
@@ -18997,7 +19187,7 @@ msgstr ""
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:222
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -19121,7 +19311,6 @@ msgid "Really delete old data?"
 msgstr "ପ୍ରକୃତରେ ପୁରୁଣା ତଥ୍ୟକୁ ଅପସାରଣ କରିବେ?"
 
 #: ../shell/shell.error.xml.h:10
-#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19143,7 +19332,6 @@ msgstr ""
 "ନାହିଁ।\n"
 
 #: ../shell/shell.error.xml.h:16
-#, fuzzy
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -21278,7 +21466,6 @@ msgid "Could not set as background"
 msgstr "ପୃଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
-#, fuzzy
 #| msgid "Could not open the attachment"
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -21286,16 +21473,14 @@ msgstr[0] "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହ�
 msgstr[1] "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହିଁ"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
-#, fuzzy
 #| msgid "Send To:"
 msgid "_Send To..."
-msgstr "ଏଠାକୁ ପଠାନ୍ତୁ:"
+msgstr "ଏଠାକୁ ପଠାନ୍ତୁ (_S)..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
-#, fuzzy
 #| msgid "Send selected contacts to another person"
 msgid "Send the selected attachments somewhere"
-msgstr "ପଠାଅ ଚୟିତ କୁ"
+msgstr "ବଚ୍ଛିତ ସଂଲଗ୍ନକକୁ କୌଣସି ସ୍ଥାନକୁ ପଠାନ୍ତୁ"
 
 #: ../widgets/misc/e-attachment-icon-view.c:473
 #: ../widgets/misc/e-attachment-tree-view.c:517
@@ -21339,7 +21524,7 @@ msgid "A_dd Attachment..."
 msgstr "ସଂଲଗ୍ନକ ଯୋଗ କରନ୍ତୁ (_d)..."
 
 #: ../widgets/misc/e-attachment-view.c:643
-#, fuzzy, c-format
+#, c-format
 #| msgid "Opening %s"
 msgid "Open with \"%s\""
 msgstr "\"%s\" ସହିତ ଖୋଲନ୍ତୁ"
diff --git a/po/ta.po b/po/ta.po
index 1639043ee9..b62b27ff7e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,10 +6,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:605
 # 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>, 2007, 2008, 2009.
 # I. Felix <ifelix@redhat.com>, 2009.
 # Dr.T.Vaasudevan <agnihot3@gmail.com>, 2009.
 # Dr.T.vasudevan <agnihot3@gmail.com>, 2009.
@@ -17,14 +17,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolutionta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 10:23+0530\n"
-"PO-Revision-Date: 2009-05-25 11:34+0530\n"
-"Last-Translator: Dr.T.vasudevan <agnihot3@gmail.com>\n"
+"POT-Creation-Date: 2009-06-24 11:10+0530\n"
+"PO-Revision-Date: 2009-06-24 11:20+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <Ubuntu-l10n-tam@lists.ubuntu.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"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\\n"
 "\n"
 "\n"
@@ -68,32 +68,32 @@ msgstr "தொடர்பு: "
 msgid "evolution minicard"
 msgstr "எவல்யூஷன் சிறுஅட்டை"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has alarms."
 msgstr "அது அலாரங்களை கொண்டுள்ளது."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It has recurrences."
 msgstr "இது தொடர் நிகழ்வுகளை கொண்டுள்ளது."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:274
 msgid "It is a meeting."
 msgstr "இது ஒரு சந்திப்பு."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:280
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "நாள்காட்டி நிகழ்வு: சுருக்கம் %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:282
 msgid "Calendar Event: It has no summary."
 msgstr "நாள்காட்டி நிகழ்வு: இதில் சுருக்கம் எதுவும் இல்லை."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:302
 msgid "calendar view event"
 msgstr "நாள்காட்டி பார்வை நிகழ்வு"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:530
 msgid "Grab Focus"
 msgstr "முன்னிலையை பற்றுக"
 
@@ -162,7 +162,7 @@ msgid "calendar view for one or more days"
 msgstr "ஒன்று அல்லது அதற்கு மேற்பட்ட நாட்களின் நாள்காட்டி பார்வை"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:772
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -173,7 +173,7 @@ 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:774
+#: ../calendar/gui/calendar-component.c:775
 #: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%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:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
+#: ../calendar/gui/calendar-component.c:777
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:784
 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:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
+#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:803
+#: ../calendar/gui/calendar-component.c:809
+#: ../calendar/gui/calendar-component.c:811
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -205,7 +205,7 @@ 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:800
+#: ../calendar/gui/calendar-component.c:801
 #: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
@@ -213,7 +213,7 @@ msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "க்னோம் நாள்காட்டி"
 
@@ -559,7 +559,7 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:592
+#: ../addressbook/conduit/address-conduit.c:591
 msgid "Default Sync Address:"
 msgstr "இயல்பான ஒத்திசைந்த முகவரி:"
 
@@ -595,7 +595,7 @@ msgstr "தானாக சரிபார்தல் பகுதியை இ
 #: ../addressbook/gui/component/addressbook-view.c:1213
 #: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../plugins/exchange-operations/exchange-folder.c:583
 msgid "Contacts"
 msgstr "தொடர்புகள்"
 
@@ -638,9 +638,9 @@ msgstr "இங்கே உங்கள் S/MIME சான்றிதழ்க
 #: ../calendar/gui/calendar-component.c:192
 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:203
-#: ../mail/em-folder-tree-model.c:205 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:217
+#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192
+#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
 #: ../mail/message-list.c:1517
 msgid "On This Computer"
 msgstr "இந்த கணிப்பொறியில்"
@@ -665,13 +665,13 @@ msgstr "எல்டிஏபி(LDAP) சேவகனில்"
 #: ../addressbook/gui/component/addressbook-component.c:135
 #: ../addressbook/gui/component/addressbook-component.c:138
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 #: ../calendar/gui/calendar-component.c:232
 #: ../calendar/gui/calendar-component.c:238
 #: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:959
+#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960
 #: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Personal"
 msgstr "தனிப்பட்ட"
@@ -791,7 +791,7 @@ msgstr ""
 #: ../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:95
-#: ../plugins/itip-formatter/itip-formatter.c:2543
+#: ../plugins/itip-formatter/itip-formatter.c:2565
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "பொது"
@@ -817,7 +817,7 @@ msgid "Details"
 msgstr "விவரம்"
 
 #: ../addressbook/gui/component/addressbook-config.c:1033
-#: ../mail/em-folder-browser.c:1026
+#: ../mail/em-folder-browser.c:1024
 msgid "Searching"
 msgstr "தேடுகிறது"
 
@@ -831,12 +831,12 @@ msgid "Address Book Properties"
 msgstr "முகவரி புத்தகத்தின் பண்புகள்"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110
 msgid "Migrating..."
 msgstr "இடம்பெயர்கிறது..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169
 #, c-format
 msgid "Migrating '%s':"
 msgstr "இடம்பெயர்கிறது `%s':"
@@ -917,19 +917,19 @@ msgid "Save As vCard..."
 msgstr "விகார்ட் ஆக சேமிக்கவும்..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/calendar-component.c:629
 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2106 ../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:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1616
-#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:954
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952
 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2052 ../mail/em-folder-view.c:1340
+#: ../mail/em-folder-tree.c:2103 ../mail/em-folder-view.c:1341
 #: ../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
@@ -937,9 +937,9 @@ msgid "_Delete"
 msgstr "_D நீக்கு"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/calendar-component.c:637
 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2061 ../ui/evolution-addressbook.xml.h:59
+#: ../mail/em-folder-tree.c:2112 ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "(_P)பண்புகள்"
@@ -965,7 +965,7 @@ msgstr " %s க்கு கடவுச்சொல்லை உள்ளிட
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
+#: ../plugins/google-account-setup/google-source.c:417
 #: ../plugins/publish-calendar/publish-calendar.c:208
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1123,7 +1123,9 @@ msgstr "_f வடிப்பியை தேடு: "
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
-msgstr "தேடல் வடிகட்டி என்பது தேடும்போது தேடும் பொருட்களின் வகை. இதை மாற்றாவிட்டால் முன்னிருப்பு  தேடல் \"person\" வகை (தனிமனிதன்) ஆகிவிடும்."
+msgstr ""
+"தேடல் வடிகட்டி என்பது தேடும்போது தேடும் பொருட்களின் வகை. இதை மாற்றாவிட்டால் "
+"முன்னிருப்பு  தேடல் \"person\" வகை (தனிமனிதன்) ஆகிவிடும்."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
@@ -1207,10 +1209,10 @@ msgstr "அட்டைகள்"
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 #: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:411
-#: ../plugins/calendar-http/calendar-http.c:278
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-source.c:672
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "நிமிடங்கள்"
@@ -1314,7 +1316,7 @@ msgstr "பிறந்தநாள்:(_B)"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "நாள்காட்டி:(_C)"
 
@@ -1405,9 +1407,9 @@ msgstr "அஞ்சல் குறியீடு: (_Z)"
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
+#: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "பெயர்"
 
@@ -1427,50 +1429,50 @@ msgid "Editable"
 msgstr "தொகுக்கக்கூடிய"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "AIM"
 msgstr "எய்ம்"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Jabber"
 msgstr "ஜாப்பர்"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Yahoo"
 msgstr "யாகூ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Gadu-Gadu"
 msgstr "காடு-காடு"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "MSN"
 msgstr "எம்எஸ்என்"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "ICQ"
 msgstr "ஐஸீக்யூ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "GroupWise"
 msgstr "க்ரூப்வைஸ்"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/widgets/eab-contact-display.c:613
 msgid "Skype"
 msgstr "ஸ்கைபி"
 
 #. red
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:958
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../mail/em-migrate.c:959
 msgid "Work"
 msgstr "வேலை"
 
@@ -1672,7 +1674,7 @@ msgstr "தொடர்பு பட்டியல் தொகுப்பி"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:213
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:816
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "தேர்ந்தெடு..."
@@ -1761,11 +1763,11 @@ 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: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:414 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:872
+#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "மின்னஞ்சல் முகவரி"
 
@@ -1831,7 +1833,7 @@ msgstr "மூலம்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:567
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:554
@@ -1844,8 +1846,8 @@ msgid "Save as vCard..."
 msgstr "விகார்ட் என சேமி..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "(_O)திற"
@@ -1899,9 +1901,9 @@ msgid "Cu_t"
 msgstr "(_t)வெட்டு"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1602
-#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:945
-#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1325
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943
+#: ../mail/em-folder-tree.c:973 ../mail/em-folder-view.c:1326
 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
@@ -1926,7 +1928,7 @@ msgid "Unmatched"
 msgstr "பொருந்தவில்லை"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Assistant"
 msgstr "உதவியாள்"
 
@@ -1964,7 +1966,7 @@ msgid "Categories"
 msgstr "வகைகள்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Company"
 msgstr "நிறுவனம்"
 
@@ -2013,22 +2015,22 @@ msgid "Journal"
 msgstr "இதழ்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Manager"
 msgstr "மேலாளர்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Mobile Phone"
 msgstr "மொபைல் தொலைபேசி"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Nickname"
 msgstr "புனைபெயர்"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Note"
 msgstr "குறிப்பு"
 
@@ -2057,14 +2059,14 @@ msgid "Radio"
 msgstr "வானொலி"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:579
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
 msgid "Role"
 msgstr "பங்கு"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Spouse"
 msgstr "மனைவி"
 
@@ -2096,7 +2098,7 @@ 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-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
 #: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424
 #: ../widgets/table/e-table-click-to-add.c:522
 #: ../widgets/table/e-table-col.c:98
@@ -2111,7 +2113,7 @@ 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-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
 #: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432
 #: ../widgets/table/e-table-click-to-add.c:529
 #: ../widgets/table/e-table-group-container.c:989
@@ -2236,7 +2238,7 @@ msgid "_Open Link in Browser"
 msgstr "(_O)இணைப்பை உலாவியில் திற"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2733
+#: ../mail/em-folder-view.c:2698
 msgid "_Copy Link Location"
 msgstr "(_C)இணைப்பை நகலெடு"
 
@@ -2262,30 +2264,30 @@ msgid "map"
 msgstr "வரைபடம்"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:839
 msgid "List Members"
 msgstr "உறுப்பினர்களின் பட்டியல்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Department"
 msgstr "துறை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Profession"
 msgstr "பணி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Position"
 msgstr "நிலை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
 msgid "Video Chat"
 msgstr "வீடியோ அரட்டை"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2523
+#: ../calendar/gui/gnome-cal.c:2535
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -2297,53 +2299,53 @@ msgstr "வீடியோ அரட்டை"
 msgid "Calendar"
 msgstr "நாள்காட்டி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ஓய்வு/பணியில்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Phone"
 msgstr "தொலைபேசி எண்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Fax"
 msgstr "தொலை நகலி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Address"
 msgstr "முகவரி"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Home Page"
 msgstr "முதன்மை பக்கம்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Web Log"
 msgstr "இணைய பதிவு"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 #: ../calendar/gui/e-calendar-view.c:2587
 msgid "Birthday"
 msgstr "பிறந்தநாள்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 #: ../calendar/gui/e-calendar-view.c:2588
 msgid "Anniversary"
 msgstr "ஆண்டு விழாநாள்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:857
 msgid "Job Title"
 msgstr "வேலையின் தலைப்பு"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:893
 msgid "Home page"
 msgstr "வீட்டுப்பக்கம்"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:901
 msgid "Blog"
 msgstr "வலைப்பூ"
 
@@ -2401,8 +2403,8 @@ msgstr "விதிமுறைக்கு ஆதரவு இல்லை"
 #: ../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:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571
 msgid "Canceled"
 msgstr "ரத்து செய்யப்பட்டது"
 
@@ -2663,8 +2665,8 @@ msgstr "அட்டை காட்சி"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "ஏற்றுகிறது...."
 
@@ -2708,8 +2710,8 @@ msgstr "விகார்ட் (.vcf, .gcrd)"
 msgid "Evolution vCard Importer"
 msgstr "எவல்யூஷன் விகார்ட் ஏற்றி"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:690
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "கோப்பை திறக்க முடியவில்லை"
@@ -3187,27 +3189,27 @@ msgstr "{0}."
 msgid "Split Multi-Day Events:"
 msgstr "பல நாட்களுக்கான நிகழ்வுகளை பிரி"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
 #: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/memo/memo-conduit.c:809
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
 #: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/memo/memo-conduit.c:811
 #: ../calendar/conduits/todo/todo-conduit.c:1009
+#: ../calendar/conduits/todo/todo-conduit.c:1010
 msgid "Could not start evolution-data-server"
 msgstr "எவல்யூஷன் தகவல் சேவகனை திறக்க முடியவில்லை"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1622
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr "பைலட் நாள்காட்டியை படிக்க முடியவில்லை"
 
-#: ../calendar/conduits/memo/memo-conduit.c:903
-#: ../calendar/conduits/memo/memo-conduit.c:906
+#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:907
 msgid "Could not read pilot's Memo application block"
 msgstr "பைலட் குறிப்பு செயல்பாடு தொகுதி ஐ படிக்க இயலவில்லை."
 
-#: ../calendar/conduits/memo/memo-conduit.c:950
-#: ../calendar/conduits/memo/memo-conduit.c:953
+#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:954
 msgid "Could not write pilot's Memo application block"
 msgstr "பைலட் குறிப்பு செயல்பாடு தொகுதி இல் எழுத இயலவில்லை."
 
@@ -3215,24 +3217,24 @@ msgstr "பைலட் குறிப்பு செயல்பாடு த
 msgid "Default Priority:"
 msgstr "இயல்பான முன்னிரிமை:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1092
-#: ../calendar/conduits/todo/todo-conduit.c:1095
+#: ../calendar/conduits/todo/todo-conduit.c:1093
+#: ../calendar/conduits/todo/todo-conduit.c:1096
 msgid "Could not read pilot's ToDo application block"
 msgstr "பைலட் செய்யவேண்டிய பயன்பாட்டு வேலையை படிக்க முடியவில்லை"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1137
-#: ../calendar/conduits/todo/todo-conduit.c:1140
+#: ../calendar/conduits/todo/todo-conduit.c:1138
+#: ../calendar/conduits/todo/todo-conduit.c:1141
 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:2534
+#: ../plugins/itip-formatter/itip-formatter.c:2556
 msgid "Calendar and Tasks"
 msgstr "நாள்காட்டி மற்றும் பணிகள்"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1241
+#: ../calendar/gui/calendar-component.c:820
+#: ../calendar/gui/calendar-component.c:1242
 msgid "Calendars"
 msgstr "நாள்காட்டிகள்"
 
@@ -3273,22 +3275,22 @@ msgid "Memo_s"
 msgstr "குறிப்புகள் (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1132
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566
+#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132
+#: ../calendar/gui/gnome-cal.c:1830 ../calendar/gui/memos-component.c:566
 #: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389
 #: ../calendar/gui/memos-control.c:405
 msgid "Memos"
 msgstr "குறிப்புகள்"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1436
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436
+#: ../calendar/gui/gnome-cal.c:1698 ../calendar/gui/print.c:1991
 #: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880
 #: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
+#: ../calendar/importers/icalendar-importer.c:751
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/exchange-operations/exchange-folder.c:590
 #: ../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
@@ -3318,10 +3320,10 @@ msgstr[1] "நிமிடங்கள்"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:22
-#: ../plugins/caldav/caldav-source.c:412
-#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-source.c:673
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
@@ -3343,10 +3345,10 @@ msgstr "(_A) அனைத்தையும் பணி நீக்கம் �
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 #: ../calendar/gui/e-itip-control.c:1165
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1024
 msgid "Location:"
 msgstr "இடம்:"
 
@@ -3359,7 +3361,7 @@ msgid "_Dismiss"
 msgstr "(_D) பணிநீக்கு"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1019
+#: ../calendar/gui/dialogs/comp-editor.c:1029
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -3379,32 +3381,32 @@ msgstr "தூங்கு (_S)"
 msgid "location of appointment"
 msgstr "சந்திப்பு ஏற்பாடு இடம்"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
 msgid "No summary available."
 msgstr "சுருக்கம் இல்லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No description available."
 msgstr "விளக்கம் இல்லை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No location information available."
 msgstr "இட விவரம் இல்லை."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1527
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
 #, c-format
 msgid "You have %d alarms"
 msgstr "உங்களிடம் %d அலாரங்கள் உள்ளன"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3416,7 +3418,7 @@ msgstr ""
 "அனுப்பும் வசதி அமைக்கப்பட்டுள்ளது, எவல்யூஷன் \n"
 "சாதாரண நினைவூட்டல் உரையாடல் பெட்டியை காட்டும்."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3432,7 +3434,7 @@ msgstr ""
 "\n"
 "இந்த நிரலை இயக்க விருப்பமா?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
 msgid "Do not ask me about this program again."
 msgstr "இந்த நிரல் பற்றி இனி என்னிடம் கேட்க வேண்டாம்."
 
@@ -4026,10 +4028,10 @@ msgid "Purge events older than"
 msgstr "நீக்க வேண்டிய பழைய நிகழ்வுகள்"
 
 #: ../calendar/gui/calendar-commands.c:326
-#: ../plugins/caldav/caldav-source.c:413
-#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-source.c:674
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -4054,92 +4056,92 @@ msgstr "வானிலை"
 msgid "Birthdays & Anniversaries"
 msgstr "பிறந்த நாள் & ஆண்டு துவக்க நாள்"
 
-#: ../calendar/gui/calendar-component.c:626
+#: ../calendar/gui/calendar-component.c:627
 msgid "_New Calendar"
 msgstr "புதிய நாள்காட்டி (_N)"
 
-#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/calendar-component.c:628
 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2098
 msgid "_Copy..."
 msgstr "(_C)நகல்..."
 
-#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/calendar-component.c:633
 #: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477
 msgid "_Make available for offline use"
 msgstr "இணைப்பில்லாத போது பயனுக்கு என  அமை (_M)"
 
-#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/calendar-component.c:634
 #: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478
 msgid "_Do not make available for offline use"
 msgstr "(_D) இணைப்பில்லாத போது பயனுக்கு என  அமைக்க வேண்டாம்"
 
-#: ../calendar/gui/calendar-component.c:963
+#: ../calendar/gui/calendar-component.c:964
 msgid "Failed upgrading calendars."
 msgstr "நாள்காட்டியை புதுப்பிக்க முடியாது"
 
-#: ../calendar/gui/calendar-component.c:1092
+#: ../calendar/gui/calendar-component.c:1093
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "புதிய நிகழ்வுகள் மற்றும் கூட்டத்தை உருவாக்க '%s' நாள்காட்டியை திறக்க முடியவில்லை"
 
-#: ../calendar/gui/calendar-component.c:1108
+#: ../calendar/gui/calendar-component.c:1109
 msgid "There is no calendar available for creating events and meetings"
 msgstr "நிகவுகள் மற்றும் கூட்டத்தை உருவாக்க இதில் நாள்காட்டி எதுவும் இல்லை"
 
-#: ../calendar/gui/calendar-component.c:1221
+#: ../calendar/gui/calendar-component.c:1222
 msgid "Calendar Source Selector"
 msgstr "நாள்காட்டி மூல தேர்வாளர்"
 
-#: ../calendar/gui/calendar-component.c:1437
+#: ../calendar/gui/calendar-component.c:1438
 msgid "New appointment"
 msgstr "புதிய சந்திப்பு ஏற்பாடு"
 
-#: ../calendar/gui/calendar-component.c:1438
+#: ../calendar/gui/calendar-component.c:1439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "(_A) சந்திப்பு ஏற்பாடு "
 
-#: ../calendar/gui/calendar-component.c:1439
+#: ../calendar/gui/calendar-component.c:1440
 msgid "Create a new appointment"
 msgstr "புதிய சந்திப்பை உருவாக்கு"
 
-#: ../calendar/gui/calendar-component.c:1445
+#: ../calendar/gui/calendar-component.c:1446
 msgid "New meeting"
 msgstr "புதிய கூட்டம்"
 
-#: ../calendar/gui/calendar-component.c:1446
+#: ../calendar/gui/calendar-component.c:1447
 msgctxt "New"
 msgid "M_eeting"
 msgstr "(_M)கூட்டம்"
 
-#: ../calendar/gui/calendar-component.c:1447
+#: ../calendar/gui/calendar-component.c:1448
 msgid "Create a new meeting request"
 msgstr "புதிய கூட்டத்தை உருவாக்க கோரிக்கை"
 
-#: ../calendar/gui/calendar-component.c:1453
+#: ../calendar/gui/calendar-component.c:1454
 msgid "New all day appointment"
 msgstr "முழுநாட்களுக்குமான புதிய சந்திப்பு "
 
-#: ../calendar/gui/calendar-component.c:1454
+#: ../calendar/gui/calendar-component.c:1455
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "(_p) முழு நாளுக்குமான சந்திப்பு "
 
-#: ../calendar/gui/calendar-component.c:1455
+#: ../calendar/gui/calendar-component.c:1456
 msgid "Create a new all-day appointment"
 msgstr "முழு நாளுக்குமான சந்திப்பை உருவாக்கு"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1462
 msgid "New calendar"
 msgstr "புதிய நாள்காட்டி"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "(_N)நாள்காட்டி"
 
-#: ../calendar/gui/calendar-component.c:1463
+#: ../calendar/gui/calendar-component.c:1464
 msgid "Create a new calendar"
 msgstr "புதிய நாள்காட்டியை உருவாக்கு"
 
@@ -4185,7 +4187,7 @@ msgid "Classification"
 msgstr "வகைப்படுத்துதல்"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Confidential"
@@ -4227,14 +4229,14 @@ msgid "Organizer"
 msgstr "ஒருங்கிணைப்பாளர்"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "தனிப்பட்ட"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
 #: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "பொதுவான"
 
@@ -4440,15 +4442,15 @@ msgstr "கோப்பு(களை) இணை"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/event-page.c:2968
 #: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-day-view-time-item.c:789
 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:704 ../mail/em-account-editor.c:1432
+#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434
 #: ../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:395
 #: ../plugins/exchange-operations/exchange-delegates-user.c:181
-#: ../plugins/itip-formatter/itip-formatter.c:2190
+#: ../plugins/itip-formatter/itip-formatter.c:2212
 #: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510
 #: ../widgets/misc/e-dateedit.c:1726
 #: ../widgets/misc/e-signature-combo-box.c:74
@@ -4834,230 +4836,233 @@ msgstr "%s நீங்கள் மாற்றம் எதுவும் ச
 msgid "Validation error: %s"
 msgstr "சரிபார்க்கும் போது பிழை: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372
 msgid " to "
 msgstr "பெறுநர்"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376
 msgid " (Completed "
 msgstr "(முடிந்தது"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378
 msgid "Completed "
 msgstr "முடிந்தது"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383
 msgid " (Due "
 msgstr "(நிலுவையில்"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385
 msgid "Due "
 msgstr "நிலுவையில்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:245
-#: ../calendar/gui/dialogs/comp-editor.c:2676 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-msgid "attachment"
-msgstr "இணைப்பு"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "இணைப்புகளை சேமிக்க முடியவில்லை "
 
-#: ../calendar/gui/dialogs/comp-editor.c:474
+#: ../calendar/gui/dialogs/comp-editor.c:484
 msgid "Could not update object"
 msgstr "பொருளை திருத்த முடியவில்லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:563
+#: ../calendar/gui/dialogs/comp-editor.c:573
 msgid "Edit Appointment"
 msgstr "சந்திப்பை மாற்று"
 
-#: ../calendar/gui/dialogs/comp-editor.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:580
 #, c-format
 msgid "Meeting - %s"
 msgstr "சந்திப்பு - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:582
 #, c-format
 msgid "Appointment - %s"
 msgstr "சந்திப்பு  - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:578
+#: ../calendar/gui/dialogs/comp-editor.c:588
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ஒதுக்கப்பட்ட பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:590
 #, c-format
 msgid "Task - %s"
 msgstr "பணி - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:585
+#: ../calendar/gui/dialogs/comp-editor.c:595
 #, c-format
 msgid "Memo - %s"
 msgstr "குறிப்புகள் - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:601
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "No Summary"
 msgstr "சுருக்கம் இல்லை"
 
-#: ../calendar/gui/dialogs/comp-editor.c:743
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "Keep original item?"
 msgstr "உண்மையான உருப்படியை வைத்துக்கொள்ளலாமா?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
+#: ../calendar/gui/dialogs/comp-editor.c:959
 msgid "Click here to close the current window"
 msgstr "நடப்பு சாளரத்தை மூட இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Copy selected text to the clipboard"
 msgstr "தேர்வு செய்த உரையை தற்காலிக நினைவிடத்தில் நகலெடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:963
+#: ../calendar/gui/dialogs/comp-editor.c:973
 msgid "Cut selected text to the clipboard"
 msgstr "தேர்வு செய்த உரையை ஒட்டுப்பலகத்தில் படியெடு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:970
+#: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Click here to view help available"
 msgstr "உதவியை பெற இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:987
 msgid "Paste text from the clipboard"
 msgstr "தற்காலிக நினைவிடத்தில் உள்ள உரையை ஒட்டு"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "Click here to save the current window"
 msgstr "நடப்பு சாளரத்தை சேமிக்க இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 msgid "Select all text"
 msgstr "எல்லா உரையையும் தேர்வுசெய்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012
+#: ../calendar/gui/dialogs/comp-editor.c:1022
 msgid "_Classification"
 msgstr "பிரிவுகள் (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 #: ../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:1033
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 #: ../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:1040
+#: ../calendar/gui/dialogs/comp-editor.c:1050
 msgid "_Insert"
 msgstr "நுழை (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1047
+#: ../calendar/gui/dialogs/comp-editor.c:1057
 msgid "_Options"
 msgstr "விருப்பங்கள் (_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2090
 #: ../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:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1074
 #: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "(_A)இணைப்பு...."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "Click here to attach a file"
 msgstr "ஒரு கோப்பினை இணைக்க இங்கு சொடுக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "_Categories"
 msgstr "(_C)வகைகள்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "Toggles whether to display categories"
 msgstr "வகைகள் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Time _Zone"
 msgstr "நேரம் மண்டலம்: (_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1094
 msgid "Toggles whether the time zone is displayed"
 msgstr "நேர மண்டலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Pu_blic"
 msgstr "பொது (_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as public"
 msgstr "பொது என வகைப்படுத்து"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "_Private"
 msgstr "தனிப்பட்ட (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Classify as private"
 msgstr "தனிபட்டது என வகைப்படுத்து"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Confidential"
 msgstr "இரகசியமானது (_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Classify as confidential"
 msgstr "இரகசியமானதாக வகைப்படுத்துக"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "R_ole Field"
 msgstr "பங்கு புலம் (_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the Role field is displayed"
 msgstr "பங்கு புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "தயைசெய்க,பதில்தருக  புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Status Field"
 msgstr "நிலை புலம் (_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Toggles whether the Status field is displayed"
 msgstr "நிலை புலம் காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "_Type Field"
 msgstr "வகை புலம் (_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "கலந்துகொள்பவர்கள் வகை காட்டப்படுமா என்பதை மாற்றுகிறது."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1167
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "(_D) அண்மை ஆவணங்கள்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1593
+#: ../calendar/gui/dialogs/comp-editor.c:1603
 #: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "இணைக்கவும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1905
-#: ../calendar/gui/dialogs/comp-editor.c:2707
+#: ../calendar/gui/dialogs/comp-editor.c:1866
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2765
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "இந்த உருப்படியில் செய்த மாற்றங்கள் புதிப்பிக்கும் போது நீக்கப்படும்"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2736
+#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "இணைப்பு"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2794
 msgid "Unable to use current version!"
 msgstr "தற்போதைய பதிப்பை பயன்படுத்துவதற்காக மேம்படுத்தவும்"
 
@@ -5156,7 +5161,7 @@ msgstr "இந்த நிகழ்வை சுருள் நிகழ்வ
 
 #: ../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
+#: ../plugins/groupwise-features/send-options.c:213
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "அனுப்பு விருப்பங்கள்"
@@ -5359,7 +5364,7 @@ msgstr "காலம்: (_T)"
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
@@ -5377,7 +5382,7 @@ msgstr ""
 "க்கு\n"
 "வரை"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492
 msgid "Memo"
 msgstr "குறிப்பு"
 
@@ -5388,7 +5393,7 @@ msgstr "'%s'. இல் குறிப்புகளை திறக்க ம
 
 #: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
 #: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "பெறுநர்"
@@ -5411,7 +5416,8 @@ msgstr "(_G)குழு:"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "நீங்கள் மீண்டும் காட்டிய நிகழ்வில் மாற்றம் செய்கிறீர்கள். என்ன மாற்றம் செய்ய விரும்புகிறீர்கள்?"
+msgstr ""
+"நீங்கள் மீண்டும் காட்டிய நிகழ்வில் மாற்றம் செய்கிறீர்கள். என்ன மாற்றம் செய்ய விரும்புகிறீர்கள்?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
@@ -5836,7 +5842,7 @@ msgid "I_mport to Tasks"
 msgstr "பணிகளுக்கு இறக்குமதி செய் (_m)"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3249
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214
 #, c-format
 msgid "Click to open %s"
 msgstr "%s திறக்க க்ளிக் செய்யவும்"
@@ -5879,7 +5885,7 @@ msgstr "நிலுவை தேதி:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1179
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Status:"
 msgstr "நிலை:"
 
@@ -5887,8 +5893,8 @@ msgstr "நிலை:"
 #: ../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:662 ../calendar/gui/print.c:2558
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565
 msgid "In Progress"
 msgstr "நடந்துகொண்டிருக்கிறது"
 
@@ -5897,10 +5903,10 @@ msgstr "நடந்துகொண்டிருக்கிறது"
 #: ../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:663 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939
 #: ../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
+#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "முடிவுற்றது"
@@ -5908,8 +5914,8 @@ msgstr "முடிவுற்றது"
 #: ../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:661 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "துவங்கவில்லை"
@@ -5919,19 +5925,19 @@ msgid "Priority:"
 msgstr "முன்னுரிமை:"
 
 #: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1065
 msgid "High"
 msgstr "அதிக"
 
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "இயல்பாக"
 
 #: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "குறைவாக"
@@ -5959,12 +5965,12 @@ msgid "Start Date"
 msgstr "துவக்க தேதி"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:638
 msgid "Free"
 msgstr "வேலையில் இல்லை்"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/e-calendar-table.c:639
 #: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Busy"
 msgstr "வேலையில்"
@@ -5980,7 +5986,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../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
@@ -5988,7 +5994,7 @@ msgid "Yes"
 msgstr "ஆம்"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
@@ -5997,13 +6003,13 @@ msgstr "இல்லை"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../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:1342
-#: ../plugins/itip-formatter/itip-formatter.c:448
-#: ../plugins/itip-formatter/itip-formatter.c:2215
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2237
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
@@ -6017,12 +6023,12 @@ msgstr "மீண்டும்நடக்கிறது"
 msgid "Assigned"
 msgstr "ஒதுக்கப்பட்ட"
 
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* சுருக்கம் இல்லை *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
+#: ../calendar/gui/e-calendar-table.c:370
 #: ../calendar/gui/e-calendar-view.c:2436
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -6030,149 +6036,149 @@ 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:375
+#: ../calendar/gui/e-calendar-table.c:373
 #: ../calendar/gui/e-calendar-view.c:2440
 #, c-format
 msgid "Organizer: %s"
 msgstr "ஒருங்கிணைப்பாளர்: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "துவக்கு:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "Due: "
 msgstr "நிலுவை:"
 
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "குறிப்பில்லா"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:898
+#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450
 msgid "Deleting selected objects"
 msgstr "தேர்வு செய்யப்பட்ட பொருள் நீக்கப்படுகிறது"
 
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655
 msgid "Updating objects"
 msgstr "பொருள் புதுப்பிக்கப்படுகிறது"
 
-#: ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:833
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "எனச்சேமி..."
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1589
 #: ../calendar/gui/e-calendar-view.c:1794
 msgid "New _Task"
 msgstr "புதிய பணி (_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1595 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936
 msgid "Open _Web Page"
 msgstr "(_W)இணைய பக்கத்தை திற"
 
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "(_S)எனச்சேமி..."
 
-#: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938
 msgid "P_rint..."
 msgstr "(_r)அச்சடி..."
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942
 #: ../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:1603
+#: ../calendar/gui/e-calendar-table.c:1601
 #: ../calendar/gui/e-calendar-view.c:1800
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
 #: ../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:1607 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "(_A)பணியை ஒதுக்கு"
 
-#: ../calendar/gui/e-calendar-table.c:1608 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "(_F)ஐ நாள்காட்டியாக அனுப்பு"
 
-#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark as Complete"
 msgstr "(_M)முடிவுற்றது என குறி"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark Selected Tasks as Complete"
 msgstr "(_M)தேர்வு செய்யப்பட்ட பணி முடிந்தது என குறி"
 
-#: ../calendar/gui/e-calendar-table.c:1611
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark as Incomplete"
 msgstr "முடிவுறாதது என குறிக்கவும் (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1612
+#: ../calendar/gui/e-calendar-table.c:1610
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "தேர்வு செய்யப்பட்ட பணி முடியாதது என குறிக்கவும் (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1617
+#: ../calendar/gui/e-calendar-table.c:1615
 msgid "_Delete Selected Tasks"
 msgstr "தேர்ந்தெடுக்கப்பட்ட பணியை அழிக்கவும் (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1854
+#: ../calendar/gui/e-calendar-table.c:1852
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ஒரு பணியை சேர்க்க சொடுக்கவும்"
@@ -6208,7 +6214,7 @@ msgstr "துவக்க தேதி"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-list-view.c:604
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -6277,7 +6283,7 @@ msgid "_Reply"
 msgstr "பதில் (_R)"
 
 #: ../calendar/gui/e-calendar-view.c:1829
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
 #: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "(_A) அனைவருக்கும் பதிலளி "
@@ -6296,31 +6302,31 @@ msgstr "(_A)எல்லா மறுநிகழ்வுகளையும்
 
 #: ../calendar/gui/e-calendar-view.c:2291
 #: ../calendar/gui/e-itip-control.c:1184
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2203
+#: ../plugins/itip-formatter/itip-formatter.c:2225
 msgid "Accepted"
 msgstr "ஏற்கப்பட்டது"
 
 #: ../calendar/gui/e-calendar-view.c:2292
 #: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2209
+#: ../plugins/itip-formatter/itip-formatter.c:2231
 msgid "Declined"
 msgstr "நிராகரிக்கப்பட்டது"
 
 #: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Tentative"
 msgstr "தோராயமாக"
 
 #: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2212
+#: ../plugins/itip-formatter/itip-formatter.c:2234
 msgid "Delegated"
 msgstr "விருந்தினராக"
 
@@ -6329,7 +6335,7 @@ msgid "Needs action"
 msgstr "செயல் தேவை"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524
 #, c-format
 msgid "Location: %s"
 msgstr "இடம்: %s"
@@ -6363,12 +6369,12 @@ 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:750
+#: ../calendar/gui/e-day-view-time-item.c:751
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i நிமிட பகுப்புகள்"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:772
 msgid "Show the second time zone"
 msgstr "இரண்டாம் நிலை மண்டலத்தை காட்டு"
 
@@ -6379,19 +6385,19 @@ msgstr "இரண்டாம் நிலை மண்டலத்தை கா
 #. 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:1581
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681
 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:804 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "முப"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "பிப"
 
@@ -6510,7 +6516,7 @@ msgid ""
 msgstr "<br> இந்த தகவலை பார்த்த பிறகு அதற்காக செயலை கீழுள்ள மெனுவிலிருந்து தேர்வு செய்யவும்"
 
 #: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2206
+#: ../plugins/itip-formatter/itip-formatter.c:2228
 msgid "Tentatively Accepted"
 msgstr "ஏற்கப்படலாம்"
 
@@ -6726,7 +6732,7 @@ msgid "Attendee status updated\n"
 msgstr "பங்கேற்பாளர் நிலை புதுப்பிக்கபட்டது\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:1383
+#: ../plugins/itip-formatter/itip-formatter.c:1387
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "பங்கேற்பாளர் நிலை புதுப்பிக்கப்படாதற்கு காரணம் இவர் பட்டியலில் இல்லை"
 
@@ -6744,7 +6750,7 @@ msgstr "செயலை தேர்வு செய்:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2316
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-list-view.c:592
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "தயைசெய்க,பதில்தருக "
@@ -6827,66 +6833,66 @@ msgstr "மற்ற பங்கேற்பாளர்கள் "
 msgid "Resources"
 msgstr "மூலங்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "கலந்துகொள்பவர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../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:739 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "தனிநபர்"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:164
 #: ../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/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "குழு"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "மூலங்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "அறை"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "நடுவர்"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:178
 #: ../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:742 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "தேவையான பங்கேற்பாளர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "பங்கேற்பாளர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "பங்கேற்காதவர்கள்"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
 #: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "செயல் தேவை"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:547
 msgid "Attendee                          "
 msgstr "கலந்து கொள்பவர்கள்                          "
 
@@ -7004,11 +7010,11 @@ msgstr "மொழி"
 msgid "Member"
 msgstr "உறுப்பினர்"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:953
 msgid "_Delete Selected Memos"
 msgstr "தேர்ந்தெடுத்த குறிப்பினை அழி (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ஒரு குறிப்பினை சேர்க்க சொடுக்கவும்"
 
@@ -7058,43 +7064,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:1659
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2660
 msgid "_Custom View"
 msgstr "தனிபயன் காட்சி (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2661
 msgid "_Save Custom View"
 msgstr "தனிப்பயன் காட்சியை சேமி (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2666
 msgid "_Define Views..."
 msgstr "காட்சிகளை குறிப்பிடு... (_D)"
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2903
 #, c-format
 msgid "Loading appointments at %s"
 msgstr " %s இல் சந்திப்பு ஐ ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2918
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s இல் வேலையை ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2927
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ல் குறிப்புகளை ஏற்றுகிறது"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3039
 #, c-format
 msgid "Opening %s"
 msgstr "%sஐ திறக்கிறது"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4007
 msgid "Purging"
 msgstr "தூய்மை படுத்துகிறது"
 
@@ -7496,78 +7502,77 @@ msgstr "30வது"
 msgid "31st"
 msgstr "31வது"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "ஞா"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "தி"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "செ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "பு"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "வி"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "வெ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "ச"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2488
 msgid "Appointment"
 msgstr "சந்திப்பு ஏற்பாடு"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2490
 msgid "Task"
 msgstr "பணி"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2515
 #, c-format
 msgid "Summary: %s"
 msgstr "சுருக்கம்: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2538
 msgid "Attendees: "
 msgstr "கலந்துகொள்பவர்கள்:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Status: %s"
 msgstr "நிலை : %s"
 
-#: ../calendar/gui/print.c:2587
+#: ../calendar/gui/print.c:2592
 #, c-format
 msgid "Priority: %s"
 msgstr "முன்னுரிமை: %s"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2607
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "முடிந்த விகிதம் : %i"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2619
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2632
 #, c-format
 msgid "Categories: %s"
 msgstr "வகைகள்: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2643
 msgid "Contacts: "
 msgstr "தொடர்புகள்:"
 
@@ -7650,7 +7655,7 @@ msgstr ""
 "\n"
 "பணிகளை அழிக்க விரும்புகிறீர்களா?"
 
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127
 msgid "Do not ask me again."
 msgstr "என்னிடம் மீண்டும் கேட்காதே"
 
@@ -7683,37 +7688,37 @@ msgstr "விட சிறிய"
 msgid "Appointments and Meetings"
 msgstr "சந்திப்புகள் மற்றும் கூட்டங்கள்"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1727
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Opening calendar"
 msgstr "நாள்காட்டியை திறக்கிறது"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "ஐ நாள்காட்டி கோப்புகள் (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "எவல்யூஷன் ஐ நாள்காட்டி ஏற்றி"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "நினைவில்கொள்!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "வி நாள்காட்டி கோப்புகள் (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "எவல்யூஷன் வி நாள்காட்டி ஏற்றி"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "நாள்காட்டி நிகழ்வுகள்"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "எவல்யூஷன் நாள்காட்டி ஏற்றி"
 
@@ -9292,7 +9297,7 @@ msgstr "(_C)மூடு"
 msgid "Close the current file"
 msgstr "தற்போதைய கோப்பை தேர்வு செய்யவும்"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -9325,7 +9330,7 @@ msgstr "(_D) வரைவாக சேமி"
 msgid "Save as draft"
 msgstr "வரைவாக சேமி"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "_அனுப்புக"
 
@@ -9437,6 +9442,14 @@ msgstr "பதிலளி நர் புலம் காட்டப்பட
 msgid "Save Draft"
 msgstr "வரைவை சேமி"
 
+#: ../composer/e-composer-header.c:117
+msgid "Show"
+msgstr "காட்டு"
+
+#: ../composer/e-composer-header.c:120
+msgid "Hide"
+msgstr "மறை"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "அனுப்புவதற்கான செய்தியை உள்ளிடவும்"
@@ -9459,35 +9472,35 @@ msgstr "அனுப்புநர்: (_o)"
 msgid "_Reply-To:"
 msgstr "பதில் : (_R)"
 
-#: ../composer/e-composer-header-table.c:940
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "பெறுநர்: (_T)"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "நகல்: (_C)"
 
-#: ../composer/e-composer-header-table.c:945
-msgid "Show CC"
-msgstr "கரிநகலை காட்டுதல்"
+#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "நகல்"
 
-#: ../composer/e-composer-header-table.c:950
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "மறைநகல்: (_B)"
 
-#: ../composer/e-composer-header-table.c:950
-msgid "Show BCC"
-msgstr "மறை நகலை காட்டுக"
+#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "மறை நகல்"
 
-#: ../composer/e-composer-header-table.c:955
+#: ../composer/e-composer-header-table.c:958
 msgid "_Post To:"
 msgstr "சமர்பி: (_P)"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "பொருள்: (_u)"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "கையொப்பம்: (_g)"
 
@@ -9507,14 +9520,10 @@ msgstr "செய்தியை சமர்பிப்பதற்கான �
 msgid "Click here to select folders to post to"
 msgstr "சமர்ப்பிக்க வேண்டிய அடைவை தேர்வு செய்ய இங்கே க்ளிக் செய்யவும்"
 
-#: ../composer/e-composer-private.c:169
+#: ../composer/e-composer-private.c:203
 msgid "Save draft"
 msgstr "வரைவை சேமி"
 
-#: ../composer/e-composer-private.c:186
-msgid "Add attachment"
-msgstr "இணைப்பினை சேர்... (_A)"
-
 #: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "வெளி செல்லிம் செய்திகளை கையொப்பமிட முடியாது. இந்த கணக்கிற்கென சான்றிதழ் எதுவும் இல்லை"
@@ -9724,7 +9733,7 @@ msgid "Evolution Query"
 msgstr "எவல்யூஷன் கேள்வி"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "உள்ளார்ந்த பிழை, தெரியாத பிழை '%s' கோரப்பட்டது"
@@ -9853,47 +9862,47 @@ msgstr "தொடுப்பை  திறக்க முடியவில்
 msgid "Could not display help for Evolution."
 msgstr "எவலூஷனுக்கு உதவியை காட்ட முடியவில்லை."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "முக்கியமானது (_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "வேலை (_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "தனிப்பட்ட (_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "செய்ய வேண்டியவை (_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "பிறகு (_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:321
 msgid "Label _Name:"
 msgstr "(_N)  குறியீட்டின் பெயர்:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Edit Label"
 msgstr "குறியீட்டை திருத்துக"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:344
 msgid "Add Label"
 msgstr "குறியீட்டை சேர்க்க"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:363
 msgid "Label name cannot be empty."
 msgstr "விளக்கச்சீட்டு பெயர் வெற்றாக இருக்கலாகாது"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:368
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -9901,128 +9910,128 @@ msgstr ""
 "அதே குறி கொண்ட விளக்கச்சீட்டு ஏற்கெனவே சேவையகத்தில் உள்ளது. தயவு செய்து விளக்கச்சீட்டு "
 "பெயரை மாற்றவும்."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "ஜிகான்ஃப் பிழை: %s"
 
-#: ../e-util/gconf-bridge.c:1232
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "இனி வரும் பிழைகளை முனையத்தில் மட்டுமே காட்டப்படும்"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 வினாடிக்கு முன்"
 msgstr[1] "%d வினாடிகளுக்கு முன்"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வினாடியில்"
 msgstr[1] "எதிர்காலத்தில் %d வினாடிகளில்"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 நிமிடத்திற்கு முன்"
 msgstr[1] "%d நிமிடங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு நிமிடத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d நிமிடங்களில்"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 மணி நேரத்திற்கு முன்"
 msgstr[1] "%d மணிகள் நேரத்திற்கு முன்"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு மணியில்"
 msgstr[1] "எதிர்காலத்தில் %d மணிகளில்"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 நாளைக்கு முன்"
 msgstr[1] "%d நாட்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு நாளில்"
 msgstr[1] "எதிர்காலத்தில் %d நாட்களில்"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "எதிர்காலத்தில் ஒரு வாரத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வாரங்களில்"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வாரத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வாரங்களில்"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 மாதத்திற்கு முன்"
 msgstr[1] "%d மாதங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு மாதத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d மாதங்களில்"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 வருடத்திற்கு முன்"
 msgstr[1] "%d வருடங்களுக்கு முன்"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "எதிர்காலத்தில் ஒரு வருடத்தில்"
 msgstr[1] "எதிர்காலத்தில் %d வருடங்களில்"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<தேதியை தேர்வு செய்ய இங்கே க்ளிக் செய்யவும்>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "இப்போது"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/filter-datespec.c:448
 msgid "Select a time to compare against"
 msgstr "ஒப்பிட வேண்டிய நேரத்தை தேர்வு செய்யவும்"
 
@@ -10264,10 +10273,10 @@ msgstr "எவல்யூஷன் மின்னஞ்சல் முன்�
 msgid "Evolution Network configuration control"
 msgstr "எவல்யூஷன் வலை இணைப்பு அமைப்பு கடடுப்பாடு"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:599 ../mail/mail-component.c:600
-#: ../mail/mail-component.c:769
+#: ../mail/mail-component.c:601 ../mail/mail-component.c:602
+#: ../mail/mail-component.c:771
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "மின்னஞ்சல்"
@@ -10291,12 +10300,12 @@ msgstr "வலை இணைப்பு முன்னுரிமை"
 msgid "_Mail"
 msgstr "(_M)மின்னஞ்சல்"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
 #: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "(_F)அனுப்பு"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "(_R)அனுப்பியவருக்கு பதிலளி "
@@ -10308,19 +10317,19 @@ msgid "%d attached messages"
 msgstr "%d  இணைக்கப்பட்ட செய்திகள்"
 
 #: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "இணைப்பு"
 msgstr[1] "இணைப்புகள்"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "Icon View"
 msgstr "சின்னம் காட்சி"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:602
 msgid "List View"
 msgstr "பட்டியல் பார்வை"
 
@@ -10371,30 +10380,30 @@ msgstr "பக்கத்தின் மேல் பகுதியை அட
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:307
+#: ../mail/em-account-editor.c:308
 msgid "No encryption"
 msgstr "குறியாக்கம் இல்லை"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:311
+#: ../mail/em-account-editor.c:312
 msgid "TLS encryption"
 msgstr "TLS குறியாக்கமுறை"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:315
+#: ../mail/em-account-editor.c:316
 msgid "SSL encryption"
 msgstr "SSL குறியாக்கம்"
 
-#: ../mail/em-account-editor.c:406
+#: ../mail/em-account-editor.c:407
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ஒப்பந்தப்பத்திரம்"
 
-#: ../mail/em-account-editor.c:413
+#: ../mail/em-account-editor.c:414
 #, c-format
 msgid ""
 "\n"
@@ -10407,72 +10416,73 @@ msgstr ""
 "%s இல் காட்டப்பட்ட\n"
 "சோதனைப்பெட்டியை க்ளிக் செய்து ஏற்க்கவும்\n"
 
-#: ../mail/em-account-editor.c:485 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "அடைவை தேர்வு செய்"
 
-#: ../mail/em-account-editor.c:609 ../mail/em-account-editor.c:654
-#: ../mail/em-account-editor.c:721 ../widgets/misc/e-signature-combo-box.c:102
+#: ../mail/em-account-editor.c:610 ../mail/em-account-editor.c:655
+#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "தானாக உருவாக்கப்பட்ட"
 
-#: ../mail/em-account-editor.c:779
+#: ../mail/em-account-editor.c:780
 msgid "Never"
 msgstr "எப்போதுமில்லை"
 
-#: ../mail/em-account-editor.c:780
+#: ../mail/em-account-editor.c:781
 msgid "Always"
 msgstr "எப்போதும்"
 
-#: ../mail/em-account-editor.c:781
+#: ../mail/em-account-editor.c:782
 msgid "Ask for each message"
 msgstr "ஒவ்வொரு செய்திக்கும் கேட்கவும்"
 
-#: ../mail/em-account-editor.c:1853 ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "அடையாளம்"
 
-#: ../mail/em-account-editor.c:1904 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "மின்னஞ்சல் பெறப்படுகிறது"
 
-#: ../mail/em-account-editor.c:2176
+#: ../mail/em-account-editor.c:2177
 msgid "Check for _new messages every"
 msgstr "புதிய மின்னஞ்சல்களை கால இடைவெளிக்குள் தானாக சோதி"
 
-#: ../mail/em-account-editor.c:2184
+#: ../mail/em-account-editor.c:2185
 msgid "minu_tes"
 msgstr "(_t) நிமிடங்கள்"
 
-#: ../mail/em-account-editor.c:2374 ../mail/mail-config.glade.h:138
+#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "மின்னஞ்சல் அனுப்பப்படுகிறது"
 
-#: ../mail/em-account-editor.c:2433 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "இயல்பானவைகள்"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2499 ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133
 #: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "பாதுகாப்பு"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2536 ../mail/em-account-editor.c:2631
+#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632
 msgid "Receiving Options"
 msgstr "பெறும் தேர்வுகள்"
 
-#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632
+#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633
 msgid "Checking for New Messages"
 msgstr "புதிய மின்னஞ்சலுக்காக சோதிக்கிறது"
 
-#: ../mail/em-account-editor.c:3089 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "கணக்கு தொகுப்பி"
 
-#: ../mail/em-account-editor.c:3089 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "எவல்யூஷன் கணக்கு உதவி"
 
@@ -10506,26 +10516,26 @@ msgstr "கையொப்ப நிரலை சேர்க்கவும்"
 msgid "Signature(s)"
 msgstr "கையொப்பம்(ங்கள்)"
 
-#: ../mail/em-composer-utils.c:1104 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- அனுப்பும் செய்தி --------"
 
-#: ../mail/em-composer-utils.c:1556
+#: ../mail/em-composer-utils.c:1560
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "இலக்கு முகவரி ஏதும் தர வில்லை. செய்தியை மேலனுப்புதல் இரத்து செய்யப்பட்டது"
 
-#: ../mail/em-composer-utils.c:1562
+#: ../mail/em-composer-utils.c:1566
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "பயன்படுத்த கணக்கு ஏதும் இல்லை. செய்தியை மேலனுப்புதல் இரத்து செய்யப்பட்டது"
 
-#: ../mail/em-composer-utils.c:2027
+#: ../mail/em-composer-utils.c:2034
 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:2074
+#: ../mail/em-composer-utils.c:2081
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10533,7 +10543,7 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2217
+#: ../mail/em-composer-utils.c:2224
 msgid "-----Original Message-----"
 msgstr "-----மூல செய்தி----"
 
@@ -10554,18 +10564,10 @@ msgstr "நிறத்தை ஒதுக்கு"
 msgid "Assign Score"
 msgstr "மதிப்பை ஒதுக்கு"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "மறை நகல்"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "ஒலி"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "நகல்"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "முடிந்த  தேதி"
@@ -10583,7 +10585,7 @@ msgid "Date sent"
 msgstr "தகவல் அனுப்பபட்டது"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:770
 #: ../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
@@ -10638,7 +10640,7 @@ msgstr "தொடர்"
 msgid "Forward to"
 msgstr "இவருக்கு அனுப்புப்பு"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:957
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "முக்கியம்"
 
@@ -10796,8 +10798,8 @@ msgstr "துவக்கம்"
 msgid "Stop Processing"
 msgstr "செயல்படுத்துவதை நிறுத்து"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:80
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
@@ -10857,11 +10859,11 @@ msgstr "முக்கியமான செய்திகள்"
 msgid "Messages Not Junk"
 msgstr "பயனற்ற செய்திகள் எதுவும் இல்லை"
 
-#: ../mail/em-folder-browser.c:1202
+#: ../mail/em-folder-browser.c:1201
 msgid "Account Search"
 msgstr "கணக்கை தேடு"
 
-#: ../mail/em-folder-browser.c:1255
+#: ../mail/em-folder-browser.c:1254
 msgid "All Account Search"
 msgstr "அனைத்து கணக்குகளையும் தேடு"
 
@@ -10891,11 +10893,11 @@ msgid "Quota usage"
 msgstr "ஒதுக்கீடு பயன் "
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:516
-#: ../mail/em-folder-tree.c:2524 ../mail/mail-component.c:166
-#: ../mail/mail-component.c:587
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:522
+#: ../mail/em-folder-tree.c:2587 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:589
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "உள்பெட்டி"
 
@@ -10917,34 +10919,34 @@ msgid "Folder _name:"
 msgstr "(_n) அடைவின் பெயர்"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
-#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198
+#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029
 msgid "Search Folders"
 msgstr "தேடும் அடைவுகள்"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:213 ../mail/em-folder-tree-model.c:215
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:511 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "வரைவுகள்"
 
-#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:518 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "வார்ப்புரு"
 
-#: ../mail/em-folder-tree-model.c:519 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "செல் அஞ்சல்"
 
-#: ../mail/em-folder-tree-model.c:521 ../mail/mail-component.c:169
+#: ../mail/em-folder-tree-model.c:527 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "அனுப்பு"
 
-#: ../mail/em-folder-tree-model.c:550 ../mail/em-folder-tree-model.c:859
+#: ../mail/em-folder-tree-model.c:585 ../mail/em-folder-tree-model.c:895
 msgid "Loading..."
 msgstr "ஏற்றுகிறது..."
 
@@ -10963,88 +10965,88 @@ msgstr "ஏற்றுகிறது..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:299
+#: ../mail/em-folder-tree.c:300
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:664
+#: ../mail/em-folder-tree.c:709
 msgid "Mail Folder Tree"
 msgstr "மின்னஞ்சல் அடைவு கிளை"
 
-#: ../mail/em-folder-tree.c:823
+#: ../mail/em-folder-tree.c:868
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s அடைவை நகர்த்துகிறது"
 
-#: ../mail/em-folder-tree.c:825
+#: ../mail/em-folder-tree.c:870
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s அடைவை நகலெடுக்கிறது"
 
-#: ../mail/em-folder-tree.c:832 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:877 ../mail/message-list.c:2014
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s க்கு செய்திகளை நகர்த்துகிறது"
 
-#: ../mail/em-folder-tree.c:834 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:879 ../mail/message-list.c:2016
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s இல் செய்திகளை நகலெடுக்கிறது"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:894
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "மேல்மட்ட கிடங்கிற்கு செய்தி(களை) அனுப்ப முடியாது"
 
-#: ../mail/em-folder-tree.c:926 ../ui/evolution-mail-message.xml.h:100
+#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "(_C)அடைவில் நகலெடு"
 
-#: ../mail/em-folder-tree.c:927 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "(_M)அடைவிற்கு நகர்த்து"
 
-#: ../mail/em-folder-tree.c:929 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2106
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106
 msgid "_Move"
 msgstr "(_M)நகர்த்து"
 
-#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:976 ../mail/message-list.c:2108
 msgid "Cancel _Drag"
 msgstr "(_D)இழுப்பதை ரத்து செய்"
 
-#: ../mail/em-folder-tree.c:1641 ../mail/mail-ops.c:1065
+#: ../mail/em-folder-tree.c:1686 ../mail/mail-ops.c:1065
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" இல் உள்ள அடைவுகளை சோதிக்கிறது"
 
-#: ../mail/em-folder-tree.c:2040
+#: ../mail/em-folder-tree.c:2091
 msgid "Open in _New Window"
 msgstr "(_N)புதிய சாளரத்தில் திற"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2045
+#: ../mail/em-folder-tree.c:2096
 msgid "_New Folder..."
 msgstr "(_N)புதிய அடைவு"
 
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2099
 msgid "_Move..."
 msgstr "(_M)நகர்த்து..."
 
-#: ../mail/em-folder-tree.c:2056 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_f புதுப்பி"
 
-#: ../mail/em-folder-tree.c:2057
+#: ../mail/em-folder-tree.c:2108
 msgid "Fl_ush Outbox"
 msgstr "_u அஞ்சல் வெளிபெட்டியை காலி செய்க"
 
-#: ../mail/em-folder-tree.c:2063 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2114 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "(_E)குப்பை தொட்டியை காலி செய்"
 
-#: ../mail/em-folder-tree.c:2166
+#: ../mail/em-folder-tree.c:2217
 msgid "_Unread Search Folder"
 msgstr "(_U) படிக்காத தேடும் அடைவு"
 
@@ -11053,14 +11055,14 @@ msgstr "(_U) படிக்காத தேடும் அடைவு"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' லிருந்து `%s'க்கு நகலெடுக்கிறது"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187
+#: ../mail/em-folder-view.c:1202
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../plugins/pst-import/pst-importer.c:305
 msgid "Select folder"
 msgstr "அடைவை தேர்வு செய்"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202
 msgid "C_opy"
 msgstr "(_o)நகலெடு"
 
@@ -11082,160 +11084,156 @@ msgstr "அடைவை உருவாக்குகிறது"
 msgid "Specify where to create the folder:"
 msgstr "அடைவை உருவாக்க வேண்டுமா என குறிப்பிடவும்"
 
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "அஞ்சல் நீக்கல் தோல்வியுற்றது"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 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:102
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "(_E)புதிய செய்தியாக தொகு..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1342
 msgid "U_ndelete"
 msgstr "(_n)நீக்கலை ரத்து செய்"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1343
 msgid "_Move to Folder..."
 msgstr "(_M)அடைவிற்கு நகர்த்து..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1344
 msgid "_Copy to Folder..."
 msgstr "(_C)அடைவில் நகலெடு..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1347
 msgid "Mar_k as Read"
 msgstr "(_k) படித்தது என குறி"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Unread"
 msgstr "படிக்காதவை என குறி (_U)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Important"
 msgstr "முக்கியம் என குறி (_I)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as Un_important"
 msgstr "முக்கியமில்லை என குறிக்கவும் (_i)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Junk"
 msgstr "பயனற்றது என குறிக்கவும் (_J)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Not Junk"
 msgstr "பயனற்றது இல்லை என குறிக்கவும் (_N)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mark for Follo_w Up..."
 msgstr "தொடர்தலுக்கு குறிக்கவும்... (_w)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 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:477
+#: ../mail/em-folder-view.c:1356 ../widgets/misc/e-dateedit.c:477
 msgid "_None"
 msgstr "ஒன்றுமில்லை (_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "_New Label"
 msgstr "(_N)புதிய  விவரச்சீட்டு "
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1363
 msgid "Fla_g Completed"
 msgstr "(_g) குறித்தல் முடிந்தது"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1364
 msgid "Cl_ear Flag"
 msgstr "(_e)குறிப்பை நீக்கு"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1367
 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:1369
 msgid "Search Folder based on _Subject"
 msgstr "பொருளில் அடிப்படையில் அடைவினை தேடு (_S)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on Se_nder"
 msgstr "அனுப்புனர் அடிப்படையில் அடைவினை தேடு (_n)"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on _Recipients"
 msgstr "பெறுநர் அடிப்படையில் அடைவினை தேடு (_R)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1372
 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:1377
 msgid "Filter based on Sub_ject"
 msgstr "(_j) தலைப்பின் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Sen_der"
 msgstr "(_d) அனுப்புநர் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Re_cipients"
 msgstr "(_c )பெறுநர் படி வடிகட்டு"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1380
 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:2234 ../mail/em-folder-view.c:2277
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
+#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278
+#: ../plugins/google-account-setup/google-source.c:223
+#: ../plugins/google-account-setup/google-source.c:508
+#: ../plugins/google-account-setup/google-source.c:719
 msgid "Default"
 msgstr "மின்னிருப்பு"
 
-#: ../mail/em-folder-view.c:2495
+#: ../mail/em-folder-view.c:2496
 msgid "Unable to retrieve message"
 msgstr "செய்தியை பெற முடியவில்லை"
 
-#: ../mail/em-folder-view.c:2514
-msgid "Retrieving Message..."
-msgstr "செய்தி மீட்டல்..."
-
-#: ../mail/em-folder-view.c:2735
+#: ../mail/em-folder-view.c:2700
 msgid "Create _Search Folder"
 msgstr "தேடும் அடைவினை உருவாக்கு"
 
-#: ../mail/em-folder-view.c:2736
+#: ../mail/em-folder-view.c:2701
 msgid "_From this Address"
 msgstr "இந்த முகவரியிலிருந்து (_F)"
 
-#: ../mail/em-folder-view.c:2737
+#: ../mail/em-folder-view.c:2702
 msgid "_To this Address"
 msgstr "இந்த முகவரிக்கு (_T)"
 
-#: ../mail/em-folder-view.c:3230
+#: ../mail/em-folder-view.c:3195
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s மின்னஞ்சலுக்கு க்ளிக் செய்யவும்"
 
-#: ../mail/em-folder-view.c:3242
+#: ../mail/em-folder-view.c:3207
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ஐ அழைக்க சொடுக்கு"
 
-#: ../mail/em-folder-view.c:3247
+#: ../mail/em-folder-view.c:3212
 msgid "Click to hide/unhide addresses"
 msgstr "முகவரிகளை மறைக்க/மறைநீக்க சொடுக்கவும்"
 
@@ -11448,19 +11446,19 @@ msgid "Formatting Message..."
 msgstr "செய்தியை ஒழுங்கு செய்கிறது..."
 
 #: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:924 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "கரிநகல்"
 
 #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:925 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "மறைநகல்"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
+#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1439
 msgid "Mailer"
 msgstr "மின்னஞ்சல்"
@@ -11483,74 +11481,74 @@ msgstr " (%R %Z)"
 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:921
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:301
 msgid "From"
 msgstr "அனுப்புநர்"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:922
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "பதில்-பெறுநர்"
 
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:81
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324
 #: ../widgets/misc/e-dateedit.c:346
 msgid "Date"
 msgstr "தேதி"
 
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "செய்தி குழுக்கள்"
 
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "முகம்"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s இணைப்புகள்"
 
-#: ../mail/em-format.c:1235
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME செய்தியை பகுக்க முடியவில்லை: தெரியாத பிழை"
 
-#: ../mail/em-format.c:1372 ../mail/em-format.c:1528
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "மைம் தகவலை பகுக்க முடியாது. நிரலாக காட்டுகிறது"
 
-#: ../mail/em-format.c:1380
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ஆதரவில்லா குறிமுறை வகை பலவழி/குறிமுறை"
 
-#: ../mail/em-format.c:1390
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/மைம் செய்திகள் ஐ பகுக்க இயலவில்லை"
 
-#: ../mail/em-format.c:1390
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/மைம் செய்திகள் ஐ பகுக்க இயலவில்லை தெரியாத தவறு"
 
-#: ../mail/em-format.c:1547
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ஆதரவு இல்லாத கையொப்பம்"
 
-#: ../mail/em-format.c:1555 ../mail/em-format.c:1626
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "கையொப்பத்தை சரிபார்க்கும் போது பிழை"
 
-#: ../mail/em-format.c:1555 ../mail/em-format.c:1617 ../mail/em-format.c:1626
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "கையொப்பத்தை சரிபார்க்கும் போது  தெரியாத பிழை"
 
-#: ../mail/em-format.c:1700
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "PGP செய்தியை பகுக்க இயலவில்லை"
 
-#: ../mail/em-format.c:1700
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP செய்தியை பகுக்க இயலவில்லை தெரியாத தவறு"
 
@@ -11616,35 +11614,35 @@ msgid "No Junk plugin available"
 msgstr "தேவையற்ற சொருகுப்பொருள் இல்லை "
 
 #. green
-#: ../mail/em-migrate.c:960
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "செய்ய வேண்டியவை"
 
 #. blue
-#: ../mail/em-migrate.c:961
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "பிறகு"
 
-#: ../mail/em-migrate.c:1128
+#: ../mail/em-migrate.c:1129
 msgid "Migration"
 msgstr "இடம்பெயர்கிறது"
 
-#: ../mail/em-migrate.c:1573
+#: ../mail/em-migrate.c:1574
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "புதிய அடைவை உருவாக்க முடியவில்லை `%s': %s"
 
-#: ../mail/em-migrate.c:1599
+#: ../mail/em-migrate.c:1600
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "அடைவு`%s'ஐ `%s' இல்  நகலெடுக்க முடியவில்லை: %s"
 
-#: ../mail/em-migrate.c:1784
+#: ../mail/em-migrate.c:1785
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ஏற்கெனவே உள்ள மின்னஞ்சல் பெட்டியில் தேட முடியவில்லை %s': %s"
 
-#: ../mail/em-migrate.c:1789
+#: ../mail/em-migrate.c:1790
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11655,31 +11653,31 @@ msgstr ""
 "\n"
 "எவல்யூஷன் அடைவுகளை நகர்த்திக்கொண்டிருக்கிறது..."
 
-#: ../mail/em-migrate.c:1990
+#: ../mail/em-migrate.c:1991
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "பாப் சேவகனில் வைத்த தகவல்களை திறக்க முடியவில்லை`%s': %s"
 
-#: ../mail/em-migrate.c:2004
+#: ../mail/em-migrate.c:2005
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "பாப்3 சேவகனில் வைத்த தகவல்களை திறக்க முடியவில்லை`%s': %s"
 
-#: ../mail/em-migrate.c:2033
+#: ../mail/em-migrate.c:2034
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "பாப்3 keep-on-server தகவலை நகலெடுக்க முடியவில்லை `%s': %s"
 
-#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
+#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "உள் மின்னஞ்சல் சேமிப்பை உருவாக்குவதில் தோல்வி`%s': %s"
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 msgid "Migrating Folders"
 msgstr "கோப்புகளை இடமாற்றுகிறது"
 
-#: ../mail/em-migrate.c:2874
+#: ../mail/em-migrate.c:2875
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -11691,12 +11689,12 @@ msgstr ""
 "\n"
 "எவல்யூஷன் அடைவுகளை நகர்த்துகையில் சற்று பொறுமையாக இருக்கவும்..."
 
-#: ../mail/em-migrate.c:2956
+#: ../mail/em-migrate.c:2957
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "மின்னஞ்சல் அடைவை `%s' இடத்தில் உருவாக்க முடியவில்லை: %s"
 
-#: ../mail/em-migrate.c:2975
+#: ../mail/em-migrate.c:2976
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11735,24 +11733,24 @@ msgstr "முகவரி புத்தகத்தில் சேர் (_A
 msgid "Open in %s..."
 msgstr "%s இல் திற..."
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "இந்த கிடங்கு உறுப்பினர் சேர்க்கைக்கு ஆதரவு தராது அல்லது இந்த வசதி செயல்படுத்தப்படவில்லை"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "உறுப்பினராக்கப்பட்டீர்"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "அடைவு"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "சேவகனை தேர்வு செய்யவும்"
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:895
 msgid "No server has been selected"
 msgstr "சேவகன் எதுவும் தேர்வு செய்யப்படவில்லை"
 
@@ -12062,8 +12060,9 @@ msgid ""
 "standard."
 msgstr ""
 "அஞ்சல் தலைப்பில் கோப்பு பெயர்களை அவுட்லுக் அல்லது ஜிமெய்ல் செய்வது போலவே காட்டுக. "
-"அப்போதுதான் அவை  எவல்யூஷன் அனுப்பும் யூடிஎஃப்-8 எழுத்துக்கள் உள்ள கோப்பு பெயர்களை புரிந்துகொள்ளும். ஏனெனில் அவை "
-"ஆர்எஃப்சி 2231 ஐ பயன்படுத்தாது தவறான   ஆர்எஃப்சி2047 செந்தரத்தை பயன்படுத்துகின்றன.."
+"அப்போதுதான் அவை  எவல்யூஷன் அனுப்பும் யூடிஎஃப்-8 எழுத்துக்கள் உள்ள கோப்பு பெயர்களை "
+"புரிந்துகொள்ளும். ஏனெனில் அவை ஆர்எஃப்சி 2231 ஐ பயன்படுத்தாது தவறான   ஆர்எஃப்சி2047 "
+"செந்தரத்தை பயன்படுத்துகின்றன.."
 
 #: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
@@ -12418,31 +12417,41 @@ msgstr "அஞ்சல்  செய்தி அனுப்பும்போ
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
-msgstr "அஞ்சல்  செய்தி அனுப்பும்போது \"கரிநகல் \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
+msgstr ""
+"அஞ்சல்  செய்தி அனுப்பும்போது \"கரிநகல் \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு தேர்வு "
+"செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
 
 #: ../mail/evolution-mail.schemas.in.h:134
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
-msgstr "அஞ்சல்  செய்தி அனுப்பும்போது \"அனுப்புநர்  \" புலத்தை காட்டுக. இது ஒரு செய்தி கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
+msgstr ""
+"அஞ்சல்  செய்தி அனுப்பும்போது \"அனுப்புநர்  \" புலத்தை காட்டுக. இது ஒரு செய்தி கணக்கு "
+"தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
 
 #: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
-msgstr "அஞ்சல்  செய்தி அனுப்பும்போது \"அனுப்புநர்  \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
+msgstr ""
+"அஞ்சல்  செய்தி அனுப்பும்போது \"அனுப்புநர்  \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு "
+"தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது."
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
-msgstr "அஞ்சல்  செய்தி அனுப்பும்போது \"பதில்-இவருக்கு  \" புலத்தை காட்டுக. இது ஒரு செய்தி கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது. "
+msgstr ""
+"அஞ்சல்  செய்தி அனுப்பும்போது \"பதில்-இவருக்கு  \" புலத்தை காட்டுக. இது ஒரு செய்தி "
+"கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது. "
 
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
-msgstr "அஞ்சல்  செய்தி அனுப்பும்போது \"பதில்-இவருக்கு  \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது. "
+msgstr ""
+"அஞ்சல்  செய்தி அனுப்பும்போது \"பதில்-இவருக்கு  \" புலத்தை காட்டுக. இது ஒரு அஞ்சல் கணக்கு "
+"தேர்வு செய்யப்படும்போது பார்வை மெனுவால் கட்டுப்படுத்தப்படுகிறது. "
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
@@ -12753,91 +12762,91 @@ msgstr "%s மின்னஞ்சல் பட்டியல்"
 msgid "Add Filter Rule"
 msgstr "வடிகட்டி விதிமுறையை சேர்"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d தேர்ந்தெடுக்கப்பட்டது, "
 msgstr[1] " %d தேர்ந்தெடுக்கப்பட்டது, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:558
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d நீக்கப்பட்டது"
 msgstr[1] "%d நீக்கப்பட்டது"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:565
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d குப்பை"
 msgstr[1] "%d குப்பை"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ஆவணம்"
 msgstr[1] "%d ஆவணம்"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d அனுப்பப்பட்டது"
 msgstr[1] "%d அனுப்பப்பட்டது"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d அனுப்பப்படவில்லை"
 msgstr[1] "%d அனுப்பப்படவில்லை"
 
-#: ../mail/mail-component.c:576
+#: ../mail/mail-component.c:578
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d படிக்காதது"
 msgstr[1] "%d படிக்காதது"
 
-#: ../mail/mail-component.c:577
+#: ../mail/mail-component.c:579
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d மொத்தம்"
 msgstr[1] "%d மொத்தம்"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:930
 msgid "New Mail Message"
 msgstr "புதிய மின்னஞ்சல் செய்தி"
 
 # msgctxt "New"
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "மின்னஞ்சல் செய்தி (_M)"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:932
 msgid "Compose a new mail message"
 msgstr "புதிய மின்னஞ்சல் செய்தியை தொகு"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:938
 msgid "New Mail Folder"
 msgstr "புதிய மின்னஞ்சல் அடைவு"
 
 # msgctxt "New"
-#: ../mail/mail-component.c:938
+#: ../mail/mail-component.c:939
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "மின்னஞ்சல் அடைவு (_F)"
 
-#: ../mail/mail-component.c:939
+#: ../mail/mail-component.c:940
 msgid "Create a new mail folder"
 msgstr "புதிய மின்னஞ்சல் அடைவை உருவாக்கு"
 
-#: ../mail/mail-component.c:1086
+#: ../mail/mail-component.c:1087
 msgid "Failed upgrading Mail settings or folders."
 msgstr "மின்னஞ்சல் அமைப்புகள் அடைவை மேம்படுத்துதல் தோல்வியுற்றது"
 
@@ -13406,8 +13415,8 @@ msgstr "(_e)பயனீட்டாளர் பெயர்"
 msgid "Use Authe_ntication"
 msgstr "உண்மைபடுத்தலை பயன்செய் (_n)"
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:368
-#: ../plugins/google-account-setup/google-source.c:613
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:632
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
 msgid "User_name:"
@@ -13577,46 +13586,34 @@ msgid "All local folders"
 msgstr "இடஞ்சார்ந்த அடைவுகள் அனைத்தும்"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "எழுத்துணர்வு (_s)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "முடிவுற்றது (_m)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "தேடு: (_i)"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "செய்தியில் கண்டுபிடி"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:275
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
 msgid "Flag to Follow Up"
 msgstr "தொடர்வதற்காக குறியிடு"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "அடைவு உறுப்பினர்கள்"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "ஒப்பந்தப்பத்திரம்"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "(_e)சேவகன்:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "பாதுகாப்பு தகவல்"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "குறிப்பிட்ட அடைவுகள்"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13624,19 +13621,19 @@ msgstr ""
 "தொடந்து கவனிப்பதற்காக நீங்கள் தேர்வு செய்த செய்தி பட்டியலிடப்பட்டுள்ளது\n"
 "\"Flag\" பட்டிலிருந்து தொடர் தேர்வை தேர்வு செய்யவும்"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "அங்கீகாரத்தை ஏற்றுக்கொள் (_A)"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "(_D)நிலுவையில்:"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "(_F)குறி:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "ஒப்பந்த பத்திரத்தை ஏற்க இங்கு சொடுக்கவும்"
 
@@ -13784,7 +13781,7 @@ msgid_plural "Saving %d messages"
 msgstr[0] "%d செய்தியை சேமிக்கிறது"
 msgstr[1] "%d செய்திகளை சேமிக்கிறது"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2098
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13793,11 +13790,11 @@ msgstr ""
 "செய்தியை சேமிக்கும் போது பிழை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2170
 msgid "Saving attachment"
 msgstr "இணைப்பை சேமிக்கிறது"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2188 ../mail/mail-ops.c:2196
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13806,27 +13803,27 @@ msgstr ""
 "விளைவுக்கோப்பை உருவாக்க முடியவில்லை: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2211
 #, c-format
 msgid "Could not write data: %s"
 msgstr "தகவலை எழுத முடியவில்லை: %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s லிருந்து துண்டிக்கப்படுகிறது"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2357
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s இல் மீண்டும் இணைக்கப்படுகிறது"
 
-#: ../mail/mail-ops.c:2451
+#: ../mail/mail-ops.c:2453
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s'  கணக்குக்கு தொடர்பில்லாத நிலைக்கு தயாராகிறது "
 
-#: ../mail/mail-ops.c:2537
+#: ../mail/mail-ops.c:2539
 msgid "Checking Service"
 msgstr "சேவைகளை சோதிக்கிறது"
 
@@ -13929,11 +13926,11 @@ msgstr "'%s க்கான தேடு அடைவுகளை மேம்�
 msgid "Updating Search Folders for '%s'"
 msgstr " '%s' க்கான  தேடு அடைவுகளை ஏற்றுகிறது"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1068
 msgid "Edit Search Folder"
 msgstr "தேடு அடைவை தொகு"
 
-#: ../mail/mail-vfolder.c:1156
+#: ../mail/mail-vfolder.c:1157
 msgid "New Search Folder"
 msgstr "புதிய தேடல் அடைவு"
 
@@ -14701,10 +14698,14 @@ msgid "Subject contains"
 msgstr "தலைப்பில் உள்ளது"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "பொருள் அல்லது முகவரி இதை கொண்டிருந்தால்"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "பொருள் அல்லது பெறுனர் கொண்டிருந்தால்"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "பொருள் அல்லது அனுப்புனர் கொண்டிருந்தால்"
 
@@ -14832,84 +14833,86 @@ msgstr "எவல்யூஷனை மீண்டும் தொடங்க�
 msgid "With Graphical User Interface"
 msgstr "வரைகலை பயனர் இடைமுகம் உடன்"
 
-#: ../plugins/backup-restore/backup.c:187
-#: ../plugins/backup-restore/backup.c:235
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "எவல்யூஷன் மூடப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:194
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "எவல்யூஷன் கணக்குகள் மற்றும் அமைப்புகள் பாதுகாக்கப்படுகிறன."
 
-#: ../plugins/backup-restore/backup.c:200
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "எவல்யூஷன் தரவுகள் பாதுகாக்கப்படுகிறன. (அஞ்சல்கள், தொடர்புகள் நாள்காட்டி பணிகள் குறிப்புகள்)"
+msgstr ""
+"எவல்யூஷன் தரவுகள் பாதுகாக்கப்படுகிறன. (அஞ்சல்கள், தொடர்புகள் நாள்காட்டி பணிகள் குறிப்புகள்)"
 
-#: ../plugins/backup-restore/backup.c:211
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "காப்பு முடிந்தது"
 
-#: ../plugins/backup-restore/backup.c:216
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "எவல்யூஷன் மறு துவக்கம் செய்யப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "இப்போதைய எவல்யூஷன் தரவு காப்பு எடுக்கப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "காப்பிலிருந்து கோப்புகள் பிரித்தெடுக்கப் படுகின்றன."
 
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "எவல்யூஷன் அமைப்புகள் ஏற்றப்படுகின்றன."
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "தற்காலிக காப்பு கோப்புகள் நீக்கப்படுகிறன."
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "உள்ளமை மூலங்கள் உறுதி செய்யப்படுகின்றன "
 
-#: ../plugins/backup-restore/backup.c:386
+#: ../plugins/backup-restore/backup.c:430
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "காப்பு அடைவு %s க்கு எடுக்கப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:391
+#: ../plugins/backup-restore/backup.c:435
 #, 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:410
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "எவல்யூஷன் காப்பு"
 
-#: ../plugins/backup-restore/backup.c:410
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "எவல்யூஷன் மீளமை"
 
-#: ../plugins/backup-restore/backup.c:445
+#: ../plugins/backup-restore/backup.c:490
 msgid "Backing up Evolution Data"
 msgstr "எவல்யூஷன் தரவு காப்பு எடுக்கப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:446
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is backing up your data."
 msgstr "எவல்யூஷன் தரவு காப்பு எடுக்கப்படுகிறது. தயவு செய்து பொறுத்திருக்கவும்."
 
-#: ../plugins/backup-restore/backup.c:448
+#: ../plugins/backup-restore/backup.c:493
 msgid "Restoring Evolution Data"
 msgstr "எவல்யூஷன் தரவு மீட்கப்படுகிறது."
 
-#: ../plugins/backup-restore/backup.c:449
+#: ../plugins/backup-restore/backup.c:494
 msgid "Please wait while Evolution is restoring your data."
 msgstr "எவல்யூஷன் தரவு மீட்கப்படுகிறது.. தயவு செய்து எபொறுத்திருக்கவும்."
 
-#: ../plugins/backup-restore/backup.c:467
+#: ../plugins/backup-restore/backup.c:512
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "உங்கள் கணக்கில் உள்ள தரவை பொருத்து எடுத்துக்கொள்ளும் நேரம் வேறுபடும்.."
 
@@ -14982,35 +14985,35 @@ msgstr "அமைப்புகளை மீட்டெடு..."
 msgid "_Backup Settings..."
 msgstr "அமைப்புகளளை காப்பு எடு..."
 
-#: ../plugins/bbdb/bbdb.c:621 ../plugins/bbdb/bbdb.c:630
+#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "தானியக்க தொடர்புகள்"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:648
 msgid "Create _address book entries when sending mails"
 msgstr "(_a) அஞ்சலுக்கு பதில் தருகையில் தானாகவே முகவரிப்புத்தகத்தை உருவாக்குக"
 
-#: ../plugins/bbdb/bbdb.c:651
+#: ../plugins/bbdb/bbdb.c:654
 msgid "Select Address book for Automatic Contacts"
 msgstr " தானியங்கி தொடர்புகள் க்கு முகவரிப்புத்தகம் தேர்ந்தெடு"
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:669
 msgid "Instant Messaging Contacts"
 msgstr "உடனடி செய்தி தொடர்புகள்"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "பிட்ஜின் நண்பர் பட்டியல் இலிருந்து தொடர்பு தகவல் மற்றும் பிம்பங்களை  ஒத்திசைக்கவும்."
 
-#: ../plugins/bbdb/bbdb.c:687
+#: ../plugins/bbdb/bbdb.c:690
 msgid "Select Address book for Pidgin buddy list"
 msgstr "பிட்ஜின் அரட்டையாளர் பட்டியலுக்கு முகவரி புத்தகத்தை தேர்ந்தெடுக்கவும்"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:701
 msgid "Synchronize with _buddy list now"
 msgstr "அரட்டையாளர் பட்டியலில் இப்போது ஒருங்கிணைக்கவும் (_b)"
 
@@ -15084,30 +15087,30 @@ msgstr "போகோ வடிப்பியை பயன்படுத்த�
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:329
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:353
-#: ../plugins/google-account-setup/google-source.c:606
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "SSL பயன்படுத்து (_S)"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:396
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/google-account-setup/google-source.c:649
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "(_f) புதுப்பி:"
 
-#: ../plugins/caldav/caldav-source.c:414
-#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-source.c:675
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "வாரங்கள்"
@@ -15128,11 +15131,11 @@ msgstr "எவல்யூஷன் க்கு வட்டார நாள்
 msgid "Local Calendars"
 msgstr "வட்டார நாள்காட்டிகள்"
 
-#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "பாதுகாப்பான இணைப்பு (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:389
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "(_m) பயனீட்டாளர் பெயர்"
 
@@ -15235,7 +15238,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:599
+#: ../shell/main.c:601
 msgid "Evolution"
 msgstr "எவல்யூஷன்"
 
@@ -15549,7 +15552,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:329
+#: ../plugins/exchange-operations/exchange-delegates-user.c:330
 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."
@@ -15560,25 +15563,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:334
+#: ../plugins/exchange-operations/exchange-delegates-user.c:335
 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:352
+#: ../plugins/exchange-operations/exchange-delegates-user.c:355
 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:359
+#: ../plugins/exchange-operations/exchange-delegates-user.c:362
 msgid "However you are not permitted to see my private items."
 msgstr "ஆனால் என் அந்தரங்க விஷயங்களை காண அனுமதிக்கப்படவில்லை."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:391
+#: ../plugins/exchange-operations/exchange-delegates-user.c:394
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "நீங்கள் %s க்கு பிரதிநிதியாக நியமிக்கப்படுள்ளீர்கள்."
@@ -15676,7 +15679,7 @@ msgstr "_S அனுமதிகள் சுருக்கம் தருக"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
+#: ../plugins/itip-formatter/itip-view.c:1915
 msgid "_Tasks:"
 msgstr "பணிகள்: (_T)"
 
@@ -15794,8 +15797,8 @@ msgstr "பயனரை சேர்:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:714
+#: ../plugins/groupwise-features/proxy.c:936
+#: ../plugins/groupwise-features/share-folder.c:718
 msgid "Add User"
 msgstr "பயனரை சேர்"
 
@@ -16193,7 +16196,7 @@ msgid "Unknown error looking up {0}"
 msgstr "தெரியாத பிழையை தேடுகிறது {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
@@ -16322,7 +16325,9 @@ msgstr "வெளியமை திருத்தி இன்னும் இ
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
-msgstr "வெளியமை திருத்தி இன்னும் இயங்குகிறது. திருத்தி செயலில் உள்ளவரை அஞ்சல் எழுதி சாளரம் மூடப்பட முடியாது."
+msgstr ""
+"வெளியமை திருத்தி இன்னும் இயங்குகிறது. திருத்தி செயலில் உள்ளவரை அஞ்சல் எழுதி சாளரம் "
+"மூடப்பட முடியாது."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -16371,8 +16376,9 @@ msgid ""
 msgstr ""
 "வெளி செல்லும் அஞ்சல்களுக்கு முக தலைப்பை இணைக்கவும்.\n"
 "\n"
-" முதல் முறை பயன்படுத்தும் போது பயனர் "
-"ஒரு 48*48 பிஎன்ஜி  பிம்பத்தை வடிவமைக்க வேண்டும். இது பேஸ் 64 இல் குறியாக்கப்பட்டது. ~/.evolution/faces இல் சேமிக்கப்பட்டு உள்ளது.மேலும் அனுப்பும் செய்திகளில் இது இணைக்கப்படும்."
+" முதல் முறை பயன்படுத்தும் போது பயனர் ஒரு 48*48 பிஎன்ஜி  பிம்பத்தை வடிவமைக்க வேண்டும். "
+"இது பேஸ் 64 இல் குறியாக்கப்பட்டது. ~/.evolution/faces இல் சேமிக்கப்பட்டு உள்ளது.மேலும் "
+"அனுப்பும் செய்திகளில் இது இணைக்கப்படும்."
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -16396,12 +16402,12 @@ msgstr "(_U)உறுப்பினர் நீக்கம்"
 msgid "Google"
 msgstr "கூகுள்"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:416
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "பயனர் %s நாள்காட்டி  சந்தாதார்  பட்டியலை அணுக கடவுச்சொல்லை உள்ளிடுக."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:519
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16410,11 +16416,11 @@ msgstr ""
 "கூகுள் சேவையகத்திலிருந்து தரவை படிக்க இயலவில்லை\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:694
 msgid "Cal_endar:"
 msgstr "நாள்காட்டி:(_C):"
 
-#: ../plugins/google-account-setup/google-source.c:709
+#: ../plugins/google-account-setup/google-source.c:729
 msgid "Retrieve _list"
 msgstr "_l பட்டியலை பெறு "
 
@@ -16550,12 +16556,70 @@ msgstr "செய்தி  பின் வாங்கல் தோல்வ�
 msgid "The server did not allow the selected message to be retracted."
 msgstr "தேர்ந்தெடுக்கப்பட்ட செய்தியை பின்வாங்க சேவையகம் அனுமதிக்கவில்லை."
 
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "இந்த கூட்டத்தை மீண்டும் அனுப்ப விருப்பமா?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "இந்த மீள் நிகழ் கூட்டத்தை மீண்டும் அனுப்ப விருப்பமா?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "அசல் உருப்படியை மீட்க விரும்புகிறீர்கள?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "அசல் பெறுநர் அஞ்சல் பெட்டிகளிலிருந்து அழிக்கப்படும்"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+msgid "This is a recurring meeting"
+msgstr "இந்த நிகழ்வை சுருள் நிகழ்வாகச் செய்"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "இது நடப்பு சந்திப்பு விவரங்களுடன் புதிய சந்திப்பை உருவாக்கும்"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"இது நடப்பு சந்திப்பு விவரங்களுடன் புதிய சந்திப்பை உருவாக்கும். மீள் நிகழ்வு விவரம் உள்ளிடப்பட "
+"வேண்டும்."
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+msgid "Would you like to accept it?"
+msgstr "அதை ஒப்புக்கொள்ள விருப்பமா?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+msgid "Would you like to decline it?"
+msgstr "அதை வேண்டாமென்று ஒதுக்க விருப்பமா?"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "கணக்கு &quot;{0}&quot; ஏற்கெனவே உள்ளது தயவு செய்து உங்கள் அடைவு கிளைகளை பார்க்க."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "கணக்கு ஏற்கனவே உள்ளது"
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "செல்லாத பயனர்"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+" &quot;{0}&quot; ஆக பதிலாள் உள்நுழைவு தோற்றது.  தயவு செய்து மின் அஞ்சல் முகவரியை "
+"சரி பார்த்து மீண்டும் முயற்சி செய்க."
+
 #. 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.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
@@ -16576,22 +16640,6 @@ msgstr "இந்த பயனருக்கு ஏற்கெனவே பத
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "நீங்கள் பதிலாள் அணுகல்  அனுமதி தர செல்லுபடியாகும் பயனர் பெயர் ஒன்றை குறிப்பிட வேண்டும்."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "கணக்கு &quot;{0}&quot; ஏற்கெனவே உள்ளது தயவு செய்து உங்கள் அடைவு கிளைகளை பார்க்க."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "கணக்கு ஏற்கனவே உள்ளது"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-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.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "குறிப்பிட்ட பயனர்  &quot;{0}&quot;  உடன் நீங்கள் இந்த கோப்பினை பகிர்ந்து கொள்ள  முடியாது"
@@ -16704,10 +16752,10 @@ msgstr "<b>கணக்கின் பெயர்</b>"
 msgid "Proxy Login"
 msgstr "பதிலாள் உள்அனுமதி"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:489
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s (பயனருக்கான %s) %sகடவுச்சொல்லை உள்ளிடவும்"
@@ -16715,26 +16763,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:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "பதிலாள் பதிவு... (_P)"
 
 #. 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:690
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "கணக்கு இணைப்பில் இருக்கும் போது மட்டுமே பதிலாள் தத்தல் இருக்கும்."
 
 #. 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:696
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "கணக்கு செயல்படுத்தியிருக்கும் போது மட்டுமே பதிலாள் தத்தல் இருக்கும்."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/send-options.c:215
 msgid "Advanced send options"
 msgstr "கூடுதல் அனுப்பும் விருப்பங்கள்"
 
 #: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:749
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Users"
 msgstr "பயனர்கள்"
 
@@ -16750,15 +16798,15 @@ msgstr "புதிய பகிரப்பட்ட அடைவு... (_S)"
 msgid "Sharing"
 msgstr "பகிர்கிறது"
 
-#: ../plugins/groupwise-features/share-folder.c:532
+#: ../plugins/groupwise-features/share-folder.c:536
 msgid "Custom Notification"
 msgstr "தனிப்பயன் அறிவிப்பு"
 
-#: ../plugins/groupwise-features/share-folder.c:754
+#: ../plugins/groupwise-features/share-folder.c:758
 msgid "Add   "
 msgstr "சேர்   "
 
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder.c:764
 msgid "Modify"
 msgstr "மாற்றியமை"
 
@@ -16885,7 +16933,7 @@ msgstr "IMAP சிறப்பு அம்சங்கள்"
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "வண் பொருட்கள் பிரித்தெடுத்தல் அடுக்கு ஏற்றப்படவில்லை"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -16893,11 +16941,11 @@ msgstr ""
 "\"hald\" சேவை தேவை ஆனால் இப்போது அது ஓடவில்லை.  தயவு செய்து இந்த சேவையை இயக்கி "
 "நிரலை மீண்டும் துவங்கவும். அல்லது உங்கள் கணினி நிர்வாகியை தொடர்பு கொள்ளவும்."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
 msgid "Search for an iPod failed"
 msgstr "ஐ பாடை தேடுதல் தோல்வியடைந்தது."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
 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."
@@ -16922,132 +16970,132 @@ msgstr "உங்கள் தரவை உங்கள் ஆப்பிள்
 msgid "iPod Synchronization"
 msgstr "ஐபாட்   ஒருங்கிணைத்தல்"
 
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:484
+#: ../plugins/itip-formatter/itip-formatter.c:609
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "நாள்காட்டியை ஏற்ற முடியவில்லை '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:629
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "நாள்காட்டி '%s'யில் ஒரு சந்திப்பு  ஏற்பாடு, சந்திப்புடன் முரணாக உள்ளது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:665
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "நாள்காட்டியில் சந்திப்பு  கண்டுபிடிக்கப்பட்டது '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:755
 msgid "Unable to find any calendars"
 msgstr "எந்த நாள்காட்டிகளையும் காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:762
 msgid "Unable to find this meeting in any calendar"
 msgstr "எந்த நாள்காட்டியிலும் இந்த சந்திப்பினை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:766
 msgid "Unable to find this task in any task list"
 msgstr "எந்த பணி பட்டியலிலும் இந்த பணியை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:770
 msgid "Unable to find this memo in any memo list"
 msgstr "எந்த குறிப்பு பட்டியலிலும் இந்த குறிப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:841
 msgid "Opening the calendar. Please wait.."
 msgstr "நாள்காட்டியை திறக்கிறது. தயை செய்து காத்திருக்கவும்..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:844
 msgid "Searching for an existing version of this appointment"
 msgstr "இந்த சந்திப்புக்கு இருப்பில் உள்ள வடிவ நிலையை தேடுகிறது. "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1026
 msgid "Unable to parse item"
 msgstr "உருப்படியை குறிப்பிட முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1113
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "நாள்காட்டிக்கு உருப்படியை அனுப்ப முடியவில்லை '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1125
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "நாள்காட்டி '%s' க்கு ஏற்றுக்கொள்ளப்பட்டது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1129
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "நாள்காட்டி '%s' க்கு தற்காலிகமானது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1134
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "நாள்காட்டி '%s' க்கு நிராகரிக்கப்பட்டது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1139
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "நாள்காட்டி '%s' க்கு ரத்தானது என அனுப்பு"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1233
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ஒருங்கிணைப்பாளர் பேராளரை நீக்கிவிட்டார் %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Sent a cancelation notice to the delegate"
 msgstr "பேராளருக்கு ரத்து அறிக்கையை அனுப்பவும்"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1242
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "பேராளருக்கு ரத்து அறிக்கையை அனுப்ப முடியவில்லை?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1346
+#: ../plugins/itip-formatter/itip-formatter.c:1350
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "கலந்து கொள்பவர்கள் நிலை தவறானது அதனால் மேம்படுத்த முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "கலந்துகொள்பவர்களை மேம்படுத்த முடியவில்லை. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status updated"
 msgstr "கலந்து கொள்பவர்கள் நிலை மேம்படுத்தப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1405
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Meeting information sent"
 msgstr "கூட்டம் பற்றிய தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 msgid "Task information sent"
 msgstr "பணி தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 msgid "Memo information sent"
 msgstr "குறிப்பு தகவல் அனுப்பப்பட்டது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "இந்த சந்திப்பு தகவலை அனுப்ப இயலவில்லை, சந்திப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1423
+#: ../plugins/itip-formatter/itip-formatter.c:1427
 msgid "Unable to send task information, the task does not exist"
 msgstr "இந்த பணி தகவலை அனுப்ப இயலவில்லை, பணியை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1426
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "இந்த குறிப்பு தகவலை அனுப்ப இயலவில்லை, குறிப்பை காண முடியவில்லை"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
-#: ../plugins/itip-formatter/itip-formatter.c:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1499
+#: ../plugins/itip-formatter/itip-formatter.c:1510
 msgid "The calendar attached is not valid"
 msgstr "இணைக்கப்பட்ட நாள்காட்டி தவறானது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../plugins/itip-formatter/itip-formatter.c:1500
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17055,15 +17103,15 @@ msgstr ""
 "இந்த செய்தி ஒரு நாட்காட்டியை உள்ளடக்கியதாக சொல்லுகிறது ஆனால் அது ஒரு செல்லுபடியாகும் "
 "ஐநாள்காட்டி அல்ல "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1547
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1551
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid "The item in the calendar is not valid"
 msgstr "நாள்காட்டியில் உள்ள உருப்படி தவறானது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17071,11 +17119,11 @@ msgstr ""
 "இந்த  செய்தியில் ஒரு நாள்காட்டி  உள்ளது. ஆனால் அதில் எந்த நிகழ்வுகள், பணிகள் ஓய்வு/ வேலை "
 "தகவல்கள் ஏதும் இல்லை........"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1591
 msgid "The calendar attached contains multiple items"
 msgstr "இணைப்பட்டுள்ள நாள்காட்டி பல உருப்படிகளை கொண்டுள்ளது"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1592
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17083,31 +17131,31 @@ msgstr ""
 "அனைத்து உருப்படிகளையும் செயலாக்க கோப்பு சேமிக்கப்பட்டு மற்றும் நாள்காட்டி இறக்குமதி "
 "செய்யப்பட வேண்டும்"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2317
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "This meeting recurs"
 msgstr "இந்த சந்திப்பு மீண்டும் வந்துள்ளது "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "This task recurs"
 msgstr "இந்த பணி மீண்டும் வந்துள்ளது "
 
-#: ../plugins/itip-formatter/itip-formatter.c:2323
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 msgid "This memo recurs"
 msgstr "இந்த குறிப்பு மீண்டும் வரும்"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2559
+#: ../plugins/itip-formatter/itip-formatter.c:2581
 msgid "_Delete message after acting"
 msgstr "செயலுக்கு பின் செய்தியை அழிக்கவும் (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2569
-#: ../plugins/itip-formatter/itip-formatter.c:2601
+#: ../plugins/itip-formatter/itip-formatter.c:2591
+#: ../plugins/itip-formatter/itip-formatter.c:2624
 msgid "Conflict Search"
 msgstr "தேடல் முரண்பாடு"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "சந்திப்பு முரண்பாடுகளை தேட நாள்காட்டிகளை தேர்ந்தெடுக்கவும்"
 
@@ -17475,101 +17523,101 @@ 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:821
+#: ../plugins/itip-formatter/itip-view.c:824
 msgid "_Open Calendar"
 msgstr "நாள்காட்டியை திற (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:864
 msgid "_Accept"
 msgstr "ஏற்றுக்கொள் (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Decline all"
 msgstr "அனைத்தையும் நிராகரி (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Tentative all"
 msgstr "அனைத்து தற்காலிகமான(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Tentative"
 msgstr "தற்காலிகமாக (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:836
 msgid "_Accept all"
 msgstr "அனைத்தையும் ஏற்றுக்கொள் (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Send Information"
 msgstr "தகவலை அனுப்பு (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update Attendee Status"
 msgstr "கலந்து கொள்பவர்கள் நிலையை மேம்படுத்து (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update"
 msgstr "மேம்படுத்து (_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1034
 msgid "Start time:"
 msgstr "துவக்க நேரம்:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "End time:"
 msgstr "முடியும் நேரம்:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Comment:"
 msgstr "குறிப்பு:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1104
 msgid "Send _reply to sender"
 msgstr "_r அனுப்புனருக்கு பதில் அனுப்புக"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1134
 msgid "Send _updates to attendees"
 msgstr "_u பங்கு கொள்வோருக்கு இப்போதைய தகவல் அனுப்புக."
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1143
 msgid "_Apply to all instances"
 msgstr "_A அனைத்தும் நிகழ்வுகளுக்கும் செயல்படுத்துக."
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1152
 msgid "Show time as _free"
 msgstr "(_f)ஓய்வாக உள்ள நேரம் எனக்காட்டு"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "_Preserve my reminder"
 msgstr "(_P) என் நினைவூட்டலை காத்துவிடு."
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1161
 msgid "_Inherit reminder"
 msgstr "(_I) நினைவூட்டல் ஐ மரபாக பெறு"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1917
 msgid "_Memos:"
 msgstr "நினைவூட்டிகள் (_M)"
 
@@ -17789,8 +17837,8 @@ msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
-"தேர்ந்தெடுக்கப்பட்ட மூலம்  படிக்க மட்டுமே, அதனால் அங்கு நினைவூட்டியை உருவாக்க முடியாது. வேறு "
-"மூலத்தை தயை செய்து தேர்ந்தெடுங்கள்."
+"தேர்ந்தெடுக்கப்பட்ட மூலம்  படிக்க மட்டுமே, அதனால் அங்கு நினைவூட்டியை உருவாக்க முடியாது. "
+"வேறு மூலத்தை தயை செய்து தேர்ந்தெடுங்கள்."
 
 #: ../plugins/mail-to-task/mail-to-task.c:455
 #, c-format
@@ -18309,11 +18357,11 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "நாள்காட்டியை வெளியிட முடியவில்லை. நாள்காட்டி பின்னகம் இருப்பில் இல்லை"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "புதிய இடம்"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:482
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "இடத்தை திருத்து"
 
@@ -18377,11 +18425,11 @@ msgstr "ஸ்பாம் அஸாஸின் க்கு குழாய்
 msgid "SpamAssassin is not available."
 msgstr "ஸ்பாம் அஸாஸின்  இருப்பில் இல்லை"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:904
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "இது ஸ்பாம் அஸாஸின் ஐ மேலும் நம்பகமாக்கும். ஆனால் மெதுவாக வேலை செய்யும்."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:916
 msgid "I_nclude remote tests"
 msgstr "(_n)தொலை சோதனையை சேர்"
 
@@ -18832,7 +18880,7 @@ msgstr "பக்கப்பட்டை தெரிகிறது"
 msgid "Skip development warning dialog"
 msgstr "மேம்பாடு எச்சரிக்கை உரையாடலை தவிர்"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485
 msgid "Start in offline mode"
 msgstr "இணையம் இல்லாமல் துவக்கு"
 
@@ -19143,9 +19191,9 @@ msgstr "OAF பதிவு செய்ய முடியவில்லை"
 msgid "Configuration Database not found"
 msgstr "அமைப்பு தரவுத்தளத்தை காணவில்லை"
 
-#: ../shell/e-user-creatable-items-handler.c:677
-#: ../shell/e-user-creatable-items-handler.c:687
-#: ../shell/e-user-creatable-items-handler.c:692
+#: ../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 "புதிய"
 
@@ -19201,7 +19249,7 @@ msgstr ""
 "கோப்புகளை பதிவிறக்கம் செய்துகொள்ளலாம்."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19235,7 +19283,7 @@ msgstr ""
 "எங்கள் முயற்சி உங்களுக்கு மகிழ்ச்சியை தரும் என நம்புகிறோம்.\n"
 "உங்கள் ஆதரவை ஆர்வத்துடன் எதிர் பார்க்கிறோம்.\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19243,43 +19291,43 @@ msgstr ""
 "நன்றி\n"
 "எவல்யூஷன் குழு\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "மீண்டும் சொல்ல வேண்டாம்"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:483
 msgid "Start Evolution activating the specified component"
 msgstr "குறிப்பிட்ட உருப்படியை துவக்குவதன் மூலம் எவல்யூஷனை துவக்கு"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:487
 msgid "Start in online mode"
 msgstr "உள் அமை பாங்கில் துவக்கு"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:490
 msgid "Forcibly shut down all Evolution components"
 msgstr "எல்லா எவல்யூஷன் கூறுகளையும் பணிநிறுத்தம் செய்கிறது"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:494
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "எவல்யூஷன் 1.4 லிருந்து மீண்டும் மாற்றப்படுகிறது"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:497
 msgid "Send the debugging output of all components to a file."
 msgstr "கோப்பின் எல்லா உருப்படிகளுக்கும் வழுநீக்க விளைவை அனுப்பவும்"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:499
 msgid "Disable loading of any plugins."
 msgstr "எந்த கூடுதல் வசதிகளை ஏற்றலையும் செயல்நீக்கு"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:501
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "அஞ்சல் தொடர்புகள் மற்றும் பணிகள் இவற்றுக்கு முன்பார்வை பலகத்தை முடக்குக"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:588
 msgid "- The Evolution PIM and Email Client"
 msgstr "- எவல்யூஷன் PIM மற்றும் மின்னஞ்சல்"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:616
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21279,11 +21327,11 @@ msgid "With _Status"
 msgstr "(_S)நிலையுடன்"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777
 msgid "UTC"
 msgstr "UTC"
 
@@ -21312,19 +21360,19 @@ msgstr ""
 "வரைபடத்தில் குறிப்பிட்ட பகுதியை பெரிதாக்க சுட்டியில் இடது பொத்தானை பயன்படுத்தவும்\n"
 "சிறிதாக்க வலது பொத்தானை பயன்படுத்தவும்."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "சேகரிப்பு"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%sக்கு காட்சிகளை குறிப்பிடு"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "காட்சிகளை குறிப்பிடு"
 
@@ -21395,11 +21443,11 @@ msgstr "தற்போதைய தனிப்பயன் காட்சி�
 msgid "Create or edit views"
 msgstr "காட்சிகளை உருவாக்கு அல்லது திருத்து"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "தொழிற்சாலை"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "புதிய காட்சிகளை வரையறு"
 
@@ -21420,49 +21468,49 @@ msgid "Attached message"
 msgstr "இணைக்கப்பட்ட செய்தி"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270
-#: ../widgets/misc/e-attachment-store.c:635
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
 msgid "A load operation is already in progress"
 msgstr "ஒரு ஏற்றல் செயல் ஏற்கெனெவே நடப்பில் உள்ளது"
 
-#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
 msgid "A save operation is already in progress"
 msgstr "ஒரு சேமிப்பு செயல் ஏற்கெனெவே நடப்பில் உள்ளது"
 
-#: ../widgets/misc/e-attachment.c:1867
+#: ../widgets/misc/e-attachment.c:1871
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ஏற்ற முடியவில்லை"
 
-#: ../widgets/misc/e-attachment.c:1870
+#: ../widgets/misc/e-attachment.c:1874
 #, c-format
 msgid "Could not load the attachment"
 msgstr "இணைப்பை  ஏற்ற முடியவில்லை"
 
-#: ../widgets/misc/e-attachment.c:2147
+#: ../widgets/misc/e-attachment.c:2138
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ஐ திறக்க முடியவில்லை"
 
-#: ../widgets/misc/e-attachment.c:2150
+#: ../widgets/misc/e-attachment.c:2141
 #, c-format
 msgid "Could not open the attachment"
 msgstr "இணைப்பை திறக்க முடியவில்லை"
 
-#: ../widgets/misc/e-attachment.c:2588
+#: ../widgets/misc/e-attachment.c:2583
 msgid "Attachment contents not loaded"
 msgstr "இணைப்பு உள்ளடக்கங்கள் ஏற்றப்படவில்லை"
 
-#: ../widgets/misc/e-attachment.c:2665
+#: ../widgets/misc/e-attachment.c:2660
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ஐ சேமிக்க முடியவில்லை "
 
-#: ../widgets/misc/e-attachment.c:2668
+#: ../widgets/misc/e-attachment.c:2663
 #, c-format
 msgid "Could not save the attachment"
 msgstr "இணைப்பு ஐ சேமிக்க முடியவில்லை "
@@ -21507,12 +21555,12 @@ msgstr "ஏற்றுகிறது"
 msgid "Saving"
 msgstr "சேமிக்கிறது"
 
-#: ../widgets/misc/e-attachment-paned.c:80
+#: ../widgets/misc/e-attachment-paned.c:81
 msgid "Hide _Attachment Bar"
 msgstr "இணைப்பு பட்டைகளை மறை (_A)"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
 msgid "Show _Attachment Bar"
 msgstr "இணைப்பு பட்டைகளை காட்டு (_A)"
 
@@ -21524,7 +21572,7 @@ msgstr "இணைப்பு ஐ சேர்"
 msgid "A_ttach"
 msgstr "இணை (_t)"
 
-#: ../widgets/misc/e-attachment-store.c:606
+#: ../widgets/misc/e-attachment-store.c:607
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "இணைப்பை சேமி"
@@ -21538,12 +21586,12 @@ msgstr "அனைத்தையும் சேமி (_a)"
 msgid "A_dd Attachment..."
 msgstr "இணைப்பினை சேர்... (_d)"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ஆல் திற"
 
-#: ../widgets/misc/e-attachment-view.c:649
+#: ../widgets/misc/e-attachment-view.c:646
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "இணைப்பை %s இல் சேமி"
@@ -21598,21 +21646,21 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1416
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "குறைந்தபட்ச அகலம்"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:1004
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../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-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "இடைவெளி"
 
@@ -21775,27 +21823,27 @@ msgstr "(_S)தேடல்கள்"
 msgid "Searches"
 msgstr "தேடல்கள்"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "(_S)தேடலை சேமி..."
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "(_E) சேமித்த தேடலை திருத்து..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "கூடுதல் தேடல்... (_A)"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "அனைத்து கணக்கீடுகள்"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "நடப்பிலுள்ள கணக்கீடு"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "நடப்பிலுள்ள அடைவு "
 
@@ -22066,7 +22114,7 @@ msgstr "%s (%d%% முடிவுற்றது)"
 msgid "Click here to go to URL"
 msgstr "URLக்கு செல்ல இங்கு சொடுக்கவும்"
 
-#: ../widgets/table/e-cell-combo.c:175
+#: ../widgets/table/e-cell-combo.c:173
 msgid "popup list"
 msgstr "மேல்மீட்பு பட்டியல்"
 
@@ -22126,12 +22174,12 @@ msgstr "வரிசையாஇக்கவில்லை"
 msgid "No grouping"
 msgstr "தொகுத்தல் கிடையாது"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:644
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "புலங்களை காட்டு"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:665
 msgid "Available Fields"
 msgstr "இருக்கும் புலங்கள்"
 
@@ -22213,7 +22261,7 @@ msgstr "இந்த புலங்களை வரிசையாக காட
 msgid "_Sort..."
 msgstr "வரிசைப்படுத்து... (_S)"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "நெடுவரிசையை சேர்..."
 
@@ -22533,3 +22581,20 @@ msgstr "IM சூழல்"
 msgid "Handle Popup"
 msgstr "மேல்மீட்பினை கையாள்"
 
+#~ msgid "Show BCC"
+#~ msgstr "மறை நகலை காட்டுக"
+
+#~ msgid "Add attachment"
+#~ msgstr "இணைப்பினை சேர்... (_A)"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "செய்தி மீட்டல்..."
+
+#~ msgid "Case _sensitive"
+#~ msgstr "எழுத்துணர்வு (_s)"
+
+#~ msgid "F_ind:"
+#~ msgstr "தேடு: (_i)"
+
+#~ msgid "Find in Message"
+#~ msgstr "செய்தியில் கண்டுபிடி"
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 69f9cf6f12..ee11ea746e 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la
+endif
+
 AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 890355620b..5f4b828783 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -139,7 +139,8 @@ static void e_calendar_item_get_day_style	(ECalendarItem	*calitem,
 						 GdkColor      **bg_color,
 						 GdkColor      **fg_color,
 						 GdkColor      **box_color,
-						 gboolean	*bold);
+						 gboolean	*bold,
+						 gboolean	*italic);
 static void e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
 						 gint		 start_month,
 						 gint		 start_day,
@@ -1420,7 +1421,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	gint week_num, mon, days_from_week_start;
 	gint years[3], months[3], days_in_month[3];
 	gboolean today, selected, has_focus, drop_target = FALSE;
-	gboolean bold, draw_day, finished = FALSE;
+	gboolean bold, italic, draw_day, finished = FALSE;
 	gint today_year, today_month, today_mday, month_offset;
 	gchar buffer[9];
 	gint day_style = 0;
@@ -1579,6 +1580,9 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 				else
 					has_focus = FALSE;
 
+				bold = FALSE;
+				italic = FALSE;
+
 				if (calitem->style_callback)
 					(*calitem->style_callback)
 						(calitem,
@@ -1595,6 +1599,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 						 &fg_color,
 						 &box_color,
 						 &bold,
+						 &italic,
 						 calitem->style_callback_data);
 				else
 					e_calendar_item_get_day_style
@@ -1611,7 +1616,8 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 						 &bg_color,
 						 &fg_color,
 						 &box_color,
-						 &bold);
+						 &bold,
+						 &italic);
 
 				/* Draw the background, if set. */
 				if (bg_color) {
@@ -1664,6 +1670,13 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 				} else {
 					pango_font_description_set_weight (font_desc, PANGO_WEIGHT_NORMAL);
 				}
+
+				if (italic) {
+					pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC);
+				} else {
+					pango_font_description_set_style (font_desc, PANGO_STYLE_NORMAL);
+				}
+
 				pango_layout_set_font_description (layout, font_desc);
 				pango_layout_set_text (layout, buffer, num_chars);
 				cairo_translate (cr, day_x, day_y);
@@ -2053,7 +2066,8 @@ e_calendar_item_get_day_style		(ECalendarItem	*calitem,
 					 GdkColor      **bg_color,
 					 GdkColor      **fg_color,
 					 GdkColor      **box_color,
-					 gboolean	*bold)
+					 gboolean	*bold,
+					 gboolean	*italic)
 {
 	GtkWidget *widget;
 	GtkStyle *style;
@@ -2064,10 +2078,9 @@ e_calendar_item_get_day_style		(ECalendarItem	*calitem,
 	*bg_color = NULL;
 	*fg_color = NULL;
 	*box_color = NULL;
-	*bold = FALSE;
 
-	if (day_style == 1)
-		*bold = TRUE;
+	*bold = (day_style & E_CALENDAR_ITEM_MARK_BOLD) == E_CALENDAR_ITEM_MARK_BOLD;
+	*italic = (day_style & E_CALENDAR_ITEM_MARK_ITALIC) == E_CALENDAR_ITEM_MARK_ITALIC;
 
 	if (today)
 		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
@@ -2849,12 +2862,14 @@ e_calendar_item_clear_marks	(ECalendarItem	*calitem)
 }
 
 
+/* add_day_style - whether bit-or with the actual style or change the style fully */
 void
 e_calendar_item_mark_day	(ECalendarItem	*calitem,
 				 gint		 year,
 				 gint		 month,
 				 gint		 day,
-				 guint8		 day_style)
+				 guint8		 day_style,
+				 gboolean        add_day_style)
 {
 	gint month_offset;
 
@@ -2865,7 +2880,7 @@ e_calendar_item_mark_day	(ECalendarItem	*calitem,
 	if (!calitem->styles)
 		calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32);
 
-	calitem->styles[(month_offset + 1) * 32 + day] = day_style;
+	calitem->styles[(month_offset + 1) * 32 + day] = (add_day_style ? calitem->styles[(month_offset + 1) * 32 + day] : 0) | day_style;
 
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
 }
@@ -2879,7 +2894,8 @@ e_calendar_item_mark_days	(ECalendarItem	*calitem,
 				 gint		 end_year,
 				 gint		 end_month,
 				 gint		 end_day,
-				 guint8		 day_style)
+				 guint8		 day_style,
+				 gboolean        add_day_style)
 {
 	gint month_offset, end_month_offset, day;
 
@@ -2920,7 +2936,7 @@ e_calendar_item_mark_days	(ECalendarItem	*calitem,
 #if 0
 		g_print ("Marking Month:%i Day:%i\n", month_offset, day);
 #endif
-		calitem->styles[(month_offset + 1) * 32 + day] = day_style;
+		calitem->styles[(month_offset + 1) * 32 + day] = (add_day_style ? calitem->styles[(month_offset + 1) * 32 + day] : 0) | day_style;
 
 		day++;
 		if (day == 32) {
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index f86fc4fd79..936e86ebab 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -41,7 +41,8 @@ G_BEGIN_DECLS
 #define E_CALENDAR_COLS_PER_MONTH	7
 
 /* Used to mark days as bold in e_calendar_item_mark_day(). */
-#define E_CALENDAR_ITEM_MARK_BOLD	1
+#define E_CALENDAR_ITEM_MARK_BOLD	(1 << 0)
+#define E_CALENDAR_ITEM_MARK_ITALIC     (1 << 1)
 
 /*
  * These are the padding sizes between various pieces of the calendar.
@@ -101,6 +102,7 @@ typedef void (*ECalendarItemStyleCallback)   (ECalendarItem	*calitem,
 					      GdkColor	       **fg_color,
 					      GdkColor	       **box_color,
 					      gboolean		*bold,
+					      gboolean		*italic,
 					      gpointer		 data);
 
 /* The type of the callback function optionally used to get the current time.
@@ -329,7 +331,8 @@ void	 e_calendar_item_mark_day		(ECalendarItem	*calitem,
 						 gint		 year,
 						 gint		 month,
 						 gint		 day,
-						 guint8		 day_style);
+						 guint8		 day_style,
+						 gboolean        add_day_style);
 
 /* Mark a range of days. Any days outside the currently shown range are
    ignored. */
@@ -340,7 +343,8 @@ void	 e_calendar_item_mark_days		(ECalendarItem	*calitem,
 						 gint		 end_year,
 						 gint		 end_month,
 						 gint		 end_day,
-						 guint8		 day_style);
+						 guint8		 day_style,
+						 gboolean        add_day_style);
 
 /* Sets the function to call to get the colors to use for a particular day. */
 void	 e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 7b2d59056d..ed670a817c 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -120,9 +120,9 @@ on_date_range_changed (ECalendarItem *calitem)
 
 	/* These days should windowear bold. Remember month is 0 to 11. */
 	e_calendar_item_mark_day (calitem, 2000, 7, 26, /* 26th Aug 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
+				  E_CALENDAR_ITEM_MARK_BOLD, FALSE);
 	e_calendar_item_mark_day (calitem, 2000, 8, 13, /* 13th Sep 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
+				  E_CALENDAR_ITEM_MARK_BOLD, FALSE);
 }
 
 
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index f20041a7d0..ee426f4791 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
+endif
+
 AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\